Re: [morty][PATCH] binutils: add linaro-2.27

Op 22 dec. 2016, om 20:19 heeft Denys Dmytriyenko denis@denix.org het volgende geschreven:

From: Koen Kooi koen.kooi@linaro.org

Change-Id: I8de52f82d737cea2c73316fe0a19408998639954 Signed-off-by: Koen Kooi koen.kooi@linaro.org Signed-off-by: Denys Dmytriyenko denys@ti.com

---

I just realized, that gcc-6.2 was backported to morty, but binutils-2.27 was not. My previous 2 patches to binutils require this backport.

I manually cherry-picked it, so 2.27 is in morty now. Happy holidays!

.../binutils-cross-canadian_linaro-2.27.bb | 3 + .../binutils/binutils-cross_linaro-2.27.bb | 3 + .../binutils/binutils-crosssdk_linaro-2.27.bb | 13 + .../binutils/binutils-linaro-2.27.inc | 41 + .../0001-Generate-relocatable-SDKs.patch | 62 + ...ure-widen-the-regexp-for-SH-architectures.patch | 56 + .../0003-Point-scripts-location-to-libdir.patch | 42 + ...te-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 41 + .../0005-Explicitly-link-with-libm-on-uclibc.patch | 52 + .../0006-Use-libtool-2.4.patch | 21177 +++++++++++++++++++ ...7-Add-the-armv5e-architecture-to-binutils.patch | 35 + ...he-distro-compiler-point-to-the-wrong-ins.patch | 35 + ...es-of-system-directories-when-cross-linki.patch | 273 + ...-rpath-in-libtool-when-sysroot-is-enabled.patch | 52 + ...Change-default-emulation-for-mips64-linux.patch | 59 + .../0012-Add-support-for-Netlogic-XLP.patch | 413 + ...ncorrect-assembling-for-ppc-wait-mnemonic.patch | 36 + .../0014-libtool-remove-rpath.patch | 100 + ..._sections-check-to-only-consider-compact-.patch | 97 + .../0015-binutils-mips-gas-pic-relax-linkonce.diff | 65 + .../binutils/binutils_linaro-2.27.bb | 45 + 21 files changed, 22700 insertions(+) create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian_linaro-2.27.bb create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross_linaro-2.27.bb create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-crosssdk_linaro-2.27.bb create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27.inc create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0001-Generate-relocatable-SDKs.patch create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0002-configure-widen-the-regexp-for-SH-architectures.patch create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0003-Point-scripts-location-to-libdir.patch create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0005-Explicitly-link-with-libm-on-uclibc.patch create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0006-Use-libtool-2.4.patch create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0007-Add-the-armv5e-architecture-to-binutils.patch create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0009-warn-for-uses-of-system-directories-when-cross-linki.patch create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0011-Change-default-emulation-for-mips64-linux.patch create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0012-Add-support-for-Netlogic-XLP.patch create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0014-libtool-remove-rpath.patch create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0015-Refine-.cfi_sections-check-to-only-consider-compact-.patch create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0015-binutils-mips-gas-pic-relax-linkonce.diff create mode 100644 meta-linaro-toolchain/recipes-devtools/binutils/binutils_linaro-2.27.bb

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian_linaro-2.27.bb b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian_linaro-2.27.bb new file mode 100644 index 0000000..76b6277 --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian_linaro-2.27.bb @@ -0,0 +1,3 @@ +require recipes-devtools/binutils/binutils.inc +require recipes-devtools/binutils/binutils-${PV}.inc +require recipes-devtools/binutils/binutils-cross-canadian.inc diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross_linaro-2.27.bb b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross_linaro-2.27.bb new file mode 100644 index 0000000..a8b918e --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross_linaro-2.27.bb @@ -0,0 +1,3 @@ +require recipes-devtools/binutils/binutils.inc +require recipes-devtools/binutils/binutils-${PV}.inc +require recipes-devtools/binutils/binutils-cross.inc diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-crosssdk_linaro-2.27.bb b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-crosssdk_linaro-2.27.bb new file mode 100644 index 0000000..1c62ed4 --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-crosssdk_linaro-2.27.bb @@ -0,0 +1,13 @@ +require recipes-devtools/binutils/binutils-cross_${PV}.bb

+inherit crosssdk

+PN = "binutils-crosssdk-${TARGET_ARCH}"

+PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"

+SRC_URI += "file://relocatable_sdk.patch"

+do_configure_prepend () {

• sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt

+} diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27.inc b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27.inc new file mode 100644 index 0000000..f7a7992 --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27.inc @@ -0,0 +1,41 @@ +BPV = "2.27.0" +MMYY = "16.10" +RELEASE = "20${MMYY}" +PR = "r20${MMYY}"

+LIC_FILES_CHKSUM="\

• file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\
• file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674\
• file://COPYING3;md5=d32239bcb673463ab874e80d47fae504\
• file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6\
• file://gas/COPYING;md5=d32239bcb673463ab874e80d47fae504\
• file://include/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\
• file://include/COPYING3;md5=d32239bcb673463ab874e80d47fae504\
• file://libiberty/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7\
• file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\
• "

+SRCREV = "5fe53ce37f9d9dd544ec8cc9e2863b68e1a61f4c" +SRC_URI = "\

• git://git.linaro.org/toolchain/binutils-gdb.git;protocol=https;branch=linaro_binutils-2_27-branch \
  

• file://0002-configure-widen-the-regexp-for-SH-architectures.patch \
  

• file://0003-Point-scripts-location-to-libdir.patch \
  

• file://0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
  

• file://0005-Explicitly-link-with-libm-on-uclibc.patch \
  

• file://0006-Use-libtool-2.4.patch \
  

• file://0007-Add-the-armv5e-architecture-to-binutils.patch \
  

• file://0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
  

• file://0009-warn-for-uses-of-system-directories-when-cross-linki.patch \
  

• file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
  

• file://0011-Change-default-emulation-for-mips64-linux.patch \
  

• file://0012-Add-support-for-Netlogic-XLP.patch \
  

• file://0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \
  

• file://0014-libtool-remove-rpath.patch \
  

• file://0015-binutils-mips-gas-pic-relax-linkonce.diff \
  

• file://0015-Refine-.cfi_sections-check-to-only-consider-compact-.patch \
  

+" +S = "${WORKDIR}/git"

+do_configure_prepend () {

•    rm -rf ${S}/gdb ${S}/libdecnumber ${S}/readline ${S}/sim
  

+} diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0001-Generate-relocatable-SDKs.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0001-Generate-relocatable-SDKs.patch new file mode 100644 index 0000000..cad704a --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0001-Generate-relocatable-SDKs.patch @@ -0,0 +1,62 @@ +From 2dae6b137ce609fd008f2063034a4403d95484c5 Mon Sep 17 00:00:00 2001 +From: Khem Raj raj.khem@gmail.com +Date: Mon, 2 Mar 2015 01:58:54 +0000 +Subject: [PATCH 01/13] Generate relocatable SDKs

+This patch will modify the ELF linker scripts so that the crosssdk +linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries +will be relocated, at SDK install time, the interpreter path can be easily +changed by the relocating script.

+Upstream-Status: Inappropriate [SDK specific]

+Signed-off-by: Laurentiu Palcu laurentiu.palcu@intel.com +Signed-off-by: Khem Raj raj.khem@gmail.com +---

• ld/genscripts.sh | 3 +++
• ld/scripttempl/elf.sc | 4 ++--
• 2 files changed, 5 insertions(+), 2 deletions(-)

+diff --git a/ld/genscripts.sh b/ld/genscripts.sh +index eb262e7..1a3b8bc 100755 +--- a/ld/genscripts.sh ++++ b/ld/genscripts.sh +@@ -277,6 +277,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}"

• LD_FLAG=r
• DATA_ALIGNMENT=${DATA_ALIGNMENT_r}
• DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"

++PARTIAL_LINKING=" "

• ( echo "/* Script for ld -r: link without relocation */"
• . ${CUSTOMIZER_SCRIPT}
• . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc

+@@ -285,10 +286,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"

• LD_FLAG=u
• DATA_ALIGNMENT=${DATA_ALIGNMENT_u}
• CONSTRUCTING=" "

++PARTIAL_LINKING=" "

• ( echo "/* Script for ld -Ur: link w/out relocation, do create constructors */"
• . ${CUSTOMIZER_SCRIPT}
• . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
• ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu

++unset PARTIAL_LINKING

• LD_FLAG=
• DATA_ALIGNMENT=${DATA_ALIGNMENT_}

+diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc +index f0c6439..223c55f 100644 +--- a/ld/scripttempl/elf.sc ++++ b/ld/scripttempl/elf.sc +@@ -136,8 +136,8 @@ if test -n "${COMMONPAGESIZE}"; then

• DATA_SEGMENT_END=". = DATA_SEGMENT_END (.);"
• DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);"
• fi

+-if test -z "${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}"; then +- INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp) }" ++if test -z "${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}${PARTIAL_LINKING}"; then ++ INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp); . = 0x1000; }"

• fi
• if test -z "$PLT"; then
• IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }"

+-- +2.9.0

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0002-configure-widen-the-regexp-for-SH-architectures.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0002-configure-widen-the-regexp-for-SH-architectures.patch new file mode 100644 index 0000000..8d7cf00 --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0002-configure-widen-the-regexp-for-SH-architectures.patch @@ -0,0 +1,56 @@ +From e4cd40722f597dff39c7214fab1742dd5bcc67eb Mon Sep 17 00:00:00 2001 +From: Khem Raj raj.khem@gmail.com +Date: Mon, 2 Mar 2015 01:07:33 +0000 +Subject: [PATCH 02/13] configure: widen the regexp for SH architectures

+gprof needs to know about uclibc

+Upstream-Status: Pending

+Signed-off-by: Khem Raj raj.khem@gmail.com +---

• configure | 4 ++--
• gprof/configure | 5 +++++
• 2 files changed, 7 insertions(+), 2 deletions(-)

+diff --git a/configure b/configure +index ad3dfb7..2a74a77 100755 +--- a/configure ++++ b/configure +@@ -3444,7 +3444,7 @@ case "${target}" in

• ;;
  

• s390-*-* | s390x-*-*)

• ;;
  

+- sh-*-* | sh[34]*-*-*) ++ sh*-*-* | sh[34]*-*-*)

• ;;
  

• sh64-*-* | sh5*-*-*)

• ;;
  

+@@ -3946,7 +3946,7 @@ case "${target}" in

• or1k*-*-*)

• noconfigdirs="$noconfigdirs gdb"
  

• ;;
  

+- sh-*-* | sh64-*-*) ++ sh*-*-* | sh64-*-*)

• case "${target}" in
  

•   sh*-*-elf)
  

•      ;;
  

+diff --git a/gprof/configure b/gprof/configure +index bf3ecaa..626e1c7 100755 +--- a/gprof/configure ++++ b/gprof/configure +@@ -5873,6 +5873,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)

• lt_cv_deplibs_check_method=pass_all
• ;;

++linux-uclibc*) ++ lt_cv_deplibs_check_method=pass_all ++ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` ++ ;; ++

• netbsd*)
• if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then

• lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
  

+-- +2.9.0

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0003-Point-scripts-location-to-libdir.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0003-Point-scripts-location-to-libdir.patch new file mode 100644 index 0000000..acc198b --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0003-Point-scripts-location-to-libdir.patch @@ -0,0 +1,42 @@ +From 93c49f6197bd59b2abbf04b3296bf10029b80f48 Mon Sep 17 00:00:00 2001 +From: Khem Raj raj.khem@gmail.com +Date: Mon, 2 Mar 2015 01:09:58 +0000 +Subject: [PATCH 03/13] Point scripts location to libdir

+Upstream-Status: Inappropriate [debian patch]

+Signed-off-by: Khem Raj raj.khem@gmail.com +---

• ld/Makefile.am | 2 +-
• ld/Makefile.in | 2 +-
• 2 files changed, 2 insertions(+), 2 deletions(-)

+diff --git a/ld/Makefile.am b/ld/Makefile.am +index 0598923..b478ba7 100644 +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -57,7 +57,7 @@ endif

• # We put the scripts in the directory $(scriptdir)/ldscripts.
• # We can't put the scripts in $(datadir) because the SEARCH_DIR
• # directives need to be different for native and cross linkers.

+-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir)

• EMUL = @EMUL@
• EMULATION_OFILES = @EMULATION_OFILES@

+diff --git a/ld/Makefile.in b/ld/Makefile.in +index 7c78198..5eb67e0 100644 +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -451,7 +451,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)

• # We put the scripts in the directory $(scriptdir)/ldscripts.
• # We can't put the scripts in $(datadir) because the SEARCH_DIR
• # directives need to be different for native and cross linkers.

+-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir)

• BASEDIR = $(srcdir)/..
• BFDDIR = $(BASEDIR)/bfd
• INCDIR = $(BASEDIR)/include

+-- +2.9.0

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch new file mode 100644 index 0000000..28a17f3 --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -0,0 +1,41 @@ +From 4ff83779de8621715c6c2a79cf7ed8d74ff2d7c5 Mon Sep 17 00:00:00 2001 +From: Khem Raj raj.khem@gmail.com +Date: Mon, 2 Mar 2015 01:27:17 +0000 +Subject: [PATCH 04/13] Only generate an RPATH entry if LD_RUN_PATH is not

• empty

+for cases where -rpath isn't specified. debian (#151024)

+Upstream-Status: Pending

+Signed-off-by: Chris Chimelis chris@debian.org +Signed-off-by: Khem Raj raj.khem@gmail.com +---

• ld/emultempl/elf32.em | 4 ++++
• 1 file changed, 4 insertions(+)

+diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em +index 47fa549..f4c640e 100644 +--- a/ld/emultempl/elf32.em ++++ b/ld/emultempl/elf32.em +@@ -1244,6 +1244,8 @@ fragment <<EOF

•      && command_line.rpath == NULL)
  

•    {
  

•      lib_path = (const char *) getenv ("LD_RUN_PATH");
  

++ if ((lib_path) && (strlen (lib_path) == 0)) ++ lib_path = NULL;

•      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
  

• 				      force))
  

• break;
  

+@@ -1525,6 +1527,8 @@ gld${EMULATION_NAME}_before_allocation (void)

• rpath = command_line.rpath;
• if (rpath == NULL)

• rpath = (const char *) getenv ("LD_RUN_PATH");
  

++ if ((rpath) && (strlen (rpath) == 0)) ++ rpath = NULL;

• for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)

• if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
  

+-- +2.9.0

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0005-Explicitly-link-with-libm-on-uclibc.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0005-Explicitly-link-with-libm-on-uclibc.patch new file mode 100644 index 0000000..331f782 --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0005-Explicitly-link-with-libm-on-uclibc.patch @@ -0,0 +1,52 @@ +From 18a7ae169e8d55ace683357d1de6b07e4fdf797a Mon Sep 17 00:00:00 2001 +From: Khem Raj raj.khem@gmail.com +Date: Mon, 2 Mar 2015 01:32:49 +0000 +Subject: [PATCH 05/13] Explicitly link with libm on uclibc

+Description:

+We do not need to have the libtool patch anymore for binutils after +libtool has been updated upstream it include support for it. However +for building gas natively on uclibc systems we have to link it with +-lm so that it picks up missing symbols.

+/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o): +In function `floatformat_from_double': +floatformat.c:(.text+0x1ec): undefined reference to `frexp' +floatformat.c:(.text+0x2f8): undefined reference to `ldexp' +/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o): +In function `floatformat_to_double': +floatformat.c:(.text+0x38a): undefined reference to `ldexp' +floatformat.c:(.text+0x3d2): undefined reference to `ldexp' +floatformat.c:(.text+0x43e): undefined reference to `ldexp' +floatformat.c:(.text+0x4e2): undefined reference to `ldexp' +collect2: ld returned 1 exit status +make[4]: *** [as-new] Error 1

+Upstream-Status: Pending

+Signed-off-by: Khem Raj raj.khem@gmail.com +---

• gas/configure.tgt | 6 ++++++
• 1 file changed, 6 insertions(+)

+diff --git a/gas/configure.tgt b/gas/configure.tgt +index e2df659..1b9fd99 100644 +--- a/gas/configure.tgt ++++ b/gas/configure.tgt +@@ -487,6 +487,12 @@ case ${generic_target} in

• *-*-netware) fmt=elf em=netware ;;
• esac

++case ${generic_target} in ++ arm-*-*uclibc*) ++ need_libm=yes ++ ;; ++esac ++

• case ${cpu_type} in
• aarch64 | alpha | arm | i386 | ia64 | microblaze | mips | ns32k | or1k | or1knd | pdp11 | ppc | sparc | z80 | z8k)

• bfd_gas=yes
  

+-- +2.9.0

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0006-Use-libtool-2.4.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0006-Use-libtool-2.4.patch new file mode 100644 index 0000000..f0fdf46 --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0006-Use-libtool-2.4.patch @@ -0,0 +1,21177 @@ +From 71adcde3648db47f7fa155db12810591ffd3ae34 Mon Sep 17 00:00:00 2001 +From: Khem Raj raj.khem@gmail.com +Date: Sun, 14 Feb 2016 17:04:07 +0000 +Subject: [PATCH 06/13] Use libtool 2.4

+get libtool sysroot support

+Signed-off-by: Khem Raj raj.khem@gmail.com +--- +Upstream-Status: Pending

• bfd/configure | 1318 +++++++++++++++++------
• bfd/configure.ac | 2 +-
• binutils/configure | 1316 +++++++++++++++++------
• configure | 4 +-
• gas/configure | 1314 +++++++++++++++++------
• gprof/configure | 1321 +++++++++++++++++------
• ld/configure | 1691 +++++++++++++++++++++--------
• libtool.m4 | 1080 +++++++++++++------
• ltmain.sh | 2925 +++++++++++++++++++++++++++++++++-----------------
• ltoptions.m4 | 2 +-
• ltversion.m4 | 12 +-
• lt~obsolete.m4 | 2 +-
• opcodes/configure | 1318 +++++++++++++++++------
• opcodes/configure.ac | 2 +-
• zlib/configure | 1320 +++++++++++++++++------
• 15 files changed, 9930 insertions(+), 3697 deletions(-)

+diff --git a/bfd/configure b/bfd/configure +index a437569..575a257 100755 +--- a/bfd/configure ++++ b/bfd/configure +@@ -671,6 +671,9 @@ OTOOL

• LIPO
• NMEDIT
• DSYMUTIL

++MANIFEST_TOOL ++ac_ct_AR ++DLLTOOL

• OBJDUMP
• LN_S
• NM

+@@ -784,6 +787,7 @@ enable_static

• with_pic
• enable_fast_install
• with_gnu_ld

++with_libtool_sysroot

• enable_libtool_lock
• enable_plugins
• enable_largefile

+@@ -1460,6 +1464,8 @@ Optional Packages:

• --with-pic try to use only PIC/non-PIC objects [default=use

•                       both]
  

• --with-gnu-ld assume the C compiler uses GNU ld [default=no]

++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified).

• --with-mmap try using mmap for BFD input files if available
• --with-separate-debug-dir=DIR

•                       Look for global separate debug info in DIR
  

+@@ -5392,8 +5398,8 @@ esac

+-macro_version='2.2.7a' +-macro_revision='1.3134' ++macro_version='2.4' ++macro_revision='1.3293'

+@@ -5433,7 +5439,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
• $as_echo_n "checking how to print strings... " >&6; }
• # Test print first, because it will be a builtin if present.

+-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \

• test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
• ECHO='print -r --'
• elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then

+@@ -6119,8 +6125,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;

• # Try some XSI features
• xsi_shell=no
• ( _lt_dummy="a/b/c"

+- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \

• && eval 'test $(( 1 + 1 )) -eq 2 \
  

• && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  

• && xsi_shell=yes

+@@ -6169,6 +6175,80 @@ esac

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 ++$as_echo_n "checking how to convert $build file names to $host format... " >&6; } ++if test "${lt_cv_to_host_file_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac ++ ;; ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac ++ ;; ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++ ++fi ++ ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 ++$as_echo "$lt_cv_to_host_file_cmd" >&6; } ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 ++$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } ++if test "${lt_cv_to_tool_file_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ #assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac ++ ++fi ++ ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 ++$as_echo "$lt_cv_to_tool_file_cmd" >&6; } ++ ++ ++ ++ ++

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
• $as_echo_n "checking for $LD option to reload object files... " >&6; }
• if test "${lt_cv_ld_reload_flag+set}" = set; then :

+@@ -6185,6 +6265,11 @@ case $reload_flag in

• esac
• reload_cmds='$LD$reload_flag -o $output$reload_objs'
• case $host_os in

++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;;

• darwin*)

• if test "$GCC" = yes; then
  

•   reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  

+@@ -6353,7 +6438,8 @@ mingw* | pw32*)

• lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  

• lt_cv_file_magic_cmd='func_win32_libid'
  

• else

+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'

• lt_cv_file_magic_cmd='$OBJDUMP -f'
  

• fi
• ;;

+@@ -6507,6 +6593,21 @@ esac

• fi
• { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
• $as_echo "$lt_cv_deplibs_check_method" >&6; }

++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/(..)/s/[\1]/[\1]/g;/g"` ++ fi ++ ;; ++ esac ++fi ++

• file_magic_cmd=$lt_cv_file_magic_cmd
• deplibs_check_method=$lt_cv_deplibs_check_method
• test -z "$deplibs_check_method" && deplibs_check_method=unknown

+@@ -6522,9 +6623,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown

++ ++ ++ ++ ++ ++ ++ ++ ++ ++

• if test -n "$ac_tool_prefix"; then

+- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 ++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DLLTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DLLTOOL"; then ++ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DLLTOOL=$ac_cv_prog_DLLTOOL ++if test -n "$DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 ++$as_echo "$DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DLLTOOL"; then ++ ac_ct_DLLTOOL=$DLLTOOL ++ # Extract the first word of "dlltool", so it can be a program name with args. ++set dummy dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DLLTOOL"; then ++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DLLTOOL="dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL ++if test -n "$ac_ct_DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 ++$as_echo "$ac_ct_DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_DLLTOOL" = x; then ++ DLLTOOL="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DLLTOOL=$ac_ct_DLLTOOL ++ fi ++else ++ DLLTOOL="$ac_cv_prog_DLLTOOL" ++fi ++ ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 ++$as_echo_n "checking how to associate runtime and link libraries... " >&6; } ++if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 ++$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ for ac_prog in ar ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
• $as_echo_n "checking for $ac_word... " >&6; }
• if test "${ac_cv_prog_AR+set}" = set; then :

+@@ -6540,7 +6794,7 @@ do

• test -z "$as_dir" && as_dir=.

• for ac_exec_ext in '' $ac_executable_extensions; do
  

• if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+- ac_cv_prog_AR="${ac_tool_prefix}ar" ++ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"

• $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  

• break 2
  

• fi

+@@ -6560,11 +6814,15 @@ $as_echo "no" >&6; }

• fi

++ test -n "$AR" && break ++ done

• fi

+-if test -z "$ac_cv_prog_AR"; then ++if test -z "$AR"; then

• ac_ct_AR=$AR

+- # Extract the first word of "ar", so it can be a program name with args. +-set dummy ar; ac_word=$2 ++ for ac_prog in ar ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
• $as_echo_n "checking for $ac_word... " >&6; }
• if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :

+@@ -6580,7 +6838,7 @@ do

• test -z "$as_dir" && as_dir=.

• for ac_exec_ext in '' $ac_executable_extensions; do
  

• if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+- ac_cv_prog_ac_ct_AR="ar" ++ ac_cv_prog_ac_ct_AR="$ac_prog"

• $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  

• break 2
  

• fi

+@@ -6599,6 +6857,10 @@ else

• $as_echo "no" >&6; }
• fi

++ ++ test -n "$ac_ct_AR" && break ++done ++

• if test "x$ac_ct_AR" = x; then

• AR="false"
  

• else

+@@ -6610,16 +6872,72 @@ ac_tool_warned=yes ;;

• esac

• AR=$ac_ct_AR
  

• fi

+-else +- AR="$ac_cv_prog_AR"

• fi

+-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru ++: ${AR=ar} ++: ${AR_FLAGS=cru} ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 ++$as_echo_n "checking for archiver @FILE support... " >&6; } ++if test "${lt_cv_ar_at_file+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ar_at_file=no ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{

++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' ++ { { eval echo ""$as_me":${as_lineno-$LINENO}: "$lt_ar_try""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ { { eval echo ""$as_me":${as_lineno-$LINENO}: "$lt_ar_try""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a

++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 ++$as_echo "$lt_cv_ar_at_file" >&6; }

++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi

+@@ -6961,8 +7279,8 @@ esac

• lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* (.*)$/extern int \1();/p' -e 's/^$symcode* .* (.*)$/extern char \1;/p'"
• # Transform an extracted symbol line into symbol name and symbol address

+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: ([^ ]*) $/ {\"\1\", (void *) 0},/p' -e 's/^$symcode* ([^ ]*) ([^ ]*)$/ {"\2", (void *) &\2},/p'" +-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'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: ([^ ]*)[ ]*$/ {\"\1\", (void *) 0},/p' -e 's/^$symcode* ([^ ]*) ([^ ]*)$/ {"\2", (void *) &\2},/p'" ++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'"

• # Handle CRLF in mingw tool chain
• opt_cr=

+@@ -6998,6 +7316,7 @@ for ac_symprfx in "" "_"; do

• else

• lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  

• fi

++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"

• # Check to see that the pipe works correctly.
• pipe_works=no

+@@ -7039,6 +7358,18 @@ _LT_EOF

•   if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  

• if $GREP ' nm_test_func$' "$nlist" >/dev/null; then

•  cat <<_LT_EOF > conftest.$ac_ext
  

++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++

• #ifdef __cplusplus
• extern "C" {
• #endif

+@@ -7050,7 +7381,7 @@ _LT_EOF

•  cat <<_LT_EOF >> conftest.$ac_ext
  

• /* The mapping between symbol names and symbols. */

+-const struct { ++LT_DLSYM_CONST struct {

• const char *name;
• void *address;
• }

+@@ -7076,8 +7407,8 @@ static const void *lt_preloaded_setup() {

• _LT_EOF

•  # Now try linking the two files.
  

•  mv conftest.$ac_objext conftstm.$ac_objext
  

+- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS

•  LIBS="conftstm.$ac_objext"
  

•  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  

•  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  

+@@ -7087,8 +7418,8 @@ _LT_EOF

• test $ac_status = 0; } && test -s conftest${ac_exeext}; then

•    pipe_works=yes
  

•  fi
  

+- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS

• else

•  echo "cannot find nm_test_func in $nlist" >&5
  

• fi

+@@ -7125,6 +7456,16 @@ else

• $as_echo "ok" >&6; }
• fi

++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ ++ ++ ++

+@@ -7146,6 +7487,45 @@ fi

++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 ++$as_echo_n "checking for sysroot... " >&6; } ++ ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; ++else ++ with_libtool_sysroot=no ++fi ++ ++ ++lt_sysroot= ++case ${with_libtool_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } ++ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 ++ ;; ++esac ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 ++$as_echo "${lt_sysroot:-no}" >&6; } ++ ++ ++ ++ ++

• # Check whether --enable-libtool-lock was given.
• if test "${enable_libtool_lock+set}" = set; then :
• enableval=$enable_libtool_lock;

+@@ -7352,6 +7732,123 @@ esac

• need_locks="$enable_libtool_lock"

++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. ++set dummy ${ac_tool_prefix}mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$MANIFEST_TOOL"; then ++ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL ++if test -n "$MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 ++$as_echo "$MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ++ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL ++ # Extract the first word of "mt", so it can be a program name with args. ++set dummy mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_MANIFEST_TOOL"; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL ++if test -n "$ac_ct_MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 ++$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_MANIFEST_TOOL" = x; then ++ MANIFEST_TOOL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL ++ fi ++else ++ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" ++fi ++ ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 ++$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } ++if test "${lt_cv_path_mainfest_tool+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&5 ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 ++$as_echo "$lt_cv_path_mainfest_tool" >&6; } ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++ ++ ++ ++ ++

• case $host_os in

• rhapsody* | darwin*)
  

+@@ -7915,6 +8412,8 @@ _LT_EOF

•   $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  

•   echo "$AR cru libconftest.a conftest.o" >&5
  

•   $AR cru libconftest.a conftest.o 2>&5
  

++ echo "$RANLIB libconftest.a" >&5 ++ $RANLIB libconftest.a 2>&5

•   cat > conftest.c << _LT_EOF
  

• int main() { return 0;}
• _LT_EOF

+@@ -8079,7 +8578,8 @@ fi

• LIBTOOL_DEPS="$ltmain"
• # Always use our own libtool.

+-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL="$LIBTOOL/${host_alias}-libtool"

+@@ -8168,7 +8668,7 @@ aix3*)

• esac
• # Global variables:

+-ofile=libtool ++ofile=${host_alias}-libtool

• can_build_shared=yes
• # All known linkers require a `.a' archive for static linking (except MSVC,

+@@ -8466,8 +8966,6 @@ fi

• lt_prog_compiler_pic=
• lt_prog_compiler_static=

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

• if test "$GCC" = yes; then

• lt_prog_compiler_wl='-Wl,'
  

+@@ -8633,6 +9131,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

• lt_prog_compiler_pic='--shared'
• lt_prog_compiler_static='--static'
• ;;

++ nagfor*) ++ # NAG Fortran compiler ++ lt_prog_compiler_wl='-Wl,-Wl,,' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;;

•   pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  

•     # Portland Group compilers (*not* the Pentium gcc compiler,
  

• # which looks to be a dead project)

+@@ -8695,7 +9199,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

•   lt_prog_compiler_pic='-KPIC'
  

•   lt_prog_compiler_static='-Bstatic'
  

•   case $cc_basename in
  

+- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)

• lt_prog_compiler_wl='-Qoption ld ';;

•   *)
  

• lt_prog_compiler_wl='-Wl,';;

+@@ -8752,13 +9256,17 @@ case $host_os in

• lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  

• ;;
  

• esac

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +-$as_echo "$lt_prog_compiler_pic" >&6; } +- +- +- +-

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++if test "${lt_cv_prog_compiler_pic+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 ++$as_echo "$lt_cv_prog_compiler_pic" >&6; } ++lt_prog_compiler_pic=$lt_cv_prog_compiler_pic

• #
• # Check to make sure the PIC flag actually works.

+@@ -8819,6 +9327,11 @@ fi

++ ++ ++ ++ ++

• #
• # Check to make sure the static flag actually works.
• #

+@@ -9169,7 +9682,8 @@ _LT_EOF

•   allow_undefined_flag=unsupported
  

•   always_export_symbols=no
  

•   enable_shared_with_static_runtimes=yes
  

+- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '''/^[BCDGRS][ ]/s/.*[ ]([^ ]*)/\1 DATA/''' | $SED -e '''/^[AITW][ ]/s/.*[ ]//''' | sort | uniq > $export_symbols' ++ 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' ++ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'

•   if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  

•     archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  

+@@ -9268,12 +9782,12 @@ _LT_EOF

•  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  

•  hardcode_libdir_flag_spec=
  

•  hardcode_libdir_flag_spec_ld='-rpath $libdir'
  

+- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'

•  if test "x$supports_anon_versioning" = xyes; then
  

•    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  

•      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  

•      echo "local: *; };" >> $output_objdir/$libname.ver~
  

+- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'

•  fi
  

•  ;;
  

• esac

+@@ -9287,8 +9801,8 @@ _LT_EOF

• archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
• wlarc=

•   else
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   fi
  

•   ;;
  

+@@ -9306,8 +9820,8 @@ _LT_EOF

• _LT_EOF

•   elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   else
  

• ld_shlibs=no

•   fi
  

+@@ -9353,8 +9867,8 @@ _LT_EOF

• *)
  

•   if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   else
  

• ld_shlibs=no

•   fi
  

+@@ -9484,7 +9998,13 @@ _LT_EOF

• allow_undefined_flag='-berok'

•     # Determine the default libpath from the value encoded in an
  

•     # empty executable.
  

+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */
• int

+@@ -9497,22 +10017,29 @@ main ()

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi

•     hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•     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"
  

+@@ -9524,7 +10051,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• else

• # Determine the default libpath from the value encoded in an
  

• # empty executable.
  

+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */
• int

+@@ -9537,22 +10070,29 @@ main ()

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi

• hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•  # Warning - without using the other run time loading flags,
  

+@@ -9597,20 +10137,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•   # Microsoft Visual C++.
  

•   # hardcode_libdir_flag_spec is actually meaningless, as there is
  

•   # no search path for DLLs.
  

+- hardcode_libdir_flag_spec=' ' +- allow_undefined_flag=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '''s/ -lc$//'''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- old_archive_from_new_cmds='true' +- # FIXME: Should let the user specify the lib program. +- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' +- fix_srcfile_path='`cygpath -w "$srcfile"`' +- enable_shared_with_static_runtimes=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ always_export_symbols=yes ++ file_list_spec='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' -e '1\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' ++ enable_shared_with_static_runtimes=yes ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '''/^[BCDGRS][ ]/s/.*[ ]([^ ]*)/\1,DATA/''' | $SED -e '''/^[AITW][ ]/s/.*[ ]//''' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ old_postinstall_cmds='chmod 644 $oldlib' ++ postlink_cmds='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '''s/ -lc$//'''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ old_archive_from_new_cmds='true' ++ # FIXME: Should let the user specify the lib program. ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ enable_shared_with_static_runtimes=yes ++ ;; ++ esac

•   ;;
  

• darwin* | rhapsody*)
  

+@@ -9671,7 +10254,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  

• freebsd* | dragonfly*)
  

+- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

•   hardcode_libdir_flag_spec='-R$libdir'
  

•   hardcode_direct=yes
  

•   hardcode_shlibpath_var=no
  

+@@ -9679,7 +10262,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• hpux9*)
  

•   if test "$GCC" = yes; then
  

+- 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' ++ 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'

•   else
  

• 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'

•   fi
  

+@@ -9695,7 +10278,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• hpux10*)
  

•   if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

•   else
  

• archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'

•   fi
  

+@@ -9719,10 +10302,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  

•  ;;
  

• ia64*)

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

•  ;;
  

• *)

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

•  ;;
  

• esac

•   else
  

+@@ -9801,23 +10384,36 @@ fi

• irix5* | irix6* | nonstopux*)
  

•   if test "$GCC" = yes; then
  

+- 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' ++ 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'

• # Try to use the -exported_symbol ld option, if it does not
• # work, assume that -exports_file does not work either and
• # implicitly export all symbols.

+- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ # This should be the same for all languages, so no per-tag cache variable. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 ++$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } ++if test "${lt_cv_irix_exported_symbol+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */

+-int foo(void) {} ++int foo (void) { return 0; }

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+- 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' +- ++ lt_cv_irix_exported_symbol=yes ++else ++ lt_cv_irix_exported_symbol=no

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 ++$as_echo "$lt_cv_irix_exported_symbol" >&6; } ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ 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' ++ fi

•   else
  

• 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'
• 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'

+@@ -9902,7 +10498,7 @@ rm -f core conftest.err conftest.$ac_objext \

• osf4* | osf5*)	# as osf3* with the addition of -msym flag
  

•   if test "$GCC" = yes; then
  

• allow_undefined_flag=' ${wl}-expect_unresolved ${wl}*'

+- 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' ++ 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'

• hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'

•   else
  

• allow_undefined_flag=' -expect_unresolved *'

+@@ -9921,9 +10517,9 @@ rm -f core conftest.err conftest.$ac_objext \

•   no_undefined_flag=' -z defs'
  

•   if test "$GCC" = yes; then
  

• wlarc='${wl}'

+- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

• archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/(.*)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~

+- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $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'

•   else
  

• case `$CC -V 2>&1` in
• *"Compilers 5.0"*)

+@@ -10499,8 +11095,9 @@ cygwin* | mingw* | pw32* | cegcc*)

• need_version=no
• need_lib_prefix=no

+- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc

• library_names_spec='$libname.dll.a'
  

• # DLL is installed to $(libdir)/../bin by postinstall_cmds
  

• postinstall_cmds='base_file=`basename \${file}`~
  

+@@ -10533,13 +11130,71 @@ cygwin* | mingw* | pw32* | cegcc*)

•   library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  

•   ;;
  

• esac
  

++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\|/|g' -e 's| \([a-zA-Z]\):| /\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename ${file}`~ ++ dlpath=`$SHELL 2>&1 -c '''. $dir/'''${base_file}'''i; echo $dlname'''`~ ++ dldir=$destdir/`dirname $dlpath`~ ++ test -d $dldir || mkdir -p $dldir~ ++ $install_prog $dir/$dlname $dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '''. $file; echo $dlname'''`~ ++ dlpath=$dir/$dldll~ ++ $RM $dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe'

• ;;
  

• *)

++ # Assume MSVC wrapper

• library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  

++ dynamic_linker='Win32 ld.exe'

• ;;
  

• esac

+- dynamic_linker='Win32 ld.exe'

• # FIXME: first we should search . and the directory the executable is in
• shlibpath_var=PATH
• ;;

+@@ -10631,7 +11286,7 @@ haiku*)

• soname_spec='${libname}${release}${shared_ext}$major'
• shlibpath_var=LIBRARY_PATH
• shlibpath_overrides_runpath=yes

+- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'

• hardcode_into_libs=yes
• ;;

+@@ -11471,10 +12126,10 @@ else

• /* When -fvisbility=hidden is used, assume the code has been annotated
• correspondingly for the symbols needed. */
• #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

+-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default")));

• #endif

+-void fnord () { int i=42; } ++int fnord () { return 42; }

• int main ()
• {
• void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

+@@ -11577,10 +12232,10 @@ else

• /* When -fvisbility=hidden is used, assume the code has been annotated
• correspondingly for the symbols needed. */
• #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

+-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default")));

• #endif

+-void fnord () { int i=42; } ++int fnord () { return 42; }

• int main ()
• {
• void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

+@@ -14078,7 +14733,7 @@ SHARED_LDFLAGS=

• if test "$enable_shared" = "yes"; then
• x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
• if test -n "$x"; then

+- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" ++ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"

• fi
• # More hacks to build DLLs on Windows.

+@@ -16789,13 +17444,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'

• lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
• lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
• lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'

++lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' ++lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'

• reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
• reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
• OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
• deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
• file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'

++file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' ++want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' ++DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' ++sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'

• AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
• AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'

++archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'

• STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
• RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
• old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'

+@@ -16810,14 +17472,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de

• lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
• lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
• 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"`'

++nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' ++lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'

• objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
• MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
• lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'

+-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'

• lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'

++lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'

• lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
• lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
• need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'

++MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'

• DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
• NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
• LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'

+@@ -16850,12 +17515,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q

• hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
• inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
• link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'

+-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'

• always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
• export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
• exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
• include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
• prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'

++postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'

• file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
• variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
• need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'

+@@ -16910,8 +17575,13 @@ reload_flag \

• OBJDUMP \
• deplibs_check_method \
• file_magic_cmd \

++file_magic_glob \ ++want_nocaseglob \ ++DLLTOOL \ ++sharedlib_from_linklib_cmd \

• AR \
• AR_FLAGS \

++archiver_list_spec \

• STRIP \
• RANLIB \
• CC \

+@@ -16921,12 +17591,14 @@ lt_cv_sys_global_symbol_pipe \

• lt_cv_sys_global_symbol_to_cdecl \
• lt_cv_sys_global_symbol_to_c_name_address \
• lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \

++nm_file_list_spec \

• lt_prog_compiler_no_builtin_flag \

+-lt_prog_compiler_wl \

• lt_prog_compiler_pic \

++lt_prog_compiler_wl \

• lt_prog_compiler_static \
• lt_cv_prog_compiler_c_o \
• need_locks \

++MANIFEST_TOOL \

• DSYMUTIL \
• NMEDIT \
• LIPO \

+@@ -16942,7 +17614,6 @@ no_undefined_flag \

• hardcode_libdir_flag_spec \
• hardcode_libdir_flag_spec_ld \
• hardcode_libdir_separator \

+-fix_srcfile_path \

• exclude_expsyms \
• include_expsyms \
• file_list_spec \

+@@ -16978,6 +17649,7 @@ module_cmds \

• module_expsym_cmds \
• export_symbols_cmds \
• prelink_cmds \

++postlink_cmds \

• postinstall_cmds \
• postuninstall_cmds \
• finish_cmds \

+@@ -17757,7 +18429,8 @@ $as_echo X"$file" |

• # NOTE: Changes made to this file will be lost: look at ltmain.sh.
• #
• # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,

+-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc.

• # Written by Gordon Matzigkeit, 1996
• #
• # This file is part of GNU Libtool.

+@@ -17860,19 +18533,42 @@ SP2NL=$lt_lt_SP2NL

• # turn newlines into spaces.
• NL2SP=$lt_lt_NL2SP

++# convert $build file names to $host format. ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++ ++# convert $build files to toolchain format. ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++

• # An object symbol dumper.
• OBJDUMP=$lt_OBJDUMP
• # Method to check whether dependent libraries are shared objects.
• deplibs_check_method=$lt_deplibs_check_method

+-# Command to use when deplibs_check_method == "file_magic". ++# Command to use when deplibs_check_method = "file_magic".

• file_magic_cmd=$lt_file_magic_cmd

++# How to find potential files when deplibs_check_method = "file_magic". ++file_magic_glob=$lt_file_magic_glob ++ ++# Find potential files using nocaseglob when deplibs_check_method = "file_magic". ++want_nocaseglob=$lt_want_nocaseglob ++ ++# DLL creation program. ++DLLTOOL=$lt_DLLTOOL ++ ++# Command to associate shared and link libraries. ++sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd ++

• # The archiver.
• AR=$lt_AR

++ ++# Flags to create an archive.

• AR_FLAGS=$lt_AR_FLAGS

++# How to feed a file listing to the archiver. ++archiver_list_spec=$lt_archiver_list_spec ++

• # A symbol stripping program.
• STRIP=$lt_STRIP

+@@ -17902,6 +18598,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address

• # Transform the output of nm in a C name address pair when lib prefix is needed.
• global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix

++# Specify filename containing input files for $NM. ++nm_file_list_spec=$lt_nm_file_list_spec ++ ++# The root where to search for dependent libraries,and in which our libraries should be installed. ++lt_sysroot=$lt_sysroot ++

• # The name of the directory that contains temporary libtool files.
• objdir=$objdir

+@@ -17911,6 +18613,9 @@ MAGIC_CMD=$MAGIC_CMD

• # Must we lock files when doing compilation?
• need_locks=$lt_need_locks

++# Manifest tool. ++MANIFEST_TOOL=$lt_MANIFEST_TOOL ++

• # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
• DSYMUTIL=$lt_DSYMUTIL

+@@ -18025,12 +18730,12 @@ with_gcc=$GCC

• # Compiler flag to turn off builtin functions.
• no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag

+-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl +-

• # Additional compiler flags for building library objects.
• pic_flag=$lt_lt_prog_compiler_pic

++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl ++

• # Compiler flag to prevent dynamic linking.
• link_static_flag=$lt_lt_prog_compiler_static

+@@ -18117,9 +18822,6 @@ inherit_rpath=$inherit_rpath

• # Whether libtool must link a program against all its dependency libraries.
• link_all_deplibs=$link_all_deplibs

+-# Fix the shell variable $srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path +-

• # Set to "yes" if exported symbols are required.
• always_export_symbols=$always_export_symbols

+@@ -18135,6 +18837,9 @@ include_expsyms=$lt_include_expsyms

• # Commands necessary for linking programs (against libraries) with templates.
• prelink_cmds=$lt_prelink_cmds

++# Commands necessary for finishing linking programs. ++postlink_cmds=$lt_postlink_cmds ++

• # Specify filename containing input files.
• file_list_spec=$lt_file_list_spec

+@@ -18167,210 +18872,169 @@ ltmain="$ac_aux_dir/ltmain.sh"

• # if finds mixed CR/LF and LF-only lines. Since sed operates in
• # text mode, it properly converts lines to CR/LF. This bash problem
• # is reportedly fixed, but why not run on old versions too?

+- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- case $xsi_shell in +- yes) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $* )) +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} +- +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << _LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} +- +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\${2}$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}$%%"`;; +- esac +-} +- +-# sed scripts: +-my_sed_long_opt='1s/^(-[^=]*)=.*/\1/;q' +-my_sed_long_arg='1s/^-[^=]*=//' +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/.[^.]*$/.lo/'` +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$@"` +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` +-} +- +-_LT_EOF +-esac +- +-case $lt_shell_append in +- yes) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1+=$2" +-} +-_LT_EOF +- ;; +- *) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1=$$1$2" +-} +- +-_LT_EOF +- ;; +- esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ if test x"$xsi_shell" = xyes; then ++ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ ++func_dirname ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_basename ()$/,/^} # func_basename /c\ ++func_basename ()\ ++{\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ ++func_dirname_and_basename ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ ++func_stripname ()\ ++{\ ++\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ ++\ # positional parameters, so assign one to ordinary parameter first.\ ++\ func_stripname_result=${3}\ ++\ func_stripname_result=${func_stripname_result#"${1}"}\ ++\ func_stripname_result=${func_stripname_result%"${2}"}\ ++} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ ++func_split_long_opt ()\ ++{\ ++\ func_split_long_opt_name=${1%%=*}\ ++\ func_split_long_opt_arg=${1#*=}\ ++} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ ++func_split_short_opt ()\ ++{\ ++\ func_split_short_opt_arg=${1#??}\ ++\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ ++} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ ++func_lo2o ()\ ++{\ ++\ case ${1} in\ ++\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ ++\ *) func_lo2o_result=${1} ;;\ ++\ esac\ ++} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_xform ()$/,/^} # func_xform /c\ ++func_xform ()\ ++{\ ++ func_xform_result=${1%.*}.lo\ ++} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_arith ()$/,/^} # func_arith /c\ ++func_arith ()\ ++{\ ++ func_arith_result=$(( $* ))\ ++} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_len ()$/,/^} # func_len /c\ ++func_len ()\ ++{\ ++ func_len_result=${#1}\ ++} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++fi ++ ++if test x"$lt_shell_append" = xyes; then ++ sed -e '/^func_append ()$/,/^} # func_append /c\ ++func_append ()\ ++{\ ++ eval "${1}+=\${2}"\ ++} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ ++func_append_quoted ()\ ++{\ ++\ func_quote_for_eval "${2}"\ ++\ eval "${1}+=\\ \$func_quote_for_eval_result"\ ++} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append ([a-zA-Z_]{1,}) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append ([a-zA-Z_]{1,}) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi ++ ++if test x"$_lt_function_replace_fail" = x":"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 ++$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} ++fi ++ ++ ++ mv -f "$cfgfile" "$ofile" ||

• (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  

• chmod +x "$ofile"

+diff --git a/bfd/configure.ac b/bfd/configure.ac +index 669cff7..5f57877 100644 +--- a/bfd/configure.ac ++++ b/bfd/configure.ac +@@ -253,7 +253,7 @@ changequote(,)dnl

• x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
• changequote([,])dnl
• if test -n "$x"; then

+- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" ++ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"

• fi
• # More hacks to build DLLs on Windows.

+diff --git a/binutils/configure b/binutils/configure +index 6cbf17c..6d20600 100755 +--- a/binutils/configure ++++ b/binutils/configure +@@ -658,8 +658,11 @@ OTOOL

• LIPO
• NMEDIT
• DSYMUTIL

++MANIFEST_TOOL

• RANLIB

++ac_ct_AR

• AR

++DLLTOOL

• OBJDUMP
• LN_S
• NM

+@@ -771,6 +774,7 @@ enable_static

• with_pic
• enable_fast_install
• with_gnu_ld

++with_libtool_sysroot

• enable_libtool_lock
• enable_plugins
• enable_largefile

+@@ -1443,6 +1447,8 @@ Optional Packages:

• --with-pic try to use only PIC/non-PIC objects [default=use

•                       both]
  

• --with-gnu-ld assume the C compiler uses GNU ld [default=no]

++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified).

• --with-system-zlib use installed libz
• --with-gnu-ld assume the C compiler uses GNU ld default=no
• --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib

+@@ -5159,8 +5165,8 @@ esac

+-macro_version='2.2.7a' +-macro_revision='1.3134' ++macro_version='2.4' ++macro_revision='1.3293'

+@@ -5200,7 +5206,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
• $as_echo_n "checking how to print strings... " >&6; }
• # Test print first, because it will be a builtin if present.

+-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \

• test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
• ECHO='print -r --'
• elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then

+@@ -5886,8 +5892,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;

• # Try some XSI features
• xsi_shell=no
• ( _lt_dummy="a/b/c"

+- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \

• && eval 'test $(( 1 + 1 )) -eq 2 \
  

• && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  

• && xsi_shell=yes

+@@ -5936,6 +5942,80 @@ esac

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 ++$as_echo_n "checking how to convert $build file names to $host format... " >&6; } ++if test "${lt_cv_to_host_file_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac ++ ;; ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac ++ ;; ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++ ++fi ++ ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 ++$as_echo "$lt_cv_to_host_file_cmd" >&6; } ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 ++$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } ++if test "${lt_cv_to_tool_file_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ #assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac ++ ++fi ++ ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 ++$as_echo "$lt_cv_to_tool_file_cmd" >&6; } ++ ++ ++ ++ ++

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
• $as_echo_n "checking for $LD option to reload object files... " >&6; }
• if test "${lt_cv_ld_reload_flag+set}" = set; then :

+@@ -5952,6 +6032,11 @@ case $reload_flag in

• esac
• reload_cmds='$LD$reload_flag -o $output$reload_objs'
• case $host_os in

++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;;

• darwin*)

• if test "$GCC" = yes; then
  

•   reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  

+@@ -6120,7 +6205,8 @@ mingw* | pw32*)

• lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  

• lt_cv_file_magic_cmd='func_win32_libid'
  

• else

+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'

• lt_cv_file_magic_cmd='$OBJDUMP -f'
  

• fi
• ;;

+@@ -6274,6 +6360,21 @@ esac

• fi
• { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
• $as_echo "$lt_cv_deplibs_check_method" >&6; }

++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/(..)/s/[\1]/[\1]/g;/g"` ++ fi ++ ;; ++ esac ++fi ++

• file_magic_cmd=$lt_cv_file_magic_cmd
• deplibs_check_method=$lt_cv_deplibs_check_method
• test -z "$deplibs_check_method" && deplibs_check_method=unknown

+@@ -6289,9 +6390,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DLLTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DLLTOOL"; then ++ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DLLTOOL=$ac_cv_prog_DLLTOOL ++if test -n "$DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 ++$as_echo "$DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DLLTOOL"; then ++ ac_ct_DLLTOOL=$DLLTOOL ++ # Extract the first word of "dlltool", so it can be a program name with args. ++set dummy dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DLLTOOL"; then ++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DLLTOOL="dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL ++if test -n "$ac_ct_DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 ++$as_echo "$ac_ct_DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_DLLTOOL" = x; then ++ DLLTOOL="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DLLTOOL=$ac_ct_DLLTOOL ++ fi ++else ++ DLLTOOL="$ac_cv_prog_DLLTOOL" ++fi ++ ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 ++$as_echo_n "checking how to associate runtime and link libraries... " >&6; } ++if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 ++$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++ ++ ++ ++ ++ ++

• if test -n "$ac_tool_prefix"; then

+- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 ++ for ac_prog in ar ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
• $as_echo_n "checking for $ac_word... " >&6; }
• if test "${ac_cv_prog_AR+set}" = set; then :

+@@ -6307,7 +6561,7 @@ do

• test -z "$as_dir" && as_dir=.

• for ac_exec_ext in '' $ac_executable_extensions; do
  

• if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+- ac_cv_prog_AR="${ac_tool_prefix}ar" ++ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"

• $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  

• break 2
  

• fi

+@@ -6327,11 +6581,15 @@ $as_echo "no" >&6; }

• fi

++ test -n "$AR" && break ++ done

• fi

+-if test -z "$ac_cv_prog_AR"; then ++if test -z "$AR"; then

• ac_ct_AR=$AR

+- # Extract the first word of "ar", so it can be a program name with args. +-set dummy ar; ac_word=$2 ++ for ac_prog in ar ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
• $as_echo_n "checking for $ac_word... " >&6; }
• if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :

+@@ -6347,7 +6605,7 @@ do

• test -z "$as_dir" && as_dir=.

• for ac_exec_ext in '' $ac_executable_extensions; do
  

• if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+- ac_cv_prog_ac_ct_AR="ar" ++ ac_cv_prog_ac_ct_AR="$ac_prog"

• $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  

• break 2
  

• fi

+@@ -6366,6 +6624,10 @@ else

• $as_echo "no" >&6; }
• fi

++ ++ test -n "$ac_ct_AR" && break ++done ++

• if test "x$ac_ct_AR" = x; then

• AR="false"
  

• else

+@@ -6377,12 +6639,10 @@ ac_tool_warned=yes ;;

• esac

• AR=$ac_ct_AR
  

• fi

+-else +- AR="$ac_cv_prog_AR"

• fi

+-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru ++: ${AR=ar} ++: ${AR_FLAGS=cru}

+@@ -6394,6 +6654,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 ++$as_echo_n "checking for archiver @FILE support... " >&6; } ++if test "${lt_cv_ar_at_file+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ar_at_file=no ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' ++ { { eval echo ""$as_me":${as_lineno-$LINENO}: "$lt_ar_try""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ { { eval echo ""$as_me":${as_lineno-$LINENO}: "$lt_ar_try""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 ++$as_echo "$lt_cv_ar_at_file" >&6; } ++ ++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi ++ ++ ++ ++ ++ ++ ++

• if test -n "$ac_tool_prefix"; then
• # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
• set dummy ${ac_tool_prefix}strip; ac_word=$2

+@@ -6728,8 +7046,8 @@ esac

• lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* (.*)$/extern int \1();/p' -e 's/^$symcode* .* (.*)$/extern char \1;/p'"
• # Transform an extracted symbol line into symbol name and symbol address

+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: ([^ ]*) $/ {\"\1\", (void *) 0},/p' -e 's/^$symcode* ([^ ]*) ([^ ]*)$/ {"\2", (void *) &\2},/p'" +-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'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: ([^ ]*)[ ]*$/ {\"\1\", (void *) 0},/p' -e 's/^$symcode* ([^ ]*) ([^ ]*)$/ {"\2", (void *) &\2},/p'" ++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'"

• # Handle CRLF in mingw tool chain
• opt_cr=

+@@ -6765,6 +7083,7 @@ for ac_symprfx in "" "_"; do

• else

• lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  

• fi

++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"

• # Check to see that the pipe works correctly.
• pipe_works=no

+@@ -6806,6 +7125,18 @@ _LT_EOF

•   if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  

• if $GREP ' nm_test_func$' "$nlist" >/dev/null; then

•  cat <<_LT_EOF > conftest.$ac_ext
  

++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++

• #ifdef __cplusplus
• extern "C" {
• #endif

+@@ -6817,7 +7148,7 @@ _LT_EOF

•  cat <<_LT_EOF >> conftest.$ac_ext
  

• /* The mapping between symbol names and symbols. */

+-const struct { ++LT_DLSYM_CONST struct {

• const char *name;
• void *address;
• }

+@@ -6843,8 +7174,8 @@ static const void *lt_preloaded_setup() {

• _LT_EOF

•  # Now try linking the two files.
  

•  mv conftest.$ac_objext conftstm.$ac_objext
  

+- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS

•  LIBS="conftstm.$ac_objext"
  

•  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  

•  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  

+@@ -6854,8 +7185,8 @@ _LT_EOF

• test $ac_status = 0; } && test -s conftest${ac_exeext}; then

•    pipe_works=yes
  

•  fi
  

+- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS

• else

•  echo "cannot find nm_test_func in $nlist" >&5
  

• fi

+@@ -6892,6 +7223,21 @@ else

• $as_echo "ok" >&6; }
• fi

++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++

+@@ -6910,6 +7256,40 @@ fi

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 ++$as_echo_n "checking for sysroot... " >&6; } ++ ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; ++else ++ with_libtool_sysroot=no ++fi ++ ++ ++lt_sysroot= ++case ${with_libtool_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } ++ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 ++ ;; ++esac ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 ++$as_echo "${lt_sysroot:-no}" >&6; } ++ ++

+@@ -7119,6 +7499,123 @@ esac

• need_locks="$enable_libtool_lock"

++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. ++set dummy ${ac_tool_prefix}mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$MANIFEST_TOOL"; then ++ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL ++if test -n "$MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 ++$as_echo "$MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ++ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL ++ # Extract the first word of "mt", so it can be a program name with args. ++set dummy mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_MANIFEST_TOOL"; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL ++if test -n "$ac_ct_MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 ++$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_MANIFEST_TOOL" = x; then ++ MANIFEST_TOOL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL ++ fi ++else ++ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" ++fi ++ ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 ++$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } ++if test "${lt_cv_path_mainfest_tool+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&5 ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 ++$as_echo "$lt_cv_path_mainfest_tool" >&6; } ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++ ++ ++ ++ ++

• case $host_os in

• rhapsody* | darwin*)
  

+@@ -7682,6 +8179,8 @@ _LT_EOF

•   $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  

•   echo "$AR cru libconftest.a conftest.o" >&5
  

•   $AR cru libconftest.a conftest.o 2>&5
  

++ echo "$RANLIB libconftest.a" >&5 ++ $RANLIB libconftest.a 2>&5

•   cat > conftest.c << _LT_EOF
  

• int main() { return 0;}
• _LT_EOF

+@@ -7877,7 +8376,8 @@ fi

• LIBTOOL_DEPS="$ltmain"
• # Always use our own libtool.

+-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL="$LIBTOOL/${host_alias}-libtool"

+@@ -7966,7 +8466,7 @@ aix3*)

• esac
• # Global variables:

+-ofile=libtool ++ofile=${host_alias}-libtool

• can_build_shared=yes
• # All known linkers require a `.a' archive for static linking (except MSVC,

+@@ -8264,8 +8764,6 @@ fi

• lt_prog_compiler_pic=
• lt_prog_compiler_static=

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

• if test "$GCC" = yes; then

• lt_prog_compiler_wl='-Wl,'
  

+@@ -8431,6 +8929,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

• lt_prog_compiler_pic='--shared'
• lt_prog_compiler_static='--static'
• ;;

++ nagfor*) ++ # NAG Fortran compiler ++ lt_prog_compiler_wl='-Wl,-Wl,,' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;;

•   pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  

•     # Portland Group compilers (*not* the Pentium gcc compiler,
  

• # which looks to be a dead project)

+@@ -8493,7 +8997,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

•   lt_prog_compiler_pic='-KPIC'
  

•   lt_prog_compiler_static='-Bstatic'
  

•   case $cc_basename in
  

+- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)

• lt_prog_compiler_wl='-Qoption ld ';;

•   *)
  

• lt_prog_compiler_wl='-Wl,';;

+@@ -8550,13 +9054,17 @@ case $host_os in

• lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  

• ;;
  

• esac

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +-$as_echo "$lt_prog_compiler_pic" >&6; } +- +- +- +-

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++if test "${lt_cv_prog_compiler_pic+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 ++$as_echo "$lt_cv_prog_compiler_pic" >&6; } ++lt_prog_compiler_pic=$lt_cv_prog_compiler_pic

• #
• # Check to make sure the PIC flag actually works.

+@@ -8617,6 +9125,11 @@ fi

++ ++ ++ ++ ++

• #
• # Check to make sure the static flag actually works.
• #

+@@ -8967,7 +9480,8 @@ _LT_EOF

•   allow_undefined_flag=unsupported
  

•   always_export_symbols=no
  

•   enable_shared_with_static_runtimes=yes
  

+- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '''/^[BCDGRS][ ]/s/.*[ ]([^ ]*)/\1 DATA/''' | $SED -e '''/^[AITW][ ]/s/.*[ ]//''' | sort | uniq > $export_symbols' ++ 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' ++ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'

•   if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  

•     archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  

+@@ -9066,12 +9580,12 @@ _LT_EOF

•  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  

•  hardcode_libdir_flag_spec=
  

•  hardcode_libdir_flag_spec_ld='-rpath $libdir'
  

+- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'

•  if test "x$supports_anon_versioning" = xyes; then
  

•    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  

•      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  

•      echo "local: *; };" >> $output_objdir/$libname.ver~
  

+- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'

•  fi
  

•  ;;
  

• esac

+@@ -9085,8 +9599,8 @@ _LT_EOF

• archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
• wlarc=

•   else
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   fi
  

•   ;;
  

+@@ -9104,8 +9618,8 @@ _LT_EOF

• _LT_EOF

•   elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   else
  

• ld_shlibs=no

•   fi
  

+@@ -9151,8 +9665,8 @@ _LT_EOF

• *)
  

•   if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   else
  

• ld_shlibs=no

•   fi
  

+@@ -9282,7 +9796,13 @@ _LT_EOF

• allow_undefined_flag='-berok'

•     # Determine the default libpath from the value encoded in an
  

•     # empty executable.
  

+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */
• int

+@@ -9295,22 +9815,29 @@ main ()

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi

•     hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•     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"
  

+@@ -9322,7 +9849,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• else

• # Determine the default libpath from the value encoded in an
  

• # empty executable.
  

+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */
• int

+@@ -9335,22 +9868,29 @@ main ()

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi

• hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•  # Warning - without using the other run time loading flags,
  

+@@ -9395,20 +9935,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•   # Microsoft Visual C++.
  

•   # hardcode_libdir_flag_spec is actually meaningless, as there is
  

•   # no search path for DLLs.
  

+- hardcode_libdir_flag_spec=' ' +- allow_undefined_flag=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '''s/ -lc$//'''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- old_archive_from_new_cmds='true' +- # FIXME: Should let the user specify the lib program. +- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' +- fix_srcfile_path='`cygpath -w "$srcfile"`' +- enable_shared_with_static_runtimes=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ always_export_symbols=yes ++ file_list_spec='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' -e '1\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' ++ enable_shared_with_static_runtimes=yes ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '''/^[BCDGRS][ ]/s/.*[ ]([^ ]*)/\1,DATA/''' | $SED -e '''/^[AITW][ ]/s/.*[ ]//''' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ old_postinstall_cmds='chmod 644 $oldlib' ++ postlink_cmds='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '''s/ -lc$//'''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ old_archive_from_new_cmds='true' ++ # FIXME: Should let the user specify the lib program. ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ enable_shared_with_static_runtimes=yes ++ ;; ++ esac

•   ;;
  

• darwin* | rhapsody*)
  

+@@ -9469,7 +10052,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  

• freebsd* | dragonfly*)
  

+- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

•   hardcode_libdir_flag_spec='-R$libdir'
  

•   hardcode_direct=yes
  

•   hardcode_shlibpath_var=no
  

+@@ -9477,7 +10060,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• hpux9*)
  

•   if test "$GCC" = yes; then
  

+- 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' ++ 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'

•   else
  

• 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'

•   fi
  

+@@ -9493,7 +10076,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• hpux10*)
  

•   if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

•   else
  

• archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'

•   fi
  

+@@ -9517,10 +10100,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  

•  ;;
  

• ia64*)

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

•  ;;
  

• *)

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

•  ;;
  

• esac

•   else
  

+@@ -9599,23 +10182,36 @@ fi

• irix5* | irix6* | nonstopux*)
  

•   if test "$GCC" = yes; then
  

+- 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' ++ 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'

• # Try to use the -exported_symbol ld option, if it does not
• # work, assume that -exports_file does not work either and
• # implicitly export all symbols.

+- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ # This should be the same for all languages, so no per-tag cache variable. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 ++$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } ++if test "${lt_cv_irix_exported_symbol+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */

+-int foo(void) {} ++int foo (void) { return 0; }

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+- 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' +- ++ lt_cv_irix_exported_symbol=yes ++else ++ lt_cv_irix_exported_symbol=no

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 ++$as_echo "$lt_cv_irix_exported_symbol" >&6; } ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ 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' ++ fi

•   else
  

• 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'
• 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'

+@@ -9700,7 +10296,7 @@ rm -f core conftest.err conftest.$ac_objext \

• osf4* | osf5*)	# as osf3* with the addition of -msym flag
  

•   if test "$GCC" = yes; then
  

• allow_undefined_flag=' ${wl}-expect_unresolved ${wl}*'

+- 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' ++ 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'

• hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'

•   else
  

• allow_undefined_flag=' -expect_unresolved *'

+@@ -9719,9 +10315,9 @@ rm -f core conftest.err conftest.$ac_objext \

•   no_undefined_flag=' -z defs'
  

•   if test "$GCC" = yes; then
  

• wlarc='${wl}'

+- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

• archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/(.*)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~

+- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $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'

•   else
  

• case `$CC -V 2>&1` in
• *"Compilers 5.0"*)

+@@ -10297,8 +10893,9 @@ cygwin* | mingw* | pw32* | cegcc*)

• need_version=no
• need_lib_prefix=no

+- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc

• library_names_spec='$libname.dll.a'
  

• # DLL is installed to $(libdir)/../bin by postinstall_cmds
  

• postinstall_cmds='base_file=`basename \${file}`~
  

+@@ -10331,13 +10928,71 @@ cygwin* | mingw* | pw32* | cegcc*)

•   library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  

•   ;;
  

• esac
  

++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\|/|g' -e 's| \([a-zA-Z]\):| /\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename ${file}`~ ++ dlpath=`$SHELL 2>&1 -c '''. $dir/'''${base_file}'''i; echo $dlname'''`~ ++ dldir=$destdir/`dirname $dlpath`~ ++ test -d $dldir || mkdir -p $dldir~ ++ $install_prog $dir/$dlname $dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '''. $file; echo $dlname'''`~ ++ dlpath=$dir/$dldll~ ++ $RM $dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe'

• ;;
  

• *)

++ # Assume MSVC wrapper

• library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  

++ dynamic_linker='Win32 ld.exe'

• ;;
  

• esac

+- dynamic_linker='Win32 ld.exe'

• # FIXME: first we should search . and the directory the executable is in
• shlibpath_var=PATH
• ;;

+@@ -10429,7 +11084,7 @@ haiku*)

• soname_spec='${libname}${release}${shared_ext}$major'
• shlibpath_var=LIBRARY_PATH
• shlibpath_overrides_runpath=yes

+- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'

• hardcode_into_libs=yes
• ;;

+@@ -11269,10 +11924,10 @@ else

• /* When -fvisbility=hidden is used, assume the code has been annotated
• correspondingly for the symbols needed. */
• #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

+-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default")));

• #endif

+-void fnord () { int i=42; } ++int fnord () { return 42; }

• int main ()
• {
• void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

+@@ -11375,10 +12030,10 @@ else

• /* When -fvisbility=hidden is used, assume the code has been annotated
• correspondingly for the symbols needed. */
• #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

+-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default")));

• #endif

+-void fnord () { int i=42; } ++int fnord () { return 42; }

• int main ()
• {
• void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

+@@ -15392,13 +16047,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'

• lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
• lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
• lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'

++lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' ++lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'

• reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
• reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
• OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
• deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
• file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'

++file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' ++want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' ++DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' ++sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'

• AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
• AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'

++archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'

• STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
• RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
• old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'

+@@ -15413,14 +16075,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de

• lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
• lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
• 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"`'

++nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' ++lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'

• objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
• MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
• lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'

+-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'

• lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'

++lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'

• lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
• lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
• need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'

++MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'

• DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
• NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
• LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'

+@@ -15453,12 +16118,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q

• hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
• inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
• link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'

+-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'

• always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
• export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
• exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
• include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
• prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'

++postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'

• file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
• variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
• need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'

+@@ -15513,8 +16178,13 @@ reload_flag \

• OBJDUMP \
• deplibs_check_method \
• file_magic_cmd \

++file_magic_glob \ ++want_nocaseglob \ ++DLLTOOL \ ++sharedlib_from_linklib_cmd \

• AR \
• AR_FLAGS \

++archiver_list_spec \

• STRIP \
• RANLIB \
• CC \

+@@ -15524,12 +16194,14 @@ lt_cv_sys_global_symbol_pipe \

• lt_cv_sys_global_symbol_to_cdecl \
• lt_cv_sys_global_symbol_to_c_name_address \
• lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \

++nm_file_list_spec \

• lt_prog_compiler_no_builtin_flag \

+-lt_prog_compiler_wl \

• lt_prog_compiler_pic \

++lt_prog_compiler_wl \

• lt_prog_compiler_static \
• lt_cv_prog_compiler_c_o \
• need_locks \

++MANIFEST_TOOL \

• DSYMUTIL \
• NMEDIT \
• LIPO \

+@@ -15545,7 +16217,6 @@ no_undefined_flag \

• hardcode_libdir_flag_spec \
• hardcode_libdir_flag_spec_ld \
• hardcode_libdir_separator \

+-fix_srcfile_path \

• exclude_expsyms \
• include_expsyms \
• file_list_spec \

+@@ -15581,6 +16252,7 @@ module_cmds \

• module_expsym_cmds \
• export_symbols_cmds \
• prelink_cmds \

++postlink_cmds \

• postinstall_cmds \
• postuninstall_cmds \
• finish_cmds \

+@@ -16338,7 +17010,8 @@ $as_echo X"$file" |

• # NOTE: Changes made to this file will be lost: look at ltmain.sh.
• #
• # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,

+-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc.

• # Written by Gordon Matzigkeit, 1996
• #
• # This file is part of GNU Libtool.

+@@ -16441,19 +17114,42 @@ SP2NL=$lt_lt_SP2NL

• # turn newlines into spaces.
• NL2SP=$lt_lt_NL2SP

++# convert $build file names to $host format. ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++ ++# convert $build files to toolchain format. ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++

• # An object symbol dumper.
• OBJDUMP=$lt_OBJDUMP
• # Method to check whether dependent libraries are shared objects.
• deplibs_check_method=$lt_deplibs_check_method

+-# Command to use when deplibs_check_method == "file_magic". ++# Command to use when deplibs_check_method = "file_magic".

• file_magic_cmd=$lt_file_magic_cmd

++# How to find potential files when deplibs_check_method = "file_magic". ++file_magic_glob=$lt_file_magic_glob ++ ++# Find potential files using nocaseglob when deplibs_check_method = "file_magic". ++want_nocaseglob=$lt_want_nocaseglob ++ ++# DLL creation program. ++DLLTOOL=$lt_DLLTOOL ++ ++# Command to associate shared and link libraries. ++sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd ++

• # The archiver.
• AR=$lt_AR

++ ++# Flags to create an archive.

• AR_FLAGS=$lt_AR_FLAGS

++# How to feed a file listing to the archiver. ++archiver_list_spec=$lt_archiver_list_spec ++

• # A symbol stripping program.
• STRIP=$lt_STRIP

+@@ -16483,6 +17179,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address

• # Transform the output of nm in a C name address pair when lib prefix is needed.
• global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix

++# Specify filename containing input files for $NM. ++nm_file_list_spec=$lt_nm_file_list_spec ++ ++# The root where to search for dependent libraries,and in which our libraries should be installed. ++lt_sysroot=$lt_sysroot ++

• # The name of the directory that contains temporary libtool files.
• objdir=$objdir

+@@ -16492,6 +17194,9 @@ MAGIC_CMD=$MAGIC_CMD

• # Must we lock files when doing compilation?
• need_locks=$lt_need_locks

++# Manifest tool. ++MANIFEST_TOOL=$lt_MANIFEST_TOOL ++

• # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
• DSYMUTIL=$lt_DSYMUTIL

+@@ -16606,12 +17311,12 @@ with_gcc=$GCC

• # Compiler flag to turn off builtin functions.
• no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag

+-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl +-

• # Additional compiler flags for building library objects.
• pic_flag=$lt_lt_prog_compiler_pic

++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl ++

• # Compiler flag to prevent dynamic linking.
• link_static_flag=$lt_lt_prog_compiler_static

+@@ -16698,9 +17403,6 @@ inherit_rpath=$inherit_rpath

• # Whether libtool must link a program against all its dependency libraries.
• link_all_deplibs=$link_all_deplibs

+-# Fix the shell variable $srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path +-

• # Set to "yes" if exported symbols are required.
• always_export_symbols=$always_export_symbols

+@@ -16716,6 +17418,9 @@ include_expsyms=$lt_include_expsyms

• # Commands necessary for linking programs (against libraries) with templates.
• prelink_cmds=$lt_prelink_cmds

++# Commands necessary for finishing linking programs. ++postlink_cmds=$lt_postlink_cmds ++

• # Specify filename containing input files.
• file_list_spec=$lt_file_list_spec

+@@ -16748,210 +17453,169 @@ ltmain="$ac_aux_dir/ltmain.sh"

• # if finds mixed CR/LF and LF-only lines. Since sed operates in
• # text mode, it properly converts lines to CR/LF. This bash problem
• # is reportedly fixed, but why not run on old versions too?

+- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- case $xsi_shell in +- yes) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $* )) +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} +- +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << _LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} +- +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\${2}$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}$%%"`;; +- esac +-} +- +-# sed scripts: +-my_sed_long_opt='1s/^(-[^=]*)=.*/\1/;q' +-my_sed_long_arg='1s/^-[^=]*=//' +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/.[^.]*$/.lo/'` +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$@"` +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` +-} +- +-_LT_EOF +-esac +- +-case $lt_shell_append in +- yes) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1+=$2" +-} +-_LT_EOF +- ;; +- *) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1=$$1$2" +-} +- +-_LT_EOF +- ;; +- esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ if test x"$xsi_shell" = xyes; then ++ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ ++func_dirname ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_basename ()$/,/^} # func_basename /c\ ++func_basename ()\ ++{\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ ++func_dirname_and_basename ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ ++func_stripname ()\ ++{\ ++\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ ++\ # positional parameters, so assign one to ordinary parameter first.\ ++\ func_stripname_result=${3}\ ++\ func_stripname_result=${func_stripname_result#"${1}"}\ ++\ func_stripname_result=${func_stripname_result%"${2}"}\ ++} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ ++func_split_long_opt ()\ ++{\ ++\ func_split_long_opt_name=${1%%=*}\ ++\ func_split_long_opt_arg=${1#*=}\ ++} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ ++func_split_short_opt ()\ ++{\ ++\ func_split_short_opt_arg=${1#??}\ ++\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ ++} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ ++func_lo2o ()\ ++{\ ++\ case ${1} in\ ++\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ ++\ *) func_lo2o_result=${1} ;;\ ++\ esac\ ++} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_xform ()$/,/^} # func_xform /c\ ++func_xform ()\ ++{\ ++ func_xform_result=${1%.*}.lo\ ++} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_arith ()$/,/^} # func_arith /c\ ++func_arith ()\ ++{\ ++ func_arith_result=$(( $* ))\ ++} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_len ()$/,/^} # func_len /c\ ++func_len ()\ ++{\ ++ func_len_result=${#1}\ ++} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++fi ++ ++if test x"$lt_shell_append" = xyes; then ++ sed -e '/^func_append ()$/,/^} # func_append /c\ ++func_append ()\ ++{\ ++ eval "${1}+=\${2}"\ ++} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ ++func_append_quoted ()\ ++{\ ++\ func_quote_for_eval "${2}"\ ++\ eval "${1}+=\\ \$func_quote_for_eval_result"\ ++} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append ([a-zA-Z_]{1,}) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append ([a-zA-Z_]{1,}) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi ++ ++if test x"$_lt_function_replace_fail" = x":"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 ++$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} ++fi ++ ++ ++ mv -f "$cfgfile" "$ofile" ||

• (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  

• chmod +x "$ofile"

+diff --git a/configure b/configure +index 2a74a77..ad3dfb7 100755 +--- a/configure ++++ b/configure +@@ -3444,7 +3444,7 @@ case "${target}" in

• ;;
  

• s390-*-* | s390x-*-*)

• ;;
  

+- sh*-*-* | sh[34]*-*-*) ++ sh-*-* | sh[34]*-*-*)

• ;;
  

• sh64-*-* | sh5*-*-*)

• ;;
  

+@@ -3946,7 +3946,7 @@ case "${target}" in

• or1k*-*-*)

• noconfigdirs="$noconfigdirs gdb"
  

• ;;
  

+- sh*-*-* | sh64-*-*) ++ sh-*-* | sh64-*-*)

• case "${target}" in
  

•   sh*-*-elf)
  

•      ;;
  

+diff --git a/gas/configure b/gas/configure +index f7753b8..45da030 100755 +--- a/gas/configure ++++ b/gas/configure +@@ -648,8 +648,11 @@ OTOOL

• LIPO
• NMEDIT
• DSYMUTIL

++MANIFEST_TOOL

• RANLIB

++ac_ct_AR

• AR

++DLLTOOL

• OBJDUMP
• LN_S
• NM

+@@ -761,6 +764,7 @@ enable_static

• with_pic
• enable_fast_install
• with_gnu_ld

++with_libtool_sysroot

• enable_libtool_lock
• enable_plugins
• enable_largefile

+@@ -4919,8 +4923,8 @@ esac

+-macro_version='2.2.7a' +-macro_revision='1.3134' ++macro_version='2.4' ++macro_revision='1.3293'

+@@ -4960,7 +4964,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
• $as_echo_n "checking how to print strings... " >&6; }
• # Test print first, because it will be a builtin if present.

+-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \

• test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
• ECHO='print -r --'
• elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then

+@@ -5646,8 +5650,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;

• # Try some XSI features
• xsi_shell=no
• ( _lt_dummy="a/b/c"

+- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \

• && eval 'test $(( 1 + 1 )) -eq 2 \
  

• && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  

• && xsi_shell=yes

+@@ -5696,6 +5700,80 @@ esac

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 ++$as_echo_n "checking how to convert $build file names to $host format... " >&6; } ++if test "${lt_cv_to_host_file_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac ++ ;; ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac ++ ;; ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++ ++fi ++ ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 ++$as_echo "$lt_cv_to_host_file_cmd" >&6; } ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 ++$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } ++if test "${lt_cv_to_tool_file_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ #assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac ++ ++fi ++ ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 ++$as_echo "$lt_cv_to_tool_file_cmd" >&6; } ++ ++ ++ ++ ++

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
• $as_echo_n "checking for $LD option to reload object files... " >&6; }
• if test "${lt_cv_ld_reload_flag+set}" = set; then :

+@@ -5712,6 +5790,11 @@ case $reload_flag in

• esac
• reload_cmds='$LD$reload_flag -o $output$reload_objs'
• case $host_os in

++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;;

• darwin*)

• if test "$GCC" = yes; then
  

•   reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  

+@@ -5880,7 +5963,8 @@ mingw* | pw32*)

• lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  

• lt_cv_file_magic_cmd='func_win32_libid'
  

• else

+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'

• lt_cv_file_magic_cmd='$OBJDUMP -f'
  

• fi
• ;;

+@@ -6034,6 +6118,21 @@ esac

• fi
• { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
• $as_echo "$lt_cv_deplibs_check_method" >&6; }

++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/(..)/s/[\1]/[\1]/g;/g"` ++ fi ++ ;; ++ esac ++fi ++

• file_magic_cmd=$lt_cv_file_magic_cmd
• deplibs_check_method=$lt_cv_deplibs_check_method
• test -z "$deplibs_check_method" && deplibs_check_method=unknown

+@@ -6049,9 +6148,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DLLTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DLLTOOL"; then ++ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DLLTOOL=$ac_cv_prog_DLLTOOL ++if test -n "$DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 ++$as_echo "$DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DLLTOOL"; then ++ ac_ct_DLLTOOL=$DLLTOOL ++ # Extract the first word of "dlltool", so it can be a program name with args. ++set dummy dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DLLTOOL"; then ++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DLLTOOL="dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL ++if test -n "$ac_ct_DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 ++$as_echo "$ac_ct_DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_DLLTOOL" = x; then ++ DLLTOOL="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DLLTOOL=$ac_ct_DLLTOOL ++ fi ++else ++ DLLTOOL="$ac_cv_prog_DLLTOOL" ++fi ++ ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 ++$as_echo_n "checking how to associate runtime and link libraries... " >&6; } ++if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 ++$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++ ++ ++ ++ ++ ++

• if test -n "$ac_tool_prefix"; then

+- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 ++ for ac_prog in ar ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
• $as_echo_n "checking for $ac_word... " >&6; }
• if test "${ac_cv_prog_AR+set}" = set; then :

+@@ -6067,7 +6319,7 @@ do

• test -z "$as_dir" && as_dir=.

• for ac_exec_ext in '' $ac_executable_extensions; do
  

• if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+- ac_cv_prog_AR="${ac_tool_prefix}ar" ++ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"

• $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  

• break 2
  

• fi

+@@ -6087,11 +6339,15 @@ $as_echo "no" >&6; }

• fi

++ test -n "$AR" && break ++ done

• fi

+-if test -z "$ac_cv_prog_AR"; then ++if test -z "$AR"; then

• ac_ct_AR=$AR

+- # Extract the first word of "ar", so it can be a program name with args. +-set dummy ar; ac_word=$2 ++ for ac_prog in ar ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
• $as_echo_n "checking for $ac_word... " >&6; }
• if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :

+@@ -6107,7 +6363,7 @@ do

• test -z "$as_dir" && as_dir=.

• for ac_exec_ext in '' $ac_executable_extensions; do
  

• if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+- ac_cv_prog_ac_ct_AR="ar" ++ ac_cv_prog_ac_ct_AR="$ac_prog"

• $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  

• break 2
  

• fi

+@@ -6126,6 +6382,10 @@ else

• $as_echo "no" >&6; }
• fi

++ ++ test -n "$ac_ct_AR" && break ++done ++

• if test "x$ac_ct_AR" = x; then

• AR="false"
  

• else

+@@ -6137,12 +6397,10 @@ ac_tool_warned=yes ;;

• esac

• AR=$ac_ct_AR
  

• fi

+-else +- AR="$ac_cv_prog_AR"

• fi

+-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru ++: ${AR=ar} ++: ${AR_FLAGS=cru}

+@@ -6154,6 +6412,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 ++$as_echo_n "checking for archiver @FILE support... " >&6; } ++if test "${lt_cv_ar_at_file+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ar_at_file=no ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' ++ { { eval echo ""$as_me":${as_lineno-$LINENO}: "$lt_ar_try""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ { { eval echo ""$as_me":${as_lineno-$LINENO}: "$lt_ar_try""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 ++$as_echo "$lt_cv_ar_at_file" >&6; } ++ ++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi ++ ++ ++ ++ ++ ++ ++

• if test -n "$ac_tool_prefix"; then
• # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
• set dummy ${ac_tool_prefix}strip; ac_word=$2

+@@ -6488,8 +6804,8 @@ esac

• lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* (.*)$/extern int \1();/p' -e 's/^$symcode* .* (.*)$/extern char \1;/p'"
• # Transform an extracted symbol line into symbol name and symbol address

+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: ([^ ]*) $/ {\"\1\", (void *) 0},/p' -e 's/^$symcode* ([^ ]*) ([^ ]*)$/ {"\2", (void *) &\2},/p'" +-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'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: ([^ ]*)[ ]*$/ {\"\1\", (void *) 0},/p' -e 's/^$symcode* ([^ ]*) ([^ ]*)$/ {"\2", (void *) &\2},/p'" ++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'"

• # Handle CRLF in mingw tool chain
• opt_cr=

+@@ -6525,6 +6841,7 @@ for ac_symprfx in "" "_"; do

• else

• lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  

• fi

++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"

• # Check to see that the pipe works correctly.
• pipe_works=no

+@@ -6566,6 +6883,18 @@ _LT_EOF

•   if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  

• if $GREP ' nm_test_func$' "$nlist" >/dev/null; then

•  cat <<_LT_EOF > conftest.$ac_ext
  

++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++

• #ifdef __cplusplus
• extern "C" {
• #endif

+@@ -6577,7 +6906,7 @@ _LT_EOF

•  cat <<_LT_EOF >> conftest.$ac_ext
  

• /* The mapping between symbol names and symbols. */

+-const struct { ++LT_DLSYM_CONST struct {

• const char *name;
• void *address;
• }

+@@ -6603,8 +6932,8 @@ static const void *lt_preloaded_setup() {

• _LT_EOF

•  # Now try linking the two files.
  

•  mv conftest.$ac_objext conftstm.$ac_objext
  

+- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS

•  LIBS="conftstm.$ac_objext"
  

•  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  

•  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  

+@@ -6614,8 +6943,8 @@ _LT_EOF

• test $ac_status = 0; } && test -s conftest${ac_exeext}; then

•    pipe_works=yes
  

•  fi
  

+- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS

• else

•  echo "cannot find nm_test_func in $nlist" >&5
  

• fi

+@@ -6652,6 +6981,21 @@ else

• $as_echo "ok" >&6; }
• fi

++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++

+@@ -6670,6 +7014,40 @@ fi

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 ++$as_echo_n "checking for sysroot... " >&6; } ++ ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; ++else ++ with_libtool_sysroot=no ++fi ++ ++ ++lt_sysroot= ++case ${with_libtool_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } ++ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 ++ ;; ++esac ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 ++$as_echo "${lt_sysroot:-no}" >&6; } ++ ++

+@@ -6879,6 +7257,123 @@ esac

• need_locks="$enable_libtool_lock"

++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. ++set dummy ${ac_tool_prefix}mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$MANIFEST_TOOL"; then ++ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL ++if test -n "$MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 ++$as_echo "$MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ++ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL ++ # Extract the first word of "mt", so it can be a program name with args. ++set dummy mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_MANIFEST_TOOL"; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL ++if test -n "$ac_ct_MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 ++$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_MANIFEST_TOOL" = x; then ++ MANIFEST_TOOL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL ++ fi ++else ++ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" ++fi ++ ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 ++$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } ++if test "${lt_cv_path_mainfest_tool+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&5 ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 ++$as_echo "$lt_cv_path_mainfest_tool" >&6; } ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++ ++ ++ ++ ++

• case $host_os in

• rhapsody* | darwin*)
  

+@@ -7442,6 +7937,8 @@ _LT_EOF

•   $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  

•   echo "$AR cru libconftest.a conftest.o" >&5
  

•   $AR cru libconftest.a conftest.o 2>&5
  

++ echo "$RANLIB libconftest.a" >&5 ++ $RANLIB libconftest.a 2>&5

•   cat > conftest.c << _LT_EOF
  

• int main() { return 0;}
• _LT_EOF

+@@ -7637,7 +8134,8 @@ fi

• LIBTOOL_DEPS="$ltmain"
• # Always use our own libtool.

+-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL="$LIBTOOL/${host_alias}-libtool"

+@@ -7726,7 +8224,7 @@ aix3*)

• esac
• # Global variables:

+-ofile=libtool ++ofile=${host_alias}-libtool

• can_build_shared=yes
• # All known linkers require a `.a' archive for static linking (except MSVC,

+@@ -8024,8 +8522,6 @@ fi

• lt_prog_compiler_pic=
• lt_prog_compiler_static=

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

• if test "$GCC" = yes; then

• lt_prog_compiler_wl='-Wl,'
  

+@@ -8191,6 +8687,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

• lt_prog_compiler_pic='--shared'
• lt_prog_compiler_static='--static'
• ;;

++ nagfor*) ++ # NAG Fortran compiler ++ lt_prog_compiler_wl='-Wl,-Wl,,' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;;

•   pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  

•     # Portland Group compilers (*not* the Pentium gcc compiler,
  

• # which looks to be a dead project)

+@@ -8253,7 +8755,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

•   lt_prog_compiler_pic='-KPIC'
  

•   lt_prog_compiler_static='-Bstatic'
  

•   case $cc_basename in
  

+- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)

• lt_prog_compiler_wl='-Qoption ld ';;

•   *)
  

• lt_prog_compiler_wl='-Wl,';;

+@@ -8310,13 +8812,17 @@ case $host_os in

• lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  

• ;;
  

• esac

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +-$as_echo "$lt_prog_compiler_pic" >&6; } +- +- +- +-

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++if test "${lt_cv_prog_compiler_pic+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 ++$as_echo "$lt_cv_prog_compiler_pic" >&6; } ++lt_prog_compiler_pic=$lt_cv_prog_compiler_pic

• #
• # Check to make sure the PIC flag actually works.

+@@ -8377,6 +8883,11 @@ fi

++ ++ ++ ++ ++

• #
• # Check to make sure the static flag actually works.
• #

+@@ -8727,7 +9238,8 @@ _LT_EOF

•   allow_undefined_flag=unsupported
  

•   always_export_symbols=no
  

•   enable_shared_with_static_runtimes=yes
  

+- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '''/^[BCDGRS][ ]/s/.*[ ]([^ ]*)/\1 DATA/''' | $SED -e '''/^[AITW][ ]/s/.*[ ]//''' | sort | uniq > $export_symbols' ++ 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' ++ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'

•   if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  

•     archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  

+@@ -8826,12 +9338,12 @@ _LT_EOF

•  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  

•  hardcode_libdir_flag_spec=
  

•  hardcode_libdir_flag_spec_ld='-rpath $libdir'
  

+- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'

•  if test "x$supports_anon_versioning" = xyes; then
  

•    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  

•      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  

•      echo "local: *; };" >> $output_objdir/$libname.ver~
  

+- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'

•  fi
  

•  ;;
  

• esac

+@@ -8845,8 +9357,8 @@ _LT_EOF

• archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
• wlarc=

•   else
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   fi
  

•   ;;
  

+@@ -8864,8 +9376,8 @@ _LT_EOF

• _LT_EOF

•   elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   else
  

• ld_shlibs=no

•   fi
  

+@@ -8911,8 +9423,8 @@ _LT_EOF

• *)
  

•   if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   else
  

• ld_shlibs=no

•   fi
  

+@@ -9042,7 +9554,13 @@ _LT_EOF

• allow_undefined_flag='-berok'

•     # Determine the default libpath from the value encoded in an
  

•     # empty executable.
  

+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */
• int

+@@ -9055,22 +9573,29 @@ main ()

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi

•     hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•     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"
  

+@@ -9082,7 +9607,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• else

• # Determine the default libpath from the value encoded in an
  

• # empty executable.
  

+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */
• int

+@@ -9095,22 +9626,29 @@ main ()

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi

• hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•  # Warning - without using the other run time loading flags,
  

+@@ -9155,20 +9693,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•   # Microsoft Visual C++.
  

•   # hardcode_libdir_flag_spec is actually meaningless, as there is
  

•   # no search path for DLLs.
  

+- hardcode_libdir_flag_spec=' ' +- allow_undefined_flag=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '''s/ -lc$//'''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- old_archive_from_new_cmds='true' +- # FIXME: Should let the user specify the lib program. +- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' +- fix_srcfile_path='`cygpath -w "$srcfile"`' +- enable_shared_with_static_runtimes=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ always_export_symbols=yes ++ file_list_spec='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' -e '1\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' ++ enable_shared_with_static_runtimes=yes ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '''/^[BCDGRS][ ]/s/.*[ ]([^ ]*)/\1,DATA/''' | $SED -e '''/^[AITW][ ]/s/.*[ ]//''' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ old_postinstall_cmds='chmod 644 $oldlib' ++ postlink_cmds='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '''s/ -lc$//'''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ old_archive_from_new_cmds='true' ++ # FIXME: Should let the user specify the lib program. ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ enable_shared_with_static_runtimes=yes ++ ;; ++ esac

•   ;;
  

• darwin* | rhapsody*)
  

+@@ -9229,7 +9810,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  

• freebsd* | dragonfly*)
  

+- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

•   hardcode_libdir_flag_spec='-R$libdir'
  

•   hardcode_direct=yes
  

•   hardcode_shlibpath_var=no
  

+@@ -9237,7 +9818,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• hpux9*)
  

•   if test "$GCC" = yes; then
  

+- 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' ++ 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'

•   else
  

• 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'

•   fi
  

+@@ -9253,7 +9834,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• hpux10*)
  

•   if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

•   else
  

• archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'

•   fi
  

+@@ -9277,10 +9858,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  

•  ;;
  

• ia64*)

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

•  ;;
  

• *)

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

•  ;;
  

• esac

•   else
  

+@@ -9359,23 +9940,36 @@ fi

• irix5* | irix6* | nonstopux*)
  

•   if test "$GCC" = yes; then
  

+- 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' ++ 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'

• # Try to use the -exported_symbol ld option, if it does not
• # work, assume that -exports_file does not work either and
• # implicitly export all symbols.

+- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ # This should be the same for all languages, so no per-tag cache variable. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 ++$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } ++if test "${lt_cv_irix_exported_symbol+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */

+-int foo(void) {} ++int foo (void) { return 0; }

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+- 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' +- ++ lt_cv_irix_exported_symbol=yes ++else ++ lt_cv_irix_exported_symbol=no

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 ++$as_echo "$lt_cv_irix_exported_symbol" >&6; } ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ 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' ++ fi

•   else
  

• 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'
• 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'

+@@ -9460,7 +10054,7 @@ rm -f core conftest.err conftest.$ac_objext \

• osf4* | osf5*)	# as osf3* with the addition of -msym flag
  

•   if test "$GCC" = yes; then
  

• allow_undefined_flag=' ${wl}-expect_unresolved ${wl}*'

+- 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' ++ 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'

• hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'

•   else
  

• allow_undefined_flag=' -expect_unresolved *'

+@@ -9479,9 +10073,9 @@ rm -f core conftest.err conftest.$ac_objext \

•   no_undefined_flag=' -z defs'
  

•   if test "$GCC" = yes; then
  

• wlarc='${wl}'

+- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

• archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/(.*)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~

+- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $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'

•   else
  

• case `$CC -V 2>&1` in
• *"Compilers 5.0"*)

+@@ -10057,8 +10651,9 @@ cygwin* | mingw* | pw32* | cegcc*)

• need_version=no
• need_lib_prefix=no

+- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc

• library_names_spec='$libname.dll.a'
  

• # DLL is installed to $(libdir)/../bin by postinstall_cmds
  

• postinstall_cmds='base_file=`basename \${file}`~
  

+@@ -10091,13 +10686,71 @@ cygwin* | mingw* | pw32* | cegcc*)

•   library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  

•   ;;
  

• esac
  

++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\|/|g' -e 's| \([a-zA-Z]\):| /\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename ${file}`~ ++ dlpath=`$SHELL 2>&1 -c '''. $dir/'''${base_file}'''i; echo $dlname'''`~ ++ dldir=$destdir/`dirname $dlpath`~ ++ test -d $dldir || mkdir -p $dldir~ ++ $install_prog $dir/$dlname $dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '''. $file; echo $dlname'''`~ ++ dlpath=$dir/$dldll~ ++ $RM $dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe'

• ;;
  

• *)

++ # Assume MSVC wrapper

• library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  

++ dynamic_linker='Win32 ld.exe'

• ;;
  

• esac

+- dynamic_linker='Win32 ld.exe'

• # FIXME: first we should search . and the directory the executable is in
• shlibpath_var=PATH
• ;;

+@@ -10189,7 +10842,7 @@ haiku*)

• soname_spec='${libname}${release}${shared_ext}$major'
• shlibpath_var=LIBRARY_PATH
• shlibpath_overrides_runpath=yes

+- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'

• hardcode_into_libs=yes
• ;;

+@@ -11029,10 +11682,10 @@ else

• /* When -fvisbility=hidden is used, assume the code has been annotated
• correspondingly for the symbols needed. */
• #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

+-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default")));

• #endif

+-void fnord () { int i=42; } ++int fnord () { return 42; }

• int main ()
• {
• void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

+@@ -11135,10 +11788,10 @@ else

• /* When -fvisbility=hidden is used, assume the code has been annotated
• correspondingly for the symbols needed. */
• #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

+-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default")));

• #endif

+-void fnord () { int i=42; } ++int fnord () { return 42; }

• int main ()
• {
• void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

+@@ -15350,13 +16003,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'

• lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
• lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
• lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'

++lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' ++lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'

• reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
• reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
• OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
• deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
• file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'

++file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' ++want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' ++DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' ++sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'

• AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
• AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'

++archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'

• STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
• RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
• old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'

+@@ -15371,14 +16031,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de

• lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
• lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
• 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"`'

++nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' ++lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'

• objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
• MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
• lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'

+-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'

• lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'

++lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'

• lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
• lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
• need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'

++MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'

• DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
• NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
• LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'

+@@ -15411,12 +16074,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q

• hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
• inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
• link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'

+-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'

• always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
• export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
• exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
• include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
• prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'

++postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'

• file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
• variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
• need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'

+@@ -15471,8 +16134,13 @@ reload_flag \

• OBJDUMP \
• deplibs_check_method \
• file_magic_cmd \

++file_magic_glob \ ++want_nocaseglob \ ++DLLTOOL \ ++sharedlib_from_linklib_cmd \

• AR \
• AR_FLAGS \

++archiver_list_spec \

• STRIP \
• RANLIB \
• CC \

+@@ -15482,12 +16150,14 @@ lt_cv_sys_global_symbol_pipe \

• lt_cv_sys_global_symbol_to_cdecl \
• lt_cv_sys_global_symbol_to_c_name_address \
• lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \

++nm_file_list_spec \

• lt_prog_compiler_no_builtin_flag \

+-lt_prog_compiler_wl \

• lt_prog_compiler_pic \

++lt_prog_compiler_wl \

• lt_prog_compiler_static \
• lt_cv_prog_compiler_c_o \
• need_locks \

++MANIFEST_TOOL \

• DSYMUTIL \
• NMEDIT \
• LIPO \

+@@ -15503,7 +16173,6 @@ no_undefined_flag \

• hardcode_libdir_flag_spec \
• hardcode_libdir_flag_spec_ld \
• hardcode_libdir_separator \

+-fix_srcfile_path \

• exclude_expsyms \
• include_expsyms \
• file_list_spec \

+@@ -15539,6 +16208,7 @@ module_cmds \

• module_expsym_cmds \
• export_symbols_cmds \
• prelink_cmds \

++postlink_cmds \

• postinstall_cmds \
• postuninstall_cmds \
• finish_cmds \

+@@ -16303,7 +16973,8 @@ $as_echo X"$file" |

• # NOTE: Changes made to this file will be lost: look at ltmain.sh.
• #
• # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,

+-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc.

• # Written by Gordon Matzigkeit, 1996
• #
• # This file is part of GNU Libtool.

+@@ -16406,19 +17077,42 @@ SP2NL=$lt_lt_SP2NL

• # turn newlines into spaces.
• NL2SP=$lt_lt_NL2SP

++# convert $build file names to $host format. ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++ ++# convert $build files to toolchain format. ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++

• # An object symbol dumper.
• OBJDUMP=$lt_OBJDUMP
• # Method to check whether dependent libraries are shared objects.
• deplibs_check_method=$lt_deplibs_check_method

+-# Command to use when deplibs_check_method == "file_magic". ++# Command to use when deplibs_check_method = "file_magic".

• file_magic_cmd=$lt_file_magic_cmd

++# How to find potential files when deplibs_check_method = "file_magic". ++file_magic_glob=$lt_file_magic_glob ++ ++# Find potential files using nocaseglob when deplibs_check_method = "file_magic". ++want_nocaseglob=$lt_want_nocaseglob ++ ++# DLL creation program. ++DLLTOOL=$lt_DLLTOOL ++ ++# Command to associate shared and link libraries. ++sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd ++

• # The archiver.
• AR=$lt_AR

++ ++# Flags to create an archive.

• AR_FLAGS=$lt_AR_FLAGS

++# How to feed a file listing to the archiver. ++archiver_list_spec=$lt_archiver_list_spec ++

• # A symbol stripping program.
• STRIP=$lt_STRIP

+@@ -16448,6 +17142,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address

• # Transform the output of nm in a C name address pair when lib prefix is needed.
• global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix

++# Specify filename containing input files for $NM. ++nm_file_list_spec=$lt_nm_file_list_spec ++ ++# The root where to search for dependent libraries,and in which our libraries should be installed. ++lt_sysroot=$lt_sysroot ++

• # The name of the directory that contains temporary libtool files.
• objdir=$objdir

+@@ -16457,6 +17157,9 @@ MAGIC_CMD=$MAGIC_CMD

• # Must we lock files when doing compilation?
• need_locks=$lt_need_locks

++# Manifest tool. ++MANIFEST_TOOL=$lt_MANIFEST_TOOL ++

• # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
• DSYMUTIL=$lt_DSYMUTIL

+@@ -16571,12 +17274,12 @@ with_gcc=$GCC

• # Compiler flag to turn off builtin functions.
• no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag

+-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl +-

• # Additional compiler flags for building library objects.
• pic_flag=$lt_lt_prog_compiler_pic

++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl ++

• # Compiler flag to prevent dynamic linking.
• link_static_flag=$lt_lt_prog_compiler_static

+@@ -16663,9 +17366,6 @@ inherit_rpath=$inherit_rpath

• # Whether libtool must link a program against all its dependency libraries.
• link_all_deplibs=$link_all_deplibs

+-# Fix the shell variable $srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path +-

• # Set to "yes" if exported symbols are required.
• always_export_symbols=$always_export_symbols

+@@ -16681,6 +17381,9 @@ include_expsyms=$lt_include_expsyms

• # Commands necessary for linking programs (against libraries) with templates.
• prelink_cmds=$lt_prelink_cmds

++# Commands necessary for finishing linking programs. ++postlink_cmds=$lt_postlink_cmds ++

• # Specify filename containing input files.
• file_list_spec=$lt_file_list_spec

+@@ -16713,210 +17416,169 @@ ltmain="$ac_aux_dir/ltmain.sh"

• # if finds mixed CR/LF and LF-only lines. Since sed operates in
• # text mode, it properly converts lines to CR/LF. This bash problem
• # is reportedly fixed, but why not run on old versions too?

+- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- case $xsi_shell in +- yes) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $* )) +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} +- +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << _LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} +- +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\${2}$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}$%%"`;; +- esac +-} +- +-# sed scripts: +-my_sed_long_opt='1s/^(-[^=]*)=.*/\1/;q' +-my_sed_long_arg='1s/^-[^=]*=//' +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/.[^.]*$/.lo/'` +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$@"` +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` +-} +- +-_LT_EOF +-esac +- +-case $lt_shell_append in +- yes) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1+=$2" +-} +-_LT_EOF +- ;; +- *) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1=$$1$2" +-} +- +-_LT_EOF +- ;; +- esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ if test x"$xsi_shell" = xyes; then ++ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ ++func_dirname ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_basename ()$/,/^} # func_basename /c\ ++func_basename ()\ ++{\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ ++func_dirname_and_basename ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ ++func_stripname ()\ ++{\ ++\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ ++\ # positional parameters, so assign one to ordinary parameter first.\ ++\ func_stripname_result=${3}\ ++\ func_stripname_result=${func_stripname_result#"${1}"}\ ++\ func_stripname_result=${func_stripname_result%"${2}"}\ ++} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ ++func_split_long_opt ()\ ++{\ ++\ func_split_long_opt_name=${1%%=*}\ ++\ func_split_long_opt_arg=${1#*=}\ ++} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ ++func_split_short_opt ()\ ++{\ ++\ func_split_short_opt_arg=${1#??}\ ++\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ ++} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ ++func_lo2o ()\ ++{\ ++\ case ${1} in\ ++\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ ++\ *) func_lo2o_result=${1} ;;\ ++\ esac\ ++} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_xform ()$/,/^} # func_xform /c\ ++func_xform ()\ ++{\ ++ func_xform_result=${1%.*}.lo\ ++} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_arith ()$/,/^} # func_arith /c\ ++func_arith ()\ ++{\ ++ func_arith_result=$(( $* ))\ ++} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_len ()$/,/^} # func_len /c\ ++func_len ()\ ++{\ ++ func_len_result=${#1}\ ++} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++fi ++ ++if test x"$lt_shell_append" = xyes; then ++ sed -e '/^func_append ()$/,/^} # func_append /c\ ++func_append ()\ ++{\ ++ eval "${1}+=\${2}"\ ++} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ ++func_append_quoted ()\ ++{\ ++\ func_quote_for_eval "${2}"\ ++\ eval "${1}+=\\ \$func_quote_for_eval_result"\ ++} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append ([a-zA-Z_]{1,}) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append ([a-zA-Z_]{1,}) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi ++ ++if test x"$_lt_function_replace_fail" = x":"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 ++$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} ++fi ++ ++ ++ mv -f "$cfgfile" "$ofile" ||

• (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  

• chmod +x "$ofile"

+diff --git a/gprof/configure b/gprof/configure +index 626e1c7..a88719c 100755 +--- a/gprof/configure ++++ b/gprof/configure +@@ -630,8 +630,11 @@ OTOOL

• LIPO
• NMEDIT
• DSYMUTIL

++MANIFEST_TOOL

• RANLIB

++ac_ct_AR

• AR

++DLLTOOL

• OBJDUMP
• LN_S
• NM

+@@ -743,6 +746,7 @@ enable_static

• with_pic
• enable_fast_install
• with_gnu_ld

++with_libtool_sysroot

• enable_libtool_lock
• enable_plugins
• enable_largefile

+@@ -1401,6 +1405,8 @@ Optional Packages:

• --with-pic try to use only PIC/non-PIC objects [default=use

•                       both]
  

• --with-gnu-ld assume the C compiler uses GNU ld [default=no]

++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified).

• Some influential environment variables:
• CC C compiler command

+@@ -4835,8 +4841,8 @@ esac

+-macro_version='2.2.7a' +-macro_revision='1.3134' ++macro_version='2.4' ++macro_revision='1.3293'

+@@ -4876,7 +4882,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
• $as_echo_n "checking how to print strings... " >&6; }
• # Test print first, because it will be a builtin if present.

+-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \

• test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
• ECHO='print -r --'
• elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then

+@@ -5562,8 +5568,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;

• # Try some XSI features
• xsi_shell=no
• ( _lt_dummy="a/b/c"

+- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \

• && eval 'test $(( 1 + 1 )) -eq 2 \
  

• && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  

• && xsi_shell=yes

+@@ -5612,6 +5618,80 @@ esac

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 ++$as_echo_n "checking how to convert $build file names to $host format... " >&6; } ++if test "${lt_cv_to_host_file_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac ++ ;; ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac ++ ;; ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++ ++fi ++ ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 ++$as_echo "$lt_cv_to_host_file_cmd" >&6; } ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 ++$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } ++if test "${lt_cv_to_tool_file_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ #assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac ++ ++fi ++ ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 ++$as_echo "$lt_cv_to_tool_file_cmd" >&6; } ++ ++ ++ ++ ++

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
• $as_echo_n "checking for $LD option to reload object files... " >&6; }
• if test "${lt_cv_ld_reload_flag+set}" = set; then :

+@@ -5628,6 +5708,11 @@ case $reload_flag in

• esac
• reload_cmds='$LD$reload_flag -o $output$reload_objs'
• case $host_os in

++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;;

• darwin*)

• if test "$GCC" = yes; then
  

•   reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  

+@@ -5796,7 +5881,8 @@ mingw* | pw32*)

• lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  

• lt_cv_file_magic_cmd='func_win32_libid'
  

• else

+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'

• lt_cv_file_magic_cmd='$OBJDUMP -f'
  

• fi
• ;;

+@@ -5873,11 +5959,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)

• lt_cv_deplibs_check_method=pass_all
• ;;

+-linux-uclibc*) +- lt_cv_deplibs_check_method=pass_all +- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` +- ;; +-

• netbsd*)
• if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then

• lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
  

+@@ -5955,6 +6036,21 @@ esac

• fi
• { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
• $as_echo "$lt_cv_deplibs_check_method" >&6; }

++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/(..)/s/[\1]/[\1]/g;/g"` ++ fi ++ ;; ++ esac ++fi ++

• file_magic_cmd=$lt_cv_file_magic_cmd
• deplibs_check_method=$lt_cv_deplibs_check_method
• test -z "$deplibs_check_method" && deplibs_check_method=unknown

+@@ -5970,9 +6066,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DLLTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DLLTOOL"; then ++ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DLLTOOL=$ac_cv_prog_DLLTOOL ++if test -n "$DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 ++$as_echo "$DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DLLTOOL"; then ++ ac_ct_DLLTOOL=$DLLTOOL ++ # Extract the first word of "dlltool", so it can be a program name with args. ++set dummy dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DLLTOOL"; then ++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DLLTOOL="dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL ++if test -n "$ac_ct_DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 ++$as_echo "$ac_ct_DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_DLLTOOL" = x; then ++ DLLTOOL="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DLLTOOL=$ac_ct_DLLTOOL ++ fi ++else ++ DLLTOOL="$ac_cv_prog_DLLTOOL" ++fi ++ ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 ++$as_echo_n "checking how to associate runtime and link libraries... " >&6; } ++if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 ++$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++ ++ ++ ++ ++ ++

• if test -n "$ac_tool_prefix"; then

+- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 ++ for ac_prog in ar ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
• $as_echo_n "checking for $ac_word... " >&6; }
• if test "${ac_cv_prog_AR+set}" = set; then :

+@@ -5988,7 +6237,7 @@ do

• test -z "$as_dir" && as_dir=.

• for ac_exec_ext in '' $ac_executable_extensions; do
  

• if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+- ac_cv_prog_AR="${ac_tool_prefix}ar" ++ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"

• $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  

• break 2
  

• fi

+@@ -6008,11 +6257,15 @@ $as_echo "no" >&6; }

• fi

++ test -n "$AR" && break ++ done

• fi

+-if test -z "$ac_cv_prog_AR"; then ++if test -z "$AR"; then

• ac_ct_AR=$AR

+- # Extract the first word of "ar", so it can be a program name with args. +-set dummy ar; ac_word=$2 ++ for ac_prog in ar ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
• $as_echo_n "checking for $ac_word... " >&6; }
• if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :

+@@ -6028,7 +6281,7 @@ do

• test -z "$as_dir" && as_dir=.

• for ac_exec_ext in '' $ac_executable_extensions; do
  

• if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+- ac_cv_prog_ac_ct_AR="ar" ++ ac_cv_prog_ac_ct_AR="$ac_prog"

• $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  

• break 2
  

• fi

+@@ -6047,6 +6300,10 @@ else

• $as_echo "no" >&6; }
• fi

++ ++ test -n "$ac_ct_AR" && break ++done ++

• if test "x$ac_ct_AR" = x; then

• AR="false"
  

• else

+@@ -6058,12 +6315,10 @@ ac_tool_warned=yes ;;

• esac

• AR=$ac_ct_AR
  

• fi

+-else +- AR="$ac_cv_prog_AR"

• fi

+-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru ++: ${AR=ar} ++: ${AR_FLAGS=cru}

+@@ -6075,6 +6330,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 ++$as_echo_n "checking for archiver @FILE support... " >&6; } ++if test "${lt_cv_ar_at_file+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ar_at_file=no ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' ++ { { eval echo ""$as_me":${as_lineno-$LINENO}: "$lt_ar_try""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ { { eval echo ""$as_me":${as_lineno-$LINENO}: "$lt_ar_try""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 ++$as_echo "$lt_cv_ar_at_file" >&6; } ++ ++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi ++ ++ ++ ++ ++ ++ ++

• if test -n "$ac_tool_prefix"; then
• # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
• set dummy ${ac_tool_prefix}strip; ac_word=$2

+@@ -6409,8 +6722,8 @@ esac

• lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* (.*)$/extern int \1();/p' -e 's/^$symcode* .* (.*)$/extern char \1;/p'"
• # Transform an extracted symbol line into symbol name and symbol address

+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: ([^ ]*) $/ {\"\1\", (void *) 0},/p' -e 's/^$symcode* ([^ ]*) ([^ ]*)$/ {"\2", (void *) &\2},/p'" +-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'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: ([^ ]*)[ ]*$/ {\"\1\", (void *) 0},/p' -e 's/^$symcode* ([^ ]*) ([^ ]*)$/ {"\2", (void *) &\2},/p'" ++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'"

• # Handle CRLF in mingw tool chain
• opt_cr=

+@@ -6446,6 +6759,7 @@ for ac_symprfx in "" "_"; do

• else

• lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  

• fi

++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"

• # Check to see that the pipe works correctly.
• pipe_works=no

+@@ -6487,6 +6801,18 @@ _LT_EOF

•   if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  

• if $GREP ' nm_test_func$' "$nlist" >/dev/null; then

•  cat <<_LT_EOF > conftest.$ac_ext
  

++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++

• #ifdef __cplusplus
• extern "C" {
• #endif

+@@ -6498,7 +6824,7 @@ _LT_EOF

•  cat <<_LT_EOF >> conftest.$ac_ext
  

• /* The mapping between symbol names and symbols. */

+-const struct { ++LT_DLSYM_CONST struct {

• const char *name;
• void *address;
• }

+@@ -6524,8 +6850,8 @@ static const void *lt_preloaded_setup() {

• _LT_EOF

•  # Now try linking the two files.
  

•  mv conftest.$ac_objext conftstm.$ac_objext
  

+- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS

•  LIBS="conftstm.$ac_objext"
  

•  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  

•  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  

+@@ -6535,8 +6861,8 @@ _LT_EOF

• test $ac_status = 0; } && test -s conftest${ac_exeext}; then

•    pipe_works=yes
  

•  fi
  

+- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS

• else

•  echo "cannot find nm_test_func in $nlist" >&5
  

• fi

+@@ -6573,6 +6899,18 @@ else

• $as_echo "ok" >&6; }
• fi

++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ ++ ++ ++ ++ ++

+@@ -6594,6 +6932,43 @@ fi

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 ++$as_echo_n "checking for sysroot... " >&6; } ++ ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; ++else ++ with_libtool_sysroot=no ++fi ++ ++ ++lt_sysroot= ++case ${with_libtool_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } ++ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 ++ ;; ++esac ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 ++$as_echo "${lt_sysroot:-no}" >&6; } ++ ++ ++ ++ ++

• # Check whether --enable-libtool-lock was given.
• if test "${enable_libtool_lock+set}" = set; then :
• enableval=$enable_libtool_lock;

+@@ -6800,6 +7175,123 @@ esac

• need_locks="$enable_libtool_lock"

++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. ++set dummy ${ac_tool_prefix}mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$MANIFEST_TOOL"; then ++ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL ++if test -n "$MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 ++$as_echo "$MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ++ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL ++ # Extract the first word of "mt", so it can be a program name with args. ++set dummy mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_MANIFEST_TOOL"; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL ++if test -n "$ac_ct_MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 ++$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_MANIFEST_TOOL" = x; then ++ MANIFEST_TOOL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL ++ fi ++else ++ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" ++fi ++ ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 ++$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } ++if test "${lt_cv_path_mainfest_tool+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&5 ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 ++$as_echo "$lt_cv_path_mainfest_tool" >&6; } ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++ ++ ++ ++ ++

• case $host_os in

• rhapsody* | darwin*)
  

+@@ -7363,6 +7855,8 @@ _LT_EOF

•   $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  

•   echo "$AR cru libconftest.a conftest.o" >&5
  

•   $AR cru libconftest.a conftest.o 2>&5
  

++ echo "$RANLIB libconftest.a" >&5 ++ $RANLIB libconftest.a 2>&5

•   cat > conftest.c << _LT_EOF
  

• int main() { return 0;}
• _LT_EOF

+@@ -7558,7 +8052,8 @@ fi

• LIBTOOL_DEPS="$ltmain"
• # Always use our own libtool.

+-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL="$LIBTOOL/${host_alias}-libtool"

+@@ -7647,7 +8142,7 @@ aix3*)

• esac
• # Global variables:

+-ofile=libtool ++ofile=${host_alias}-libtool

• can_build_shared=yes
• # All known linkers require a `.a' archive for static linking (except MSVC,

+@@ -7945,8 +8440,6 @@ fi

• lt_prog_compiler_pic=
• lt_prog_compiler_static=

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

• if test "$GCC" = yes; then

• lt_prog_compiler_wl='-Wl,'
  

+@@ -8112,6 +8605,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

• lt_prog_compiler_pic='--shared'
• lt_prog_compiler_static='--static'
• ;;

++ nagfor*) ++ # NAG Fortran compiler ++ lt_prog_compiler_wl='-Wl,-Wl,,' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;;

•   pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  

•     # Portland Group compilers (*not* the Pentium gcc compiler,
  

• # which looks to be a dead project)

+@@ -8174,7 +8673,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

•   lt_prog_compiler_pic='-KPIC'
  

•   lt_prog_compiler_static='-Bstatic'
  

•   case $cc_basename in
  

+- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)

• lt_prog_compiler_wl='-Qoption ld ';;

•   *)
  

• lt_prog_compiler_wl='-Wl,';;

+@@ -8231,13 +8730,17 @@ case $host_os in

• lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  

• ;;
  

• esac

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +-$as_echo "$lt_prog_compiler_pic" >&6; } +- +- +- +-

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++if test "${lt_cv_prog_compiler_pic+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 ++$as_echo "$lt_cv_prog_compiler_pic" >&6; } ++lt_prog_compiler_pic=$lt_cv_prog_compiler_pic

• #
• # Check to make sure the PIC flag actually works.

+@@ -8298,6 +8801,11 @@ fi

++ ++ ++ ++ ++

• #
• # Check to make sure the static flag actually works.
• #

+@@ -8648,7 +9156,8 @@ _LT_EOF

•   allow_undefined_flag=unsupported
  

•   always_export_symbols=no
  

•   enable_shared_with_static_runtimes=yes
  

+- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '''/^[BCDGRS][ ]/s/.*[ ]([^ ]*)/\1 DATA/''' | $SED -e '''/^[AITW][ ]/s/.*[ ]//''' | sort | uniq > $export_symbols' ++ 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' ++ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'

•   if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  

•     archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  

+@@ -8747,12 +9256,12 @@ _LT_EOF

•  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  

•  hardcode_libdir_flag_spec=
  

•  hardcode_libdir_flag_spec_ld='-rpath $libdir'
  

+- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'

•  if test "x$supports_anon_versioning" = xyes; then
  

•    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  

•      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  

•      echo "local: *; };" >> $output_objdir/$libname.ver~
  

+- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'

•  fi
  

•  ;;
  

• esac

+@@ -8766,8 +9275,8 @@ _LT_EOF

• archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
• wlarc=

•   else
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   fi
  

•   ;;
  

+@@ -8785,8 +9294,8 @@ _LT_EOF

• _LT_EOF

•   elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   else
  

• ld_shlibs=no

•   fi
  

+@@ -8832,8 +9341,8 @@ _LT_EOF

• *)
  

•   if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   else
  

• ld_shlibs=no

•   fi
  

+@@ -8963,7 +9472,13 @@ _LT_EOF

• allow_undefined_flag='-berok'

•     # Determine the default libpath from the value encoded in an
  

•     # empty executable.
  

+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */
• int

+@@ -8976,22 +9491,29 @@ main ()

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi

•     hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•     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"
  

+@@ -9003,7 +9525,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• else

• # Determine the default libpath from the value encoded in an
  

• # empty executable.
  

+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */
• int

+@@ -9016,22 +9544,29 @@ main ()

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi

• hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•  # Warning - without using the other run time loading flags,
  

+@@ -9076,20 +9611,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•   # Microsoft Visual C++.
  

•   # hardcode_libdir_flag_spec is actually meaningless, as there is
  

•   # no search path for DLLs.
  

+- hardcode_libdir_flag_spec=' ' +- allow_undefined_flag=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '''s/ -lc$//'''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- old_archive_from_new_cmds='true' +- # FIXME: Should let the user specify the lib program. +- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' +- fix_srcfile_path='`cygpath -w "$srcfile"`' +- enable_shared_with_static_runtimes=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ always_export_symbols=yes ++ file_list_spec='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' -e '1\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' ++ enable_shared_with_static_runtimes=yes ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '''/^[BCDGRS][ ]/s/.*[ ]([^ ]*)/\1,DATA/''' | $SED -e '''/^[AITW][ ]/s/.*[ ]//''' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ old_postinstall_cmds='chmod 644 $oldlib' ++ postlink_cmds='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '''s/ -lc$//'''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ old_archive_from_new_cmds='true' ++ # FIXME: Should let the user specify the lib program. ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ enable_shared_with_static_runtimes=yes ++ ;; ++ esac

•   ;;
  

• darwin* | rhapsody*)
  

+@@ -9150,7 +9728,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  

• freebsd* | dragonfly*)
  

+- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

•   hardcode_libdir_flag_spec='-R$libdir'
  

•   hardcode_direct=yes
  

•   hardcode_shlibpath_var=no
  

+@@ -9158,7 +9736,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• hpux9*)
  

•   if test "$GCC" = yes; then
  

+- 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' ++ 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'

•   else
  

• 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'

•   fi
  

+@@ -9174,7 +9752,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• hpux10*)
  

•   if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

•   else
  

• archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'

•   fi
  

+@@ -9198,10 +9776,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  

•  ;;
  

• ia64*)

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

•  ;;
  

• *)

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

•  ;;
  

• esac

•   else
  

+@@ -9280,23 +9858,36 @@ fi

• irix5* | irix6* | nonstopux*)
  

•   if test "$GCC" = yes; then
  

+- 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' ++ 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'

• # Try to use the -exported_symbol ld option, if it does not
• # work, assume that -exports_file does not work either and
• # implicitly export all symbols.

+- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ # This should be the same for all languages, so no per-tag cache variable. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 ++$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } ++if test "${lt_cv_irix_exported_symbol+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */

+-int foo(void) {} ++int foo (void) { return 0; }

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+- 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' +- ++ lt_cv_irix_exported_symbol=yes ++else ++ lt_cv_irix_exported_symbol=no

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 ++$as_echo "$lt_cv_irix_exported_symbol" >&6; } ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ 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' ++ fi

•   else
  

• 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'
• 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'

+@@ -9381,7 +9972,7 @@ rm -f core conftest.err conftest.$ac_objext \

• osf4* | osf5*)	# as osf3* with the addition of -msym flag
  

•   if test "$GCC" = yes; then
  

• allow_undefined_flag=' ${wl}-expect_unresolved ${wl}*'

+- 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' ++ 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'

• hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'

•   else
  

• allow_undefined_flag=' -expect_unresolved *'

+@@ -9400,9 +9991,9 @@ rm -f core conftest.err conftest.$ac_objext \

•   no_undefined_flag=' -z defs'
  

•   if test "$GCC" = yes; then
  

• wlarc='${wl}'

+- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

• archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/(.*)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~

+- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $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'

•   else
  

• case `$CC -V 2>&1` in
• *"Compilers 5.0"*)

+@@ -9978,8 +10569,9 @@ cygwin* | mingw* | pw32* | cegcc*)

• need_version=no
• need_lib_prefix=no

+- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc

• library_names_spec='$libname.dll.a'
  

• # DLL is installed to $(libdir)/../bin by postinstall_cmds
  

• postinstall_cmds='base_file=`basename \${file}`~
  

+@@ -10012,13 +10604,71 @@ cygwin* | mingw* | pw32* | cegcc*)

•   library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  

•   ;;
  

• esac
  

++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\|/|g' -e 's| \([a-zA-Z]\):| /\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename ${file}`~ ++ dlpath=`$SHELL 2>&1 -c '''. $dir/'''${base_file}'''i; echo $dlname'''`~ ++ dldir=$destdir/`dirname $dlpath`~ ++ test -d $dldir || mkdir -p $dldir~ ++ $install_prog $dir/$dlname $dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '''. $file; echo $dlname'''`~ ++ dlpath=$dir/$dldll~ ++ $RM $dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe'

• ;;
  

• *)

++ # Assume MSVC wrapper

• library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  

++ dynamic_linker='Win32 ld.exe'

• ;;
  

• esac

+- dynamic_linker='Win32 ld.exe'

• # FIXME: first we should search . and the directory the executable is in
• shlibpath_var=PATH
• ;;

+@@ -10110,7 +10760,7 @@ haiku*)

• soname_spec='${libname}${release}${shared_ext}$major'
• shlibpath_var=LIBRARY_PATH
• shlibpath_overrides_runpath=yes

+- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'

• hardcode_into_libs=yes
• ;;

+@@ -10950,10 +11600,10 @@ else

• /* When -fvisbility=hidden is used, assume the code has been annotated
• correspondingly for the symbols needed. */
• #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

+-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default")));

• #endif

+-void fnord () { int i=42; } ++int fnord () { return 42; }

• int main ()
• {
• void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

+@@ -11056,10 +11706,10 @@ else

• /* When -fvisbility=hidden is used, assume the code has been annotated
• correspondingly for the symbols needed. */
• #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

+-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default")));

• #endif

+-void fnord () { int i=42; } ++int fnord () { return 42; }

• int main ()
• {
• void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

+@@ -12961,13 +13611,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'

• lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
• lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
• lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'

++lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' ++lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'

• reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
• reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
• OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
• deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
• file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'

++file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' ++want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' ++DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' ++sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'

• AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
• AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'

++archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'

• STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
• RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
• old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'

+@@ -12982,14 +13639,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de

• lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
• lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
• 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"`'

++nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' ++lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'

• objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
• MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
• lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'

+-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'

• lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'

++lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'

• lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
• lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
• need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'

++MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'

• DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
• NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
• LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'

+@@ -13022,12 +13682,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q

• hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
• inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
• link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'

+-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'

• always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
• export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
• exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
• include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
• prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'

++postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'

• file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
• variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
• need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'

+@@ -13082,8 +13742,13 @@ reload_flag \

• OBJDUMP \
• deplibs_check_method \
• file_magic_cmd \

++file_magic_glob \ ++want_nocaseglob \ ++DLLTOOL \ ++sharedlib_from_linklib_cmd \

• AR \
• AR_FLAGS \

++archiver_list_spec \

• STRIP \
• RANLIB \
• CC \

+@@ -13093,12 +13758,14 @@ lt_cv_sys_global_symbol_pipe \

• lt_cv_sys_global_symbol_to_cdecl \
• lt_cv_sys_global_symbol_to_c_name_address \
• lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \

++nm_file_list_spec \

• lt_prog_compiler_no_builtin_flag \

+-lt_prog_compiler_wl \

• lt_prog_compiler_pic \

++lt_prog_compiler_wl \

• lt_prog_compiler_static \
• lt_cv_prog_compiler_c_o \
• need_locks \

++MANIFEST_TOOL \

• DSYMUTIL \
• NMEDIT \
• LIPO \

+@@ -13114,7 +13781,6 @@ no_undefined_flag \

• hardcode_libdir_flag_spec \
• hardcode_libdir_flag_spec_ld \
• hardcode_libdir_separator \

+-fix_srcfile_path \

• exclude_expsyms \
• include_expsyms \
• file_list_spec \

+@@ -13150,6 +13816,7 @@ module_cmds \

• module_expsym_cmds \
• export_symbols_cmds \
• prelink_cmds \

++postlink_cmds \

• postinstall_cmds \
• postuninstall_cmds \
• finish_cmds \

+@@ -13906,7 +14573,8 @@ $as_echo X"$file" |

• # NOTE: Changes made to this file will be lost: look at ltmain.sh.
• #
• # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,

+-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc.

• # Written by Gordon Matzigkeit, 1996
• #
• # This file is part of GNU Libtool.

+@@ -14009,19 +14677,42 @@ SP2NL=$lt_lt_SP2NL

• # turn newlines into spaces.
• NL2SP=$lt_lt_NL2SP

++# convert $build file names to $host format. ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++ ++# convert $build files to toolchain format. ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++

• # An object symbol dumper.
• OBJDUMP=$lt_OBJDUMP
• # Method to check whether dependent libraries are shared objects.
• deplibs_check_method=$lt_deplibs_check_method

+-# Command to use when deplibs_check_method == "file_magic". ++# Command to use when deplibs_check_method = "file_magic".

• file_magic_cmd=$lt_file_magic_cmd

++# How to find potential files when deplibs_check_method = "file_magic". ++file_magic_glob=$lt_file_magic_glob ++ ++# Find potential files using nocaseglob when deplibs_check_method = "file_magic". ++want_nocaseglob=$lt_want_nocaseglob ++ ++# DLL creation program. ++DLLTOOL=$lt_DLLTOOL ++ ++# Command to associate shared and link libraries. ++sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd ++

• # The archiver.
• AR=$lt_AR

++ ++# Flags to create an archive.

• AR_FLAGS=$lt_AR_FLAGS

++# How to feed a file listing to the archiver. ++archiver_list_spec=$lt_archiver_list_spec ++

• # A symbol stripping program.
• STRIP=$lt_STRIP

+@@ -14051,6 +14742,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address

• # Transform the output of nm in a C name address pair when lib prefix is needed.
• global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix

++# Specify filename containing input files for $NM. ++nm_file_list_spec=$lt_nm_file_list_spec ++ ++# The root where to search for dependent libraries,and in which our libraries should be installed. ++lt_sysroot=$lt_sysroot ++

• # The name of the directory that contains temporary libtool files.
• objdir=$objdir

+@@ -14060,6 +14757,9 @@ MAGIC_CMD=$MAGIC_CMD

• # Must we lock files when doing compilation?
• need_locks=$lt_need_locks

++# Manifest tool. ++MANIFEST_TOOL=$lt_MANIFEST_TOOL ++

• # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
• DSYMUTIL=$lt_DSYMUTIL

+@@ -14174,12 +14874,12 @@ with_gcc=$GCC

• # Compiler flag to turn off builtin functions.
• no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag

+-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl +-

• # Additional compiler flags for building library objects.
• pic_flag=$lt_lt_prog_compiler_pic

++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl ++

• # Compiler flag to prevent dynamic linking.
• link_static_flag=$lt_lt_prog_compiler_static

+@@ -14266,9 +14966,6 @@ inherit_rpath=$inherit_rpath

• # Whether libtool must link a program against all its dependency libraries.
• link_all_deplibs=$link_all_deplibs

+-# Fix the shell variable $srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path +-

• # Set to "yes" if exported symbols are required.
• always_export_symbols=$always_export_symbols

+@@ -14284,6 +14981,9 @@ include_expsyms=$lt_include_expsyms

• # Commands necessary for linking programs (against libraries) with templates.
• prelink_cmds=$lt_prelink_cmds

++# Commands necessary for finishing linking programs. ++postlink_cmds=$lt_postlink_cmds ++

• # Specify filename containing input files.
• file_list_spec=$lt_file_list_spec

+@@ -14316,210 +15016,169 @@ ltmain="$ac_aux_dir/ltmain.sh"

• # if finds mixed CR/LF and LF-only lines. Since sed operates in
• # text mode, it properly converts lines to CR/LF. This bash problem
• # is reportedly fixed, but why not run on old versions too?

+- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- case $xsi_shell in +- yes) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $* )) +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} +- +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << _LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} +- +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\${2}$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}$%%"`;; +- esac +-} +- +-# sed scripts: +-my_sed_long_opt='1s/^(-[^=]*)=.*/\1/;q' +-my_sed_long_arg='1s/^-[^=]*=//' +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/.[^.]*$/.lo/'` +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$@"` +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` +-} +- +-_LT_EOF +-esac +- +-case $lt_shell_append in +- yes) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1+=$2" +-} +-_LT_EOF +- ;; +- *) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1=$$1$2" +-} +- +-_LT_EOF +- ;; +- esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ if test x"$xsi_shell" = xyes; then ++ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ ++func_dirname ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_basename ()$/,/^} # func_basename /c\ ++func_basename ()\ ++{\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ ++func_dirname_and_basename ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ ++func_stripname ()\ ++{\ ++\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ ++\ # positional parameters, so assign one to ordinary parameter first.\ ++\ func_stripname_result=${3}\ ++\ func_stripname_result=${func_stripname_result#"${1}"}\ ++\ func_stripname_result=${func_stripname_result%"${2}"}\ ++} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ ++func_split_long_opt ()\ ++{\ ++\ func_split_long_opt_name=${1%%=*}\ ++\ func_split_long_opt_arg=${1#*=}\ ++} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ ++func_split_short_opt ()\ ++{\ ++\ func_split_short_opt_arg=${1#??}\ ++\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ ++} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ ++func_lo2o ()\ ++{\ ++\ case ${1} in\ ++\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ ++\ *) func_lo2o_result=${1} ;;\ ++\ esac\ ++} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_xform ()$/,/^} # func_xform /c\ ++func_xform ()\ ++{\ ++ func_xform_result=${1%.*}.lo\ ++} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_arith ()$/,/^} # func_arith /c\ ++func_arith ()\ ++{\ ++ func_arith_result=$(( $* ))\ ++} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_len ()$/,/^} # func_len /c\ ++func_len ()\ ++{\ ++ func_len_result=${#1}\ ++} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++fi ++ ++if test x"$lt_shell_append" = xyes; then ++ sed -e '/^func_append ()$/,/^} # func_append /c\ ++func_append ()\ ++{\ ++ eval "${1}+=\${2}"\ ++} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ ++func_append_quoted ()\ ++{\ ++\ func_quote_for_eval "${2}"\ ++\ eval "${1}+=\\ \$func_quote_for_eval_result"\ ++} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append ([a-zA-Z_]{1,}) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append ([a-zA-Z_]{1,}) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi ++ ++if test x"$_lt_function_replace_fail" = x":"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 ++$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} ++fi ++ ++ ++ mv -f "$cfgfile" "$ofile" ||

• (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  

• chmod +x "$ofile"

+diff --git a/ld/configure b/ld/configure +index f9be51a..3df1149 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -658,8 +658,11 @@ OTOOL

• LIPO
• NMEDIT
• DSYMUTIL

++MANIFEST_TOOL

• RANLIB

++ac_ct_AR

• AR

++DLLTOOL

• OBJDUMP
• LN_S
• NM

+@@ -781,6 +784,7 @@ enable_static

• with_pic
• enable_fast_install
• with_gnu_ld

++with_libtool_sysroot

• enable_libtool_lock
• enable_plugins
• enable_largefile

+@@ -1462,6 +1466,8 @@ Optional Packages:

• --with-pic try to use only PIC/non-PIC objects [default=use

•                       both]
  

• --with-gnu-ld assume the C compiler uses GNU ld [default=no]

++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified).

• --with-lib-path=dir1:dir2... set default LIB_PATH
• --with-sysroot=DIR Search for usr/lib et al within DIR.

+@@ -5656,8 +5662,8 @@ esac

+-macro_version='2.2.7a' +-macro_revision='1.3134' ++macro_version='2.4' ++macro_revision='1.3293'

+@@ -5697,7 +5703,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
• $as_echo_n "checking how to print strings... " >&6; }
• # Test print first, because it will be a builtin if present.

+-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \

• test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
• ECHO='print -r --'
• elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then

+@@ -6383,8 +6389,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;

• # Try some XSI features
• xsi_shell=no
• ( _lt_dummy="a/b/c"

+- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \

• && eval 'test $(( 1 + 1 )) -eq 2 \
  

• && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  

• && xsi_shell=yes

+@@ -6433,6 +6439,80 @@ esac

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 ++$as_echo_n "checking how to convert $build file names to $host format... " >&6; } ++if test "${lt_cv_to_host_file_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac ++ ;; ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac ++ ;; ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++ ++fi ++ ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 ++$as_echo "$lt_cv_to_host_file_cmd" >&6; } ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 ++$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } ++if test "${lt_cv_to_tool_file_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ #assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac ++ ++fi ++ ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 ++$as_echo "$lt_cv_to_tool_file_cmd" >&6; } ++ ++ ++ ++ ++

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
• $as_echo_n "checking for $LD option to reload object files... " >&6; }
• if test "${lt_cv_ld_reload_flag+set}" = set; then :

+@@ -6449,6 +6529,11 @@ case $reload_flag in

• esac
• reload_cmds='$LD$reload_flag -o $output$reload_objs'
• case $host_os in

++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;;

• darwin*)

• if test "$GCC" = yes; then
  

•   reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  

+@@ -6617,7 +6702,8 @@ mingw* | pw32*)

• lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  

• lt_cv_file_magic_cmd='func_win32_libid'
  

• else

+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'

• lt_cv_file_magic_cmd='$OBJDUMP -f'
  

• fi
• ;;

+@@ -6771,6 +6857,21 @@ esac

• fi
• { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
• $as_echo "$lt_cv_deplibs_check_method" >&6; }

++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/(..)/s/[\1]/[\1]/g;/g"` ++ fi ++ ;; ++ esac ++fi ++

• file_magic_cmd=$lt_cv_file_magic_cmd
• deplibs_check_method=$lt_cv_deplibs_check_method
• test -z "$deplibs_check_method" && deplibs_check_method=unknown

+@@ -6786,9 +6887,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DLLTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DLLTOOL"; then ++ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DLLTOOL=$ac_cv_prog_DLLTOOL ++if test -n "$DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 ++$as_echo "$DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DLLTOOL"; then ++ ac_ct_DLLTOOL=$DLLTOOL ++ # Extract the first word of "dlltool", so it can be a program name with args. ++set dummy dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DLLTOOL"; then ++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DLLTOOL="dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL ++if test -n "$ac_ct_DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 ++$as_echo "$ac_ct_DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_DLLTOOL" = x; then ++ DLLTOOL="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DLLTOOL=$ac_ct_DLLTOOL ++ fi ++else ++ DLLTOOL="$ac_cv_prog_DLLTOOL" ++fi ++ ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 ++$as_echo_n "checking how to associate runtime and link libraries... " >&6; } ++if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 ++$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++ ++ ++ ++ ++ ++

• if test -n "$ac_tool_prefix"; then

+- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 ++ for ac_prog in ar ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
• $as_echo_n "checking for $ac_word... " >&6; }
• if test "${ac_cv_prog_AR+set}" = set; then :

+@@ -6804,7 +7058,7 @@ do

• test -z "$as_dir" && as_dir=.

• for ac_exec_ext in '' $ac_executable_extensions; do
  

• if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+- ac_cv_prog_AR="${ac_tool_prefix}ar" ++ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"

• $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  

• break 2
  

• fi

+@@ -6824,11 +7078,15 @@ $as_echo "no" >&6; }

• fi

++ test -n "$AR" && break ++ done

• fi

+-if test -z "$ac_cv_prog_AR"; then ++if test -z "$AR"; then

• ac_ct_AR=$AR

+- # Extract the first word of "ar", so it can be a program name with args. +-set dummy ar; ac_word=$2 ++ for ac_prog in ar ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
• $as_echo_n "checking for $ac_word... " >&6; }
• if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :

+@@ -6844,7 +7102,7 @@ do

• test -z "$as_dir" && as_dir=.

• for ac_exec_ext in '' $ac_executable_extensions; do
  

• if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+- ac_cv_prog_ac_ct_AR="ar" ++ ac_cv_prog_ac_ct_AR="$ac_prog"

• $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  

• break 2
  

• fi

+@@ -6863,6 +7121,10 @@ else

• $as_echo "no" >&6; }
• fi

++ ++ test -n "$ac_ct_AR" && break ++done ++

• if test "x$ac_ct_AR" = x; then

• AR="false"
  

• else

+@@ -6874,12 +7136,12 @@ ac_tool_warned=yes ;;

• esac

• AR=$ac_ct_AR
  

• fi

+-else +- AR="$ac_cv_prog_AR"

• fi

+-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru ++: ${AR=ar} ++: ${AR_FLAGS=cru} ++ ++

+@@ -6889,6 +7151,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 ++$as_echo_n "checking for archiver @FILE support... " >&6; } ++if test "${lt_cv_ar_at_file+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ar_at_file=no ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' ++ { { eval echo ""$as_me":${as_lineno-$LINENO}: "$lt_ar_try""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ { { eval echo ""$as_me":${as_lineno-$LINENO}: "$lt_ar_try""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 ++$as_echo "$lt_cv_ar_at_file" >&6; } ++ ++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi ++ ++ ++ ++ ++

• if test -n "$ac_tool_prefix"; then

+@@ -7225,8 +7543,8 @@ esac

• lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* (.*)$/extern int \1();/p' -e 's/^$symcode* .* (.*)$/extern char \1;/p'"
• # Transform an extracted symbol line into symbol name and symbol address

+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: ([^ ]*) $/ {\"\1\", (void *) 0},/p' -e 's/^$symcode* ([^ ]*) ([^ ]*)$/ {"\2", (void *) &\2},/p'" +-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'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: ([^ ]*)[ ]*$/ {\"\1\", (void *) 0},/p' -e 's/^$symcode* ([^ ]*) ([^ ]*)$/ {"\2", (void *) &\2},/p'" ++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'"

• # Handle CRLF in mingw tool chain
• opt_cr=

+@@ -7262,6 +7580,7 @@ for ac_symprfx in "" "_"; do

• else

• lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  

• fi

++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"

• # Check to see that the pipe works correctly.
• pipe_works=no

+@@ -7303,6 +7622,18 @@ _LT_EOF

•   if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  

• if $GREP ' nm_test_func$' "$nlist" >/dev/null; then

•  cat <<_LT_EOF > conftest.$ac_ext
  

++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++

• #ifdef __cplusplus
• extern "C" {
• #endif

+@@ -7314,7 +7645,7 @@ _LT_EOF

•  cat <<_LT_EOF >> conftest.$ac_ext
  

• /* The mapping between symbol names and symbols. */

+-const struct { ++LT_DLSYM_CONST struct {

• const char *name;
• void *address;
• }

+@@ -7340,8 +7671,8 @@ static const void *lt_preloaded_setup() {

• _LT_EOF

•  # Now try linking the two files.
  

•  mv conftest.$ac_objext conftstm.$ac_objext
  

+- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS

•  LIBS="conftstm.$ac_objext"
  

•  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  

•  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  

+@@ -7351,8 +7682,8 @@ _LT_EOF

• test $ac_status = 0; } && test -s conftest${ac_exeext}; then

•    pipe_works=yes
  

•  fi
  

+- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS

• else

•  echo "cannot find nm_test_func in $nlist" >&5
  

• fi

+@@ -7389,6 +7720,19 @@ else

• $as_echo "ok" >&6; }
• fi

++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ ++ ++ ++ ++ ++ ++

+@@ -7409,6 +7753,42 @@ fi

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 ++$as_echo_n "checking for sysroot... " >&6; } ++ ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; ++else ++ with_libtool_sysroot=no ++fi ++ ++ ++lt_sysroot= ++case ${with_libtool_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } ++ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 ++ ;; ++esac ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 ++$as_echo "${lt_sysroot:-no}" >&6; } ++ ++ ++ ++

• # Check whether --enable-libtool-lock was given.
• if test "${enable_libtool_lock+set}" = set; then :

+@@ -7616,6 +7996,123 @@ esac

• need_locks="$enable_libtool_lock"

++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. ++set dummy ${ac_tool_prefix}mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$MANIFEST_TOOL"; then ++ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL ++if test -n "$MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 ++$as_echo "$MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ++ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL ++ # Extract the first word of "mt", so it can be a program name with args. ++set dummy mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_MANIFEST_TOOL"; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL ++if test -n "$ac_ct_MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 ++$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_MANIFEST_TOOL" = x; then ++ MANIFEST_TOOL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL ++ fi ++else ++ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" ++fi ++ ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 ++$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } ++if test "${lt_cv_path_mainfest_tool+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&5 ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 ++$as_echo "$lt_cv_path_mainfest_tool" >&6; } ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++ ++ ++ ++ ++

• case $host_os in

• rhapsody* | darwin*)
  

+@@ -8179,6 +8676,8 @@ _LT_EOF

•   $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  

•   echo "$AR cru libconftest.a conftest.o" >&5
  

•   $AR cru libconftest.a conftest.o 2>&5
  

++ echo "$RANLIB libconftest.a" >&5 ++ $RANLIB libconftest.a 2>&5

•   cat > conftest.c << _LT_EOF
  

• int main() { return 0;}
• _LT_EOF

+@@ -8247,6 +8746,16 @@ done

++func_stripname_cnf () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\${2}$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}$%%"`;; ++ esac ++} # func_stripname_cnf ++ ++ ++

• # Set options

+@@ -8375,7 +8884,8 @@ fi

• LIBTOOL_DEPS="$ltmain"
• # Always use our own libtool.

+-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL="$LIBTOOL/${host_alias}-libtool"

+@@ -8464,7 +8974,7 @@ aix3*)

• esac
• # Global variables:

+-ofile=libtool ++ofile=${host_alias}-libtool

• can_build_shared=yes
• # All known linkers require a `.a' archive for static linking (except MSVC,

+@@ -8762,8 +9272,6 @@ fi

• lt_prog_compiler_pic=
• lt_prog_compiler_static=

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

• if test "$GCC" = yes; then

• lt_prog_compiler_wl='-Wl,'
  

+@@ -8929,6 +9437,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

• lt_prog_compiler_pic='--shared'
• lt_prog_compiler_static='--static'
• ;;

++ nagfor*) ++ # NAG Fortran compiler ++ lt_prog_compiler_wl='-Wl,-Wl,,' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;;

•   pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  

•     # Portland Group compilers (*not* the Pentium gcc compiler,
  

• # which looks to be a dead project)

+@@ -8991,7 +9505,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

•   lt_prog_compiler_pic='-KPIC'
  

•   lt_prog_compiler_static='-Bstatic'
  

•   case $cc_basename in
  

+- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)

• lt_prog_compiler_wl='-Qoption ld ';;

•   *)
  

• lt_prog_compiler_wl='-Wl,';;

+@@ -9048,13 +9562,17 @@ case $host_os in

• lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  

• ;;
  

• esac

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +-$as_echo "$lt_prog_compiler_pic" >&6; } +- +- +- +-

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++if test "${lt_cv_prog_compiler_pic+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 ++$as_echo "$lt_cv_prog_compiler_pic" >&6; } ++lt_prog_compiler_pic=$lt_cv_prog_compiler_pic

• #
• # Check to make sure the PIC flag actually works.

+@@ -9115,6 +9633,11 @@ fi

++ ++ ++ ++ ++

• #
• # Check to make sure the static flag actually works.
• #

+@@ -9465,7 +9988,8 @@ _LT_EOF

•   allow_undefined_flag=unsupported
  

•   always_export_symbols=no
  

•   enable_shared_with_static_runtimes=yes
  

+- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '''/^[BCDGRS][ ]/s/.*[ ]([^ ]*)/\1 DATA/''' | $SED -e '''/^[AITW][ ]/s/.*[ ]//''' | sort | uniq > $export_symbols' ++ 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' ++ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'

•   if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  

•     archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  

+@@ -9564,12 +10088,12 @@ _LT_EOF

•  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  

•  hardcode_libdir_flag_spec=
  

•  hardcode_libdir_flag_spec_ld='-rpath $libdir'
  

+- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'

•  if test "x$supports_anon_versioning" = xyes; then
  

•    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  

•      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  

•      echo "local: *; };" >> $output_objdir/$libname.ver~
  

+- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'

•  fi
  

•  ;;
  

• esac

+@@ -9583,8 +10107,8 @@ _LT_EOF

• archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
• wlarc=

•   else
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   fi
  

•   ;;
  

+@@ -9602,8 +10126,8 @@ _LT_EOF

• _LT_EOF

•   elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   else
  

• ld_shlibs=no

•   fi
  

+@@ -9649,8 +10173,8 @@ _LT_EOF

• *)
  

•   if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   else
  

• ld_shlibs=no

•   fi
  

+@@ -9780,7 +10304,13 @@ _LT_EOF

• allow_undefined_flag='-berok'

•     # Determine the default libpath from the value encoded in an
  

•     # empty executable.
  

+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */
• int

+@@ -9793,22 +10323,29 @@ main ()

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi

•     hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•     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"
  

+@@ -9820,7 +10357,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• else

• # Determine the default libpath from the value encoded in an
  

• # empty executable.
  

+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */
• int

+@@ -9833,22 +10376,29 @@ main ()

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi

• hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•  # Warning - without using the other run time loading flags,
  

+@@ -9892,21 +10442,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•   # When not using gcc, we currently assume that we are using
  

•   # Microsoft Visual C++.
  

•   # hardcode_libdir_flag_spec is actually meaningless, as there is
  

+- # no search path for DLLs. +- hardcode_libdir_flag_spec=' ' +- allow_undefined_flag=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '''s/ -lc$//'''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- old_archive_from_new_cmds='true' +- # FIXME: Should let the user specify the lib program. +- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' +- fix_srcfile_path='`cygpath -w "$srcfile"`' +- enable_shared_with_static_runtimes=yes ++ # no search path for DLLs. ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ always_export_symbols=yes ++ file_list_spec='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' -e '1\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' ++ enable_shared_with_static_runtimes=yes ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '''/^[BCDGRS][ ]/s/.*[ ]([^ ]*)/\1,DATA/''' | $SED -e '''/^[AITW][ ]/s/.*[ ]//''' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ old_postinstall_cmds='chmod 644 $oldlib' ++ postlink_cmds='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '''s/ -lc$//'''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ old_archive_from_new_cmds='true' ++ # FIXME: Should let the user specify the lib program. ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ enable_shared_with_static_runtimes=yes ++ ;; ++ esac

•   ;;
  

• darwin* | rhapsody*)
  

+@@ -9967,7 +10560,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  

• freebsd* | dragonfly*)
  

+- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

•   hardcode_libdir_flag_spec='-R$libdir'
  

•   hardcode_direct=yes
  

•   hardcode_shlibpath_var=no
  

+@@ -9975,7 +10568,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• hpux9*)
  

•   if test "$GCC" = yes; then
  

+- 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' ++ 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'

•   else
  

• 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'

•   fi
  

+@@ -9991,7 +10584,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• hpux10*)
  

•   if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

•   else
  

• archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'

•   fi
  

+@@ -10015,10 +10608,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  

•  ;;
  

• ia64*)

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

•  ;;
  

• *)

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

•  ;;
  

• esac

•   else
  

+@@ -10097,23 +10690,36 @@ fi

• irix5* | irix6* | nonstopux*)
  

•   if test "$GCC" = yes; then
  

+- 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' ++ 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'

• # Try to use the -exported_symbol ld option, if it does not
• # work, assume that -exports_file does not work either and
• # implicitly export all symbols.

+- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ # This should be the same for all languages, so no per-tag cache variable. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 ++$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } ++if test "${lt_cv_irix_exported_symbol+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */

+-int foo(void) {} ++int foo (void) { return 0; }

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+- 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' +- ++ lt_cv_irix_exported_symbol=yes ++else ++ lt_cv_irix_exported_symbol=no

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 ++$as_echo "$lt_cv_irix_exported_symbol" >&6; } ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ 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' ++ fi

•   else
  

• 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'
• 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'

+@@ -10198,7 +10804,7 @@ rm -f core conftest.err conftest.$ac_objext \

• osf4* | osf5*)	# as osf3* with the addition of -msym flag
  

•   if test "$GCC" = yes; then
  

• allow_undefined_flag=' ${wl}-expect_unresolved ${wl}*'

+- 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' ++ 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'

• hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'

•   else
  

• allow_undefined_flag=' -expect_unresolved *'

+@@ -10217,9 +10823,9 @@ rm -f core conftest.err conftest.$ac_objext \

•   no_undefined_flag=' -z defs'
  

•   if test "$GCC" = yes; then
  

• wlarc='${wl}'

+- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

• archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/(.*)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~

+- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $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'

•   else
  

• case `$CC -V 2>&1` in
• *"Compilers 5.0"*)

+@@ -10795,8 +11401,9 @@ cygwin* | mingw* | pw32* | cegcc*)

• need_version=no
• need_lib_prefix=no

+- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc

• library_names_spec='$libname.dll.a'
  

• # DLL is installed to $(libdir)/../bin by postinstall_cmds
  

• postinstall_cmds='base_file=`basename \${file}`~
  

+@@ -10829,13 +11436,71 @@ cygwin* | mingw* | pw32* | cegcc*)

•   library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  

•   ;;
  

• esac
  

++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\|/|g' -e 's| \([a-zA-Z]\):| /\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename ${file}`~ ++ dlpath=`$SHELL 2>&1 -c '''. $dir/'''${base_file}'''i; echo $dlname'''`~ ++ dldir=$destdir/`dirname $dlpath`~ ++ test -d $dldir || mkdir -p $dldir~ ++ $install_prog $dir/$dlname $dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '''. $file; echo $dlname'''`~ ++ dlpath=$dir/$dldll~ ++ $RM $dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe'

• ;;
  

• *)

++ # Assume MSVC wrapper

• library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  

++ dynamic_linker='Win32 ld.exe'

• ;;
  

• esac

+- dynamic_linker='Win32 ld.exe'

• # FIXME: first we should search . and the directory the executable is in
• shlibpath_var=PATH
• ;;

+@@ -10927,7 +11592,7 @@ haiku*)

• soname_spec='${libname}${release}${shared_ext}$major'
• shlibpath_var=LIBRARY_PATH
• shlibpath_overrides_runpath=yes

+- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'

• hardcode_into_libs=yes
• ;;

+@@ -11767,10 +12432,10 @@ else

• /* When -fvisbility=hidden is used, assume the code has been annotated
• correspondingly for the symbols needed. */
• #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

+-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default")));

• #endif

+-void fnord () { int i=42; } ++int fnord () { return 42; }

• int main ()
• {
• void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

+@@ -11873,10 +12538,10 @@ else

• /* When -fvisbility=hidden is used, assume the code has been annotated
• correspondingly for the symbols needed. */
• #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

+-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default")));

• #endif

+-void fnord () { int i=42; } ++int fnord () { return 42; }

• int main ()
• {
• void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

+@@ -12268,6 +12933,7 @@ $RM -r conftest*

• # Allow CC to be a program name with arguments.
• lt_save_CC=$CC

++ lt_save_CFLAGS=$CFLAGS

• lt_save_LD=$LD
• lt_save_GCC=$GCC
• GCC=$GXX

+@@ -12285,6 +12951,7 @@ $RM -r conftest*

• fi
• test -z "${LDCXX+set}" || LD=$LDCXX
• CC=${CXX-"c++"}

++ CFLAGS=$CXXFLAGS

• compiler=$CC
• compiler_CXX=$CC
• for cc_temp in $compiler""; do

+@@ -12567,7 +13234,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie

•       allow_undefined_flag_CXX='-berok'
  

•       # Determine the default libpath from the value encoded in an empty
  

•       # executable.
  

+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if test "${lt_cv_aix_libpath__CXX+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */
• int

+@@ -12580,22 +13253,29 @@ main ()

• _ACEOF
• if ac_fn_cxx_try_link "$LINENO"; then :

+-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath__CXX"; then ++ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath__CXX"; then ++ lt_cv_aix_libpath__CXX="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath__CXX ++fi

•       hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  

+@@ -12608,7 +13288,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•       else
  

•    # Determine the default libpath from the value encoded in an
  

•    # empty executable.
  

+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if test "${lt_cv_aix_libpath__CXX+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */
• int

+@@ -12621,22 +13307,29 @@ main ()

• _ACEOF
• if ac_fn_cxx_try_link "$LINENO"; then :

+-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath__CXX"; then ++ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath__CXX"; then ++ lt_cv_aix_libpath__CXX="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath__CXX ++fi

•    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•    # Warning - without using the other run time loading flags,
  

+@@ -12679,29 +13372,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•     ;;
  

•   cygwin* | mingw* | pw32* | cegcc*)
  

+- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, +- # as there is no search path for DLLs. +- hardcode_libdir_flag_spec_CXX='-L$libdir' +- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' +- allow_undefined_flag_CXX=unsupported +- always_export_symbols_CXX=no +- enable_shared_with_static_runtimes_CXX=yes +- +- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +- 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' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $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' +- else +- ld_shlibs_CXX=no +- fi +- ;; ++ case $GXX,$cc_basename in ++ ,cl* | no,cl*) ++ # Native MSVC ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ hardcode_libdir_flag_spec_CXX=' ' ++ allow_undefined_flag_CXX=unsupported ++ always_export_symbols_CXX=yes ++ file_list_spec_CXX='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ $SED -n -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' -e '1\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ $SED -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' ++ enable_shared_with_static_runtimes_CXX=yes ++ # Don't use ranlib ++ old_postinstall_cmds_CXX='chmod 644 $oldlib' ++ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ func_to_tool_file "$lt_outputfile"~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # g++ ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, ++ # as there is no search path for DLLs. ++ hardcode_libdir_flag_spec_CXX='-L$libdir' ++ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' ++ allow_undefined_flag_CXX=unsupported ++ always_export_symbols_CXX=no ++ enable_shared_with_static_runtimes_CXX=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ 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' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $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' ++ else ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ esac ++ ;;

•   darwin* | rhapsody*)
  

+@@ -12807,7 +13546,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•         ;;
  

•       *)
  

•         if test "$GXX" = yes; then
  

+- 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' ++ 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'

•         else
  

•           # FIXME: insert proper C++ library support
  

•           ld_shlibs_CXX=no
  

+@@ -12878,10 +13617,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  

•            ;;
  

•          ia64*)
  

+- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

•            ;;
  

•          *)
  

+- 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' ++ 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'

•            ;;
  

•        esac
  

•      fi
  

+@@ -12922,9 +13661,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•       *)
  

•    if test "$GXX" = yes; then
  

•      if test "$with_gnu_ld" = no; then
  

+- 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' ++ 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'

•      else
  

+- 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' ++ 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'

•      fi
  

•    fi
  

•    link_all_deplibs_CXX=yes
  

+@@ -12994,20 +13733,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•      prelink_cmds_CXX='tpldir=Template.dir~
  

• rm -rf $tpldir~
  

• $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
  

+- compile_command="$compile_command `find $tpldir -name *.o | $NL2SP`"' ++ compile_command="$compile_command `find $tpldir -name *.o | sort | $NL2SP`"'

•      old_archive_cmds_CXX='tpldir=Template.dir~
  

• rm -rf $tpldir~
  

• $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
  

+- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name *.o | $NL2SP`~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name *.o | sort | $NL2SP`~

• $RANLIB $oldlib'
  

•      archive_cmds_CXX='tpldir=Template.dir~
  

• rm -rf $tpldir~
  

• $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
  

+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name *.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name *.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

•      archive_expsym_cmds_CXX='tpldir=Template.dir~
  

• rm -rf $tpldir~
  

• $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
  

+- $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' ++ $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'

•      ;;
  

•    *) # Version 6 and above use weak symbols
  

•      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  

+@@ -13202,7 +13941,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•          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'
  

•   ;;
  

•        *)
  

+- 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' ++ 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'

•   ;;
  

•      esac
  

+@@ -13248,7 +13987,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•   solaris*)
  

•     case $cc_basename in
  

+- CC*) ++ CC* | sunCC*)

•    # Sun C++ 4.2, 5.x and Centerline C++
  

•         archive_cmds_need_lc_CXX=yes
  

•    no_undefined_flag_CXX=' -zdefs'
  

+@@ -13289,9 +14028,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  

•      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
  

•      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
  

+- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'

•        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  

+- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'

•        # Commands to make compiler produce verbose output that lists
  

•        # what "hidden" libraries, object files and flags are used when
  

+@@ -13426,6 +14165,13 @@ private:

• };
• _LT_EOF

++ ++_lt_libdeps_save_CFLAGS=$CFLAGS ++case "$CC $CFLAGS " in #( ++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; ++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; ++esac ++

• if { { eval echo ""$as_me":${as_lineno-$LINENO}: "$ac_compile""; } >&5
• (eval $ac_compile) 2>&5
• ac_status=$?

+@@ -13439,7 +14185,7 @@ if { { eval echo ""$as_me":${as_lineno-$LINENO}: "$ac_compile""; } >&5

• pre_test_object_deps_done=no
• for p in `eval "$output_verbose_link_cmd"`; do

+- case $p in ++ case ${prev}${p} in

• -L* | -R* | -l*)
  

•    # Some compilers place space between "-{L,R}" and the path.
  

+@@ -13448,13 +14194,22 @@ if { { eval echo ""$as_me":${as_lineno-$LINENO}: "$ac_compile""; } >&5

•       test $p = "-R"; then
  

• prev=$p
  

• continue
  

+- else +- prev=

•    fi
  

++ # Expand the sysroot to ease extracting the directories later. ++ if test -z "$prev"; then ++ case $p in ++ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; ++ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; ++ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; ++ esac ++ fi ++ case $p in ++ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; ++ esac

•    if test "$pre_test_object_deps_done" = no; then
  

+- case $p in +- -L* | -R*) ++ case ${prev} in ++ -L | -R)

•   # Internal compiler library paths should come after those
  

•   # provided the user.  The postdeps already come after the
  

•   # user supplied libs so there is no need to process them.
  

+@@ -13474,8 +14229,10 @@ if { { eval echo ""$as_me":${as_lineno-$LINENO}: "$ac_compile""; } >&5

•   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
  

• fi
  

•    fi
  

++ prev=

•    ;;
  

++ *.lto.$objext) ;; # Ignore GCC LTO objects

• *.$objext)
  

•    # This assumes that the test object file only shows up
  

•    # once in the compiler output.
  

+@@ -13511,6 +14268,7 @@ else

• fi
• $RM -f confest.$objext

++CFLAGS=$_lt_libdeps_save_CFLAGS

• # PORTME: override above test on systems where it is broken
• case $host_os in

+@@ -13546,7 +14304,7 @@ linux*)

• solaris*)
• case $cc_basename in

+- CC*) ++ CC* | sunCC*)

• # The more standards-conforming stlport4 library is
  

• # incompatible with the Cstd library. Avoid specifying
  

• # it if it's in CXXFLAGS. Ignore libCrun as
  

+@@ -13611,8 +14369,6 @@ fi

• lt_prog_compiler_pic_CXX=
• lt_prog_compiler_static_CXX=

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

• # C++ specific cases for pic, static, wl, etc.
• if test "$GXX" = yes; then

+@@ -13717,6 +14473,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

•  ;;
  

• esac
• ;;

++ mingw* | cygwin* | os2* | pw32* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' ++ ;;

•   dgux*)
  

• case $cc_basename in

•  ec++*)
  

+@@ -13869,7 +14630,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

• ;;

•   solaris*)
  

• case $cc_basename in

+- CC*) ++ CC* | sunCC*)

•    # Sun C++ 4.2, 5.x and Centerline C++
  

•    lt_prog_compiler_pic_CXX='-KPIC'
  

•    lt_prog_compiler_static_CXX='-Bstatic'
  

+@@ -13934,10 +14695,17 @@ case $host_os in

• lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
  

• ;;
  

• esac

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 +-$as_echo "$lt_prog_compiler_pic_CXX" >&6; } +-

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++if test "${lt_cv_prog_compiler_pic_CXX+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } ++lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX

• #
• # Check to make sure the PIC flag actually works.

+@@ -13995,6 +14763,8 @@ fi

++ ++

• #
• # Check to make sure the static flag actually works.
• #

+@@ -14172,6 +14942,7 @@ fi

• $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
• export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '''s/.* //''' | sort | uniq > $export_symbols'

++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'

• case $host_os in
• aix[4-9]*)

• # If we're using GNU nm, then we don't want the "-C" option.
  

+@@ -14186,15 +14957,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie

• ;;
  

• pw32*)

• export_symbols_cmds_CXX="$ltdll_cmds"
  

+- ;; ++ ;;

• cygwin* | mingw* | cegcc*)

+- 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' +- ;; ++ case $cc_basename in ++ cl*) ;; ++ *) ++ 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' ++ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' ++ ;; ++ esac ++ ;;

• *)

• export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  

+- ;; ++ ;;

• esac

+- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'

• { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
• $as_echo "$ld_shlibs_CXX" >&6; }

+@@ -14457,8 +15233,9 @@ cygwin* | mingw* | pw32* | cegcc*)

• need_version=no
• need_lib_prefix=no

+- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc

• library_names_spec='$libname.dll.a'
  

• # DLL is installed to $(libdir)/../bin by postinstall_cmds
  

• postinstall_cmds='base_file=`basename \${file}`~
  

+@@ -14490,13 +15267,71 @@ cygwin* | mingw* | pw32* | cegcc*)

•   library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  

•   ;;
  

• esac
  

++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\|/|g' -e 's| \([a-zA-Z]\):| /\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename ${file}`~ ++ dlpath=`$SHELL 2>&1 -c '''. $dir/'''${base_file}'''i; echo $dlname'''`~ ++ dldir=$destdir/`dirname $dlpath`~ ++ test -d $dldir || mkdir -p $dldir~ ++ $install_prog $dir/$dlname $dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '''. $file; echo $dlname'''`~ ++ dlpath=$dir/$dldll~ ++ $RM $dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe'

• ;;
  

• *)

++ # Assume MSVC wrapper

• library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  

++ dynamic_linker='Win32 ld.exe'

• ;;
  

• esac

+- dynamic_linker='Win32 ld.exe'

• # FIXME: first we should search . and the directory the executable is in
• shlibpath_var=PATH
• ;;

+@@ -14587,7 +15422,7 @@ haiku*)

• soname_spec='${libname}${release}${shared_ext}$major'
• shlibpath_var=LIBRARY_PATH
• shlibpath_overrides_runpath=yes

+- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'

• hardcode_into_libs=yes
• ;;

+@@ -15046,6 +15881,7 @@ fi

• fi # test -n "$compiler"
• CC=$lt_save_CC

++ CFLAGS=$lt_save_CFLAGS

• LDCXX=$LD
• LD=$lt_save_LD
• GCC=$lt_save_GCC

+@@ -17982,13 +18818,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'

• lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
• lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
• lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'

++lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' ++lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'

• reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
• reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
• OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
• deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
• file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'

++file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' ++want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' ++DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' ++sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'

• AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
• AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'

++archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'

• STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
• RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
• old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'

+@@ -18003,14 +18846,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de

• lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
• lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
• 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"`'

++nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' ++lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'

• objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
• MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
• lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'

+-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'

• lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'

++lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'

• lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
• lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
• need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'

++MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'

• DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
• NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
• LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'

+@@ -18043,12 +18889,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q

• hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
• inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
• link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'

+-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'

• always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
• export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
• exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
• include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
• prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'

++postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'

• file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
• variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
• need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'

+@@ -18087,8 +18933,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote

• compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
• GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
• lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'

+-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'

• lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'

++lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'

• lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
• lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
• archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'

+@@ -18115,12 +18961,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_

• hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
• inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
• link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'

+-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'

• always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
• export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
• exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
• include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
• prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'

++postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'

• file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
• hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
• compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'

+@@ -18158,8 +19004,13 @@ reload_flag \

• OBJDUMP \
• deplibs_check_method \
• file_magic_cmd \

++file_magic_glob \ ++want_nocaseglob \ ++DLLTOOL \ ++sharedlib_from_linklib_cmd \

• AR \
• AR_FLAGS \

++archiver_list_spec \

• STRIP \
• RANLIB \
• CC \

+@@ -18169,12 +19020,14 @@ lt_cv_sys_global_symbol_pipe \

• lt_cv_sys_global_symbol_to_cdecl \
• lt_cv_sys_global_symbol_to_c_name_address \
• lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \

++nm_file_list_spec \

• lt_prog_compiler_no_builtin_flag \

+-lt_prog_compiler_wl \

• lt_prog_compiler_pic \

++lt_prog_compiler_wl \

• lt_prog_compiler_static \
• lt_cv_prog_compiler_c_o \
• need_locks \

++MANIFEST_TOOL \

• DSYMUTIL \
• NMEDIT \
• LIPO \

+@@ -18190,7 +19043,6 @@ no_undefined_flag \

• hardcode_libdir_flag_spec \
• hardcode_libdir_flag_spec_ld \
• hardcode_libdir_separator \

+-fix_srcfile_path \

• exclude_expsyms \
• include_expsyms \
• file_list_spec \

+@@ -18212,8 +19064,8 @@ LD_CXX \

• reload_flag_CXX \
• compiler_CXX \
• lt_prog_compiler_no_builtin_flag_CXX \

+-lt_prog_compiler_wl_CXX \

• lt_prog_compiler_pic_CXX \

++lt_prog_compiler_wl_CXX \

• lt_prog_compiler_static_CXX \
• lt_cv_prog_compiler_c_o_CXX \
• export_dynamic_flag_spec_CXX \

+@@ -18225,7 +19077,6 @@ no_undefined_flag_CXX \

• hardcode_libdir_flag_spec_CXX \
• hardcode_libdir_flag_spec_ld_CXX \
• hardcode_libdir_separator_CXX \

+-fix_srcfile_path_CXX \

• exclude_expsyms_CXX \
• include_expsyms_CXX \
• file_list_spec_CXX \

+@@ -18259,6 +19110,7 @@ module_cmds \

• module_expsym_cmds \
• export_symbols_cmds \
• prelink_cmds \

++postlink_cmds \

• postinstall_cmds \
• postuninstall_cmds \
• finish_cmds \

+@@ -18273,7 +19125,8 @@ archive_expsym_cmds_CXX \

• module_cmds_CXX \
• module_expsym_cmds_CXX \
• export_symbols_cmds_CXX \

+-prelink_cmds_CXX; do ++prelink_cmds_CXX \ ++postlink_cmds_CXX; do

• case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
  

• *[\\\\\\\`\\"\\\$]*)
  

•   eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
  

+@@ -19066,7 +19919,8 @@ $as_echo X"$file" |

• # NOTE: Changes made to this file will be lost: look at ltmain.sh.
• #
• # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,

+-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc.

• # Written by Gordon Matzigkeit, 1996
• #
• # This file is part of GNU Libtool.

+@@ -19169,19 +20023,42 @@ SP2NL=$lt_lt_SP2NL

• # turn newlines into spaces.
• NL2SP=$lt_lt_NL2SP

++# convert $build file names to $host format. ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++ ++# convert $build files to toolchain format. ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++

• # An object symbol dumper.
• OBJDUMP=$lt_OBJDUMP
• # Method to check whether dependent libraries are shared objects.
• deplibs_check_method=$lt_deplibs_check_method

+-# Command to use when deplibs_check_method == "file_magic". ++# Command to use when deplibs_check_method = "file_magic".

• file_magic_cmd=$lt_file_magic_cmd

++# How to find potential files when deplibs_check_method = "file_magic". ++file_magic_glob=$lt_file_magic_glob ++ ++# Find potential files using nocaseglob when deplibs_check_method = "file_magic". ++want_nocaseglob=$lt_want_nocaseglob ++ ++# DLL creation program. ++DLLTOOL=$lt_DLLTOOL ++ ++# Command to associate shared and link libraries. ++sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd ++

• # The archiver.
• AR=$lt_AR

++ ++# Flags to create an archive.

• AR_FLAGS=$lt_AR_FLAGS

++# How to feed a file listing to the archiver. ++archiver_list_spec=$lt_archiver_list_spec ++

• # A symbol stripping program.
• STRIP=$lt_STRIP

+@@ -19211,6 +20088,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address

• # Transform the output of nm in a C name address pair when lib prefix is needed.
• global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix

++# Specify filename containing input files for $NM. ++nm_file_list_spec=$lt_nm_file_list_spec ++ ++# The root where to search for dependent libraries,and in which our libraries should be installed. ++lt_sysroot=$lt_sysroot ++

• # The name of the directory that contains temporary libtool files.
• objdir=$objdir

+@@ -19220,6 +20103,9 @@ MAGIC_CMD=$MAGIC_CMD

• # Must we lock files when doing compilation?
• need_locks=$lt_need_locks

++# Manifest tool. ++MANIFEST_TOOL=$lt_MANIFEST_TOOL ++

• # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
• DSYMUTIL=$lt_DSYMUTIL

+@@ -19334,12 +20220,12 @@ with_gcc=$GCC

• # Compiler flag to turn off builtin functions.
• no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag

+-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl +-

• # Additional compiler flags for building library objects.
• pic_flag=$lt_lt_prog_compiler_pic

++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl ++

• # Compiler flag to prevent dynamic linking.
• link_static_flag=$lt_lt_prog_compiler_static

+@@ -19426,9 +20312,6 @@ inherit_rpath=$inherit_rpath

• # Whether libtool must link a program against all its dependency libraries.
• link_all_deplibs=$link_all_deplibs

+-# Fix the shell variable $srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path +-

• # Set to "yes" if exported symbols are required.
• always_export_symbols=$always_export_symbols

+@@ -19444,6 +20327,9 @@ include_expsyms=$lt_include_expsyms

• # Commands necessary for linking programs (against libraries) with templates.
• prelink_cmds=$lt_prelink_cmds

++# Commands necessary for finishing linking programs. ++postlink_cmds=$lt_postlink_cmds ++

• # Specify filename containing input files.
• file_list_spec=$lt_file_list_spec

+@@ -19490,210 +20376,169 @@ ltmain="$ac_aux_dir/ltmain.sh"

• # if finds mixed CR/LF and LF-only lines. Since sed operates in
• # text mode, it properly converts lines to CR/LF. This bash problem
• # is reportedly fixed, but why not run on old versions too?

+- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- case $xsi_shell in +- yes) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $* )) +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} +- +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << _LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} +- +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\${2}$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}$%%"`;; +- esac +-} +- +-# sed scripts: +-my_sed_long_opt='1s/^(-[^=]*)=.*/\1/;q' +-my_sed_long_arg='1s/^-[^=]*=//' +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/.[^.]*$/.lo/'` +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$@"` +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` +-} +- +-_LT_EOF +-esac +- +-case $lt_shell_append in +- yes) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1+=$2" +-} +-_LT_EOF +- ;; +- *) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1=$$1$2" +-} +- +-_LT_EOF +- ;; +- esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ if test x"$xsi_shell" = xyes; then ++ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ ++func_dirname ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_basename ()$/,/^} # func_basename /c\ ++func_basename ()\ ++{\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ ++func_dirname_and_basename ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ ++func_stripname ()\ ++{\ ++\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ ++\ # positional parameters, so assign one to ordinary parameter first.\ ++\ func_stripname_result=${3}\ ++\ func_stripname_result=${func_stripname_result#"${1}"}\ ++\ func_stripname_result=${func_stripname_result%"${2}"}\ ++} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ ++func_split_long_opt ()\ ++{\ ++\ func_split_long_opt_name=${1%%=*}\ ++\ func_split_long_opt_arg=${1#*=}\ ++} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ ++func_split_short_opt ()\ ++{\ ++\ func_split_short_opt_arg=${1#??}\ ++\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ ++} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ ++func_lo2o ()\ ++{\ ++\ case ${1} in\ ++\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ ++\ *) func_lo2o_result=${1} ;;\ ++\ esac\ ++} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_xform ()$/,/^} # func_xform /c\ ++func_xform ()\ ++{\ ++ func_xform_result=${1%.*}.lo\ ++} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_arith ()$/,/^} # func_arith /c\ ++func_arith ()\ ++{\ ++ func_arith_result=$(( $* ))\ ++} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_len ()$/,/^} # func_len /c\ ++func_len ()\ ++{\ ++ func_len_result=${#1}\ ++} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++fi ++ ++if test x"$lt_shell_append" = xyes; then ++ sed -e '/^func_append ()$/,/^} # func_append /c\ ++func_append ()\ ++{\ ++ eval "${1}+=\${2}"\ ++} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ ++func_append_quoted ()\ ++{\ ++\ func_quote_for_eval "${2}"\ ++\ eval "${1}+=\\ \$func_quote_for_eval_result"\ ++} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append ([a-zA-Z_]{1,}) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append ([a-zA-Z_]{1,}) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi ++ ++if test x"$_lt_function_replace_fail" = x":"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 ++$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} ++fi ++ ++ ++ mv -f "$cfgfile" "$ofile" ||

• (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  

• chmod +x "$ofile"

+@@ -19721,12 +20566,12 @@ with_gcc=$GCC_CXX

• # Compiler flag to turn off builtin functions.
• no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX

+-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl_CXX +-

• # Additional compiler flags for building library objects.
• pic_flag=$lt_lt_prog_compiler_pic_CXX

++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl_CXX ++

• # Compiler flag to prevent dynamic linking.
• link_static_flag=$lt_lt_prog_compiler_static_CXX

+@@ -19813,9 +20658,6 @@ inherit_rpath=$inherit_rpath_CXX

• # Whether libtool must link a program against all its dependency libraries.
• link_all_deplibs=$link_all_deplibs_CXX

+-# Fix the shell variable $srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path_CXX +-

• # Set to "yes" if exported symbols are required.
• always_export_symbols=$always_export_symbols_CXX

+@@ -19831,6 +20673,9 @@ include_expsyms=$lt_include_expsyms_CXX

• # Commands necessary for linking programs (against libraries) with templates.
• prelink_cmds=$lt_prelink_cmds_CXX

++# Commands necessary for finishing linking programs. ++postlink_cmds=$lt_postlink_cmds_CXX ++

• # Specify filename containing input files.
• file_list_spec=$lt_file_list_spec_CXX

+diff --git a/libtool.m4 b/libtool.m4 +index 24d13f3..e45fdc6 100644 +--- a/libtool.m4 ++++ b/libtool.m4 +@@ -1,7 +1,8 @@

• # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
• #
• # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,

+-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc.

• # Written by Gordon Matzigkeit, 1996
• #
• # This file is free software; the Free Software Foundation gives

+@@ -10,7 +11,8 @@

• m4_define([_LT_COPYING], [dnl
• # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,

+-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc.

• # Written by Gordon Matzigkeit, 1996
• #
• # This file is part of GNU Libtool.

+@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl

• # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
• ])

+-# serial 56 LT_INIT ++# serial 57 LT_INIT

• # LT_PREREQ(VERSION)

+@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])

• LIBTOOL_DEPS="$ltmain"
• # Always use our own libtool.

+-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL="$LIBTOOL/${host_alias}-libtool"

• AC_SUBST(LIBTOOL)dnl
• _LT_SETUP

+@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl

• dnl
• m4_require([_LT_FILEUTILS_DEFAULTS])dnl
• m4_require([_LT_CHECK_SHELL_FEATURES])dnl

++m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl

• m4_require([_LT_CMD_RELOAD])dnl
• m4_require([_LT_CHECK_MAGIC_METHOD])dnl

++m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl

• m4_require([_LT_CMD_OLD_ARCHIVE])dnl
• m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl

++m4_require([_LT_WITH_SYSROOT])dnl

• _LT_CONFIG_LIBTOOL_INIT([
• # See if we are running on zsh, and set the options which allow our

+@@ -199,7 +205,7 @@ aix3*)

• esac
• # Global variables:

+-ofile=libtool ++ofile=${host_alias}-libtool

• can_build_shared=yes
• # All known linkers require a `.a' archive for static linking (except MSVC,

+@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl

• m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
• configured by $[0], generated by m4_PACKAGE_STRING.

+-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc.

• This config.lt script is free software; the Free Software Foundation
• gives unlimited permision to copy, distribute and modify it."

+@@ -746,15 +752,12 @@ _LT_EOF

• # if finds mixed CR/LF and LF-only lines. Since sed operates in
• # text mode, it properly converts lines to CR/LF. This bash problem
• # is reportedly fixed, but why not run on old versions too?

+- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1)

+- _LT_PROG_XSI_SHELLFNS ++ _LT_PROG_REPLACE_SHELLFNS

+- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || ++ mv -f "$cfgfile" "$ofile" ||

• (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  

• chmod +x "$ofile"
• ],

+@@ -980,6 +983,8 @@ _LT_EOF

•   $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
  

•   echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
  

•   $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
  

++ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD ++ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD

•   cat > conftest.c << _LT_EOF
  

• int main() { return 0;}
• _LT_EOF

+@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],

• fi
• ])

+-# _LT_SYS_MODULE_PATH_AIX +-# ----------------------- ++# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) ++# ----------------------------------

• # Links a minimal program and checks the executable
• # for the system default hardcoded library path. In most cases,
• # this is /usr/lib:/lib, but when the MPI compilers are used
• # the location of the communication and MPI libs are included too.
• # If we don't find anything, use the default library path according
• # to the aix ld manual.

++# Store the results from the different compilers for each TAGNAME. ++# Allow to override them for all tags through lt_cv_aix_libpath.

• m4_defun([_LT_SYS_MODULE_PATH_AIX],
• [m4_require([_LT_DECL_SED])dnl

+-AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi],[]) +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], ++ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ ++ lt_aix_libpath_sed='[ ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }]' ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi],[]) ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" ++ fi ++ ]) ++ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) ++fi

• ])# _LT_SYS_MODULE_PATH_AIX

+@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO

• AC_MSG_CHECKING([how to print strings])
• # Test print first, because it will be a builtin if present.

+-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \

• test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
• ECHO='print -r --'
• elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then

+@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])

• ])# _LT_PROG_ECHO_BACKSLASH

++# _LT_WITH_SYSROOT ++# ---------------- ++AC_DEFUN([_LT_WITH_SYSROOT], ++[AC_MSG_CHECKING([for sysroot]) ++AC_ARG_WITH([libtool-sysroot], ++[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified).], ++[], [with_libtool_sysroot=no]) ++ ++dnl lt_sysroot will always be passed unquoted. We quote it here ++dnl in case the user passed a directory name. ++lt_sysroot= ++case ${with_libtool_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ AC_MSG_RESULT([${with_libtool_sysroot}]) ++ AC_MSG_ERROR([The sysroot must be an absolute path.]) ++ ;; ++esac ++ ++ AC_MSG_RESULT([${lt_sysroot:-no}]) ++_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl ++[dependent libraries, and in which our libraries should be installed.])]) ++

• # _LT_ENABLE_LOCK
• # ---------------
• m4_defun([_LT_ENABLE_LOCK],

+@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock"

• ])# _LT_ENABLE_LOCK

++# _LT_PROG_AR ++# ----------- ++m4_defun([_LT_PROG_AR], ++[AC_CHECK_TOOLS(AR, [ar], false) ++: ${AR=ar} ++: ${AR_FLAGS=cru} ++_LT_DECL([], [AR], [1], [The archiver]) ++_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) ++ ++AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], ++ [lt_cv_ar_at_file=no ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], ++ [echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a ++ ]) ++ ]) ++ ++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi ++_LT_DECL([], [archiver_list_spec], [1], ++ [How to feed a file listing to the archiver]) ++])# _LT_PROG_AR ++ ++

• # _LT_CMD_OLD_ARCHIVE
• # -------------------
• m4_defun([_LT_CMD_OLD_ARCHIVE],

+-[AC_CHECK_TOOL(AR, ar, false) +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-_LT_DECL([], [AR], [1], [The archiver]) +-_LT_DECL([], [AR_FLAGS], [1]) ++[_LT_PROG_AR

• AC_CHECK_TOOL(STRIP, strip, :)
• test -z "$STRIP" && STRIP=:

+@@ -1623,7 +1705,7 @@ else

• lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
• lt_status=$lt_dlunknown
• cat > conftest.$ac_ext <<_LT_EOF

+-[#line __oline__ "configure" ++[#line $LINENO "configure"

• #include "confdefs.h"
• #if HAVE_DLFCN_H

+@@ -1667,10 +1749,10 @@ else

• /* When -fvisbility=hidden is used, assume the code has been annotated
• correspondingly for the symbols needed. */
• #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

+-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default")));

• #endif

+-void fnord () { int i=42; } ++int fnord () { return 42; }

• int main ()
• {
• void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

+@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*)

• need_version=no
• need_lib_prefix=no

+- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc

• library_names_spec='$libname.dll.a'
  

• # DLL is installed to $(libdir)/../bin by postinstall_cmds
  

• postinstall_cmds='base_file=`basename \${file}`~
  

+@@ -2244,13 +2327,71 @@ m4_if([$1], [],[

•   library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
  

•   ;;
  

• esac
  

++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\|/|g' -e 's| \([[a-zA-Z]]\):| /\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename ${file}`~ ++ dlpath=`$SHELL 2>&1 -c '''. $dir/'''${base_file}'''i; echo $dlname'''`~ ++ dldir=$destdir/`dirname $dlpath`~ ++ test -d $dldir || mkdir -p $dldir~ ++ $install_prog $dir/$dlname $dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '''. $file; echo $dlname'''`~ ++ dlpath=$dir/$dldll~ ++ $RM $dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe'

• ;;
  

• *)

++ # Assume MSVC wrapper

• library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
  

++ dynamic_linker='Win32 ld.exe'

• ;;
  

• esac

+- dynamic_linker='Win32 ld.exe'

• # FIXME: first we should search . and the directory the executable is in
• shlibpath_var=PATH
• ;;

+@@ -2342,7 +2483,7 @@ haiku*)

• soname_spec='${libname}${release}${shared_ext}$major'
• shlibpath_var=LIBRARY_PATH
• shlibpath_overrides_runpath=yes

+- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'

• hardcode_into_libs=yes
• ;;

+@@ -2950,6 +3091,11 @@ case $reload_flag in

• esac
• reload_cmds='$LD$reload_flag -o $output$reload_objs'
• case $host_os in

++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;;

• darwin*)

• if test "$GCC" = yes; then
  

•   reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  

+@@ -3016,7 +3162,8 @@ mingw* | pw32*)

• lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  

• lt_cv_file_magic_cmd='func_win32_libid'
  

• else

+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'

• lt_cv_file_magic_cmd='$OBJDUMP -f'
  

• fi
• ;;

+@@ -3167,6 +3314,21 @@ tpf*)

• ;;
• esac
• ])

++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/(..)/s/[[\1]]/[[\1]]/g;/g"` ++ fi ++ ;; ++ esac ++fi ++

• file_magic_cmd=$lt_cv_file_magic_cmd
• deplibs_check_method=$lt_cv_deplibs_check_method
• test -z "$deplibs_check_method" && deplibs_check_method=unknown

+@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown

• _LT_DECL([], [deplibs_check_method], [1],

• [Method to check whether dependent libraries are shared objects])
  

• _LT_DECL([], [file_magic_cmd], [1],

+- [Command to use when deplibs_check_method == "file_magic"]) ++ [Command to use when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [file_magic_glob], [1], ++ [How to find potential files when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [want_nocaseglob], [1], ++ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])

• ])# _LT_CHECK_MAGIC_METHOD

+@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility:

• dnl AC_DEFUN([AM_PROG_NM], [])
• dnl AC_DEFUN([AC_PROG_NM], [])

++# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++# -------------------------------- ++# how to determine the name of the shared library ++# associated with a specific link library. ++# -- PORTME fill in with the dynamic library characteristics ++m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], ++[m4_require([_LT_DECL_EGREP]) ++m4_require([_LT_DECL_OBJDUMP]) ++m4_require([_LT_DECL_DLLTOOL]) ++AC_CACHE_CHECK([how to associate runtime and link libraries], ++lt_cv_sharedlib_from_linklib_cmd, ++[lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++]) ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++_LT_DECL([], [sharedlib_from_linklib_cmd], [1], ++ [Command to associate shared and link libraries]) ++])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++ ++ ++# _LT_PATH_MANIFEST_TOOL ++# ---------------------- ++# locate the manifest tool ++m4_defun([_LT_PATH_MANIFEST_TOOL], ++[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], ++ [lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest*]) ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ++])# _LT_PATH_MANIFEST_TOOL ++

• # LT_LIB_M
• # --------

+@@ -3403,8 +3630,8 @@ esac

• lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* (.*)$/extern int \1();/p' -e 's/^$symcode* .* (.*)$/extern char \1;/p'"
• # Transform an extracted symbol line into symbol name and symbol address

+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: ([[^ ]]*) $/ {\"\1\", (void *) 0},/p' -e 's/^$symcode* ([[^ ]]*) ([[^ ]]*)$/ {"\2", (void *) &\2},/p'" +-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'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: ([[^ ]]*)[[ ]]*$/ {\"\1\", (void *) 0},/p' -e 's/^$symcode* ([[^ ]]*) ([[^ ]]*)$/ {"\2", (void *) &\2},/p'" ++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'"

• # Handle CRLF in mingw tool chain
• opt_cr=

+@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do

• else

• lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  

• fi

++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"

• # Check to see that the pipe works correctly.
• pipe_works=no

+@@ -3473,6 +3701,18 @@ _LT_EOF

•   if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  

• if $GREP ' nm_test_func$' "$nlist" >/dev/null; then

•  cat <<_LT_EOF > conftest.$ac_ext
  

++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT@&t@_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT@&t@_DLSYM_CONST ++#else ++# define LT@&t@_DLSYM_CONST const ++#endif ++

• #ifdef __cplusplus
• extern "C" {
• #endif

+@@ -3484,7 +3724,7 @@ _LT_EOF

•  cat <<_LT_EOF >> conftest.$ac_ext
  

• /* The mapping between symbol names and symbols. */

+-const struct { ++LT@&t@_DLSYM_CONST struct {

• const char *name;
• void *address;
• }

+@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() {

• _LT_EOF

•  # Now try linking the two files.
  

•  mv conftest.$ac_objext conftstm.$ac_objext
  

+- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS

•  LIBS="conftstm.$ac_objext"
  

•  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
  

•  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
  

•    pipe_works=yes
  

•  fi
  

+- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS

• else

•  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
  

• fi

+@@ -3551,6 +3791,13 @@ else

• AC_MSG_RESULT(ok)
• fi

++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++

• _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],

• [Take the output of nm and produce a listing of raw symbols and C names])
  

• _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],

+@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address],

• _LT_DECL([global_symbol_to_c_name_address_lib_prefix],

• [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
  

• [Transform the output of nm in a C name address pair when lib prefix is needed])
  

++_LT_DECL([], [nm_file_list_spec], [1], ++ [Specify filename containing input files for $NM])

• ]) # _LT_CMD_GLOBAL_SYMBOLS

+@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=

• _LT_TAGVAR(lt_prog_compiler_pic, $1)=
• _LT_TAGVAR(lt_prog_compiler_static, $1)=

+-AC_MSG_CHECKING([for $compiler option to produce PIC])

• m4_if([$1], [CXX], [
• # C++ specific cases for pic, static, wl, etc.
• if test "$GXX" = yes; then

+@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [

•  ;;
  

• esac
• ;;

++ mingw* | cygwin* | os2* | pw32* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;;

•   dgux*)
  

• case $cc_basename in

•  ec++*)
  

+@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [

• ;;

•   solaris*)
  

• case $cc_basename in

+- CC*) ++ CC* | sunCC*)

•    # Sun C++ 4.2, 5.x and Centerline C++
  

•    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  

•    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
  

+@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [

• _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
• _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
• ;;

++ nagfor*) ++ # NAG Fortran compiler ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;;

•   pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  

•     # Portland Group compilers (*not* the Pentium gcc compiler,
  

• # which looks to be a dead project)

+@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [

•   _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  

•   _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
  

•   case $cc_basename in
  

+- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)

• _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;

•   *)
  

• _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;

+@@ -4172,9 +4432,11 @@ case $host_os in

• _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
  

• ;;
  

• esac

+-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], +- [How to pass a linker flag through the compiler]) ++ ++AC_CACHE_CHECK([for $compiler option to produce PIC], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) ++_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)

• #
• # Check to make sure the PIC flag actually works.

+@@ -4193,6 +4455,8 @@ fi

• _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
• [Additional compiler flags for building library objects])

++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], ++ [How to pass a linker flag through the compiler])

• #
• # Check to make sure the static flag actually works.
• #

+@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],

• m4_defun([_LT_LINKER_SHLIBS],
• [AC_REQUIRE([LT_PATH_LD])dnl
• AC_REQUIRE([LT_PATH_NM])dnl

++m4_require([_LT_PATH_MANIFEST_TOOL])dnl

• m4_require([_LT_FILEUTILS_DEFAULTS])dnl
• m4_require([_LT_DECL_EGREP])dnl
• m4_require([_LT_DECL_SED])dnl

+@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl

• AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
• m4_if([$1], [CXX], [
• _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '''s/.* //''' | sort | uniq > $export_symbols'

++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']

• case $host_os in
• aix[[4-9]]*)

• # If we're using GNU nm, then we don't want the "-C" option.
  

+@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [

• ;;
  

• pw32*)

• _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
  

+- ;; ++ ;;

• cygwin* | mingw* | cegcc*)

+- _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' +- ;; ++ case $cc_basename in ++ cl*) ;; ++ *) ++ _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' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] ++ ;; ++ esac ++ ;;

• *)

• _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  

+- ;; ++ ;;

• esac

+- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']

• ], [
• runpath_var=
• _LT_TAGVAR(allow_undefined_flag, $1)=

+@@ -4411,7 +4682,8 @@ _LT_EOF

•   _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
  

•   _LT_TAGVAR(always_export_symbols, $1)=no
  

•   _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  

+- _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' ++ _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' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']

•   if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  

•     _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'
  

+@@ -4510,12 +4782,12 @@ _LT_EOF

•  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
  

•  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
  

•  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
  

+- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'

•  if test "x$supports_anon_versioning" = xyes; then
  

•    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
  

•      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  

•      echo "local: *; };" >> $output_objdir/$libname.ver~
  

+- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'

•  fi
  

•  ;;
  

• esac

+@@ -4529,8 +4801,8 @@ _LT_EOF

• _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
• wlarc=

•   else
  

+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _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' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _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'

•   fi
  

•   ;;
  

+@@ -4548,8 +4820,8 @@ _LT_EOF

• _LT_EOF

•   elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  

+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _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' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _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'

•   else
  

• _LT_TAGVAR(ld_shlibs, $1)=no

•   fi
  

+@@ -4595,8 +4867,8 @@ _LT_EOF

• *)
  

•   if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  

+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _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' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _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'

•   else
  

• _LT_TAGVAR(ld_shlibs, $1)=no

•   fi
  

+@@ -4726,7 +4998,7 @@ _LT_EOF

• _LT_TAGVAR(allow_undefined_flag, $1)='-berok'

•     # Determine the default libpath from the value encoded in an
  

•     # empty executable.
  

+- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1])

•     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•     _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"
  

•   else
  

+@@ -4737,7 +5009,7 @@ _LT_EOF

• else

• # Determine the default libpath from the value encoded in an
  

• # empty executable.
  

+- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1])

• _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•  # Warning - without using the other run time loading flags,
  

•  # -berok will link without error, but may produce a broken library.
  

+@@ -4781,20 +5053,63 @@ _LT_EOF

•   # Microsoft Visual C++.
  

•   # hardcode_libdir_flag_spec is actually meaningless, as there is
  

•   # no search path for DLLs.
  

+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '''s/ -lc$//'''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' +- # FIXME: Should let the user specify the lib program. +- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' +- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' -e '1\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _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' ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '''s/ -lc$//'''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ # FIXME: Should let the user specify the lib program. ++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ;; ++ esac

•   ;;
  

• darwin* | rhapsody*)
  

+@@ -4828,7 +5143,7 @@ _LT_EOF

• # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  

• freebsd* | dragonfly*)
  

+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

•   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  

•   _LT_TAGVAR(hardcode_direct, $1)=yes
  

•   _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
  

+@@ -4836,7 +5151,7 @@ _LT_EOF

• hpux9*)
  

•   if test "$GCC" = yes; then
  

+- _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' ++ _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'

•   else
  

• _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'

•   fi
  

+@@ -4852,7 +5167,7 @@ _LT_EOF

• hpux10*)
  

•   if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  

+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

•   else
  

• _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'

•   fi
  

+@@ -4876,10 +5191,10 @@ _LT_EOF

•  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  

•  ;;
  

• ia64*)

+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

•  ;;
  

• *)

+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

•  ;;
  

• esac

•   else
  

+@@ -4926,16 +5241,31 @@ _LT_EOF

• irix5* | irix6* | nonstopux*)
  

•   if test "$GCC" = yes; then
  

+- _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' ++ _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'

• # Try to use the -exported_symbol ld option, if it does not
• # work, assume that -exports_file does not work either and
• # implicitly export all symbols.

+- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- AC_LINK_IFELSE(int foo(void) {}, +- _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' +- ) +- LDFLAGS="$save_LDFLAGS" ++ # This should be the same for all languages, so no per-tag cache variable. ++ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], ++ [lt_cv_irix_exported_symbol], ++ [save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ AC_LINK_IFELSE( ++ [AC_LANG_SOURCE( ++ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], ++ [C++], [[int foo (void) { return 0; }]], ++ [Fortran 77], [[ ++ subroutine foo ++ end]], ++ [Fortran], [[ ++ subroutine foo ++ end]])])], ++ [lt_cv_irix_exported_symbol=yes], ++ [lt_cv_irix_exported_symbol=no]) ++ LDFLAGS="$save_LDFLAGS"]) ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ _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' ++ fi

•   else
  

• _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'
• _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'

+@@ -5020,7 +5350,7 @@ _LT_EOF

• osf4* | osf5*)	# as osf3* with the addition of -msym flag
  

•   if test "$GCC" = yes; then
  

• _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}*'

+- _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' ++ _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'

• _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

•   else
  

• _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved *'

+@@ -5039,9 +5369,9 @@ _LT_EOF

•   _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
  

•   if test "$GCC" = yes; then
  

• wlarc='${wl}'

+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

• _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/(.*)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~

+- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $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'

•   else
  

• case `$CC -V 2>&1` in
• *"Compilers 5.0"*)

+@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],

• to runtime path list])
  

• _LT_TAGDECL([], [link_all_deplibs], [0],

• [Whether libtool must link a program against all its dependency libraries])
  

+-_LT_TAGDECL([], [fix_srcfile_path], [1], +- [Fix the shell variable $srcfile for the compiler])

• _LT_TAGDECL([], [always_export_symbols], [0],

• [Set to "yes" if exported symbols are required])
  

• _LT_TAGDECL([], [export_symbols_cmds], [2],

+@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1],

• [Symbols that must always be exported])
  

• _LT_TAGDECL([], [prelink_cmds], [2],

• [Commands necessary for linking programs (against libraries) with templates])
  

++_LT_TAGDECL([], [postlink_cmds], [2], ++ [Commands necessary for finishing linking programs])

• _LT_TAGDECL([], [file_list_spec], [1],

• [Specify filename containing input files])
  

• dnl FIXME: Not yet implemented

+@@ -5426,6 +5756,7 @@ CC="$lt_save_CC"

• m4_defun([_LT_LANG_CXX_CONFIG],
• [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
• m4_require([_LT_DECL_EGREP])dnl

++m4_require([_LT_PATH_MANIFEST_TOOL])dnl

• if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

• ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
  

• (test "X$CXX" != "Xg++"))) ; then
  

+@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then

• # Allow CC to be a program name with arguments.
• lt_save_CC=$CC

++ lt_save_CFLAGS=$CFLAGS

• lt_save_LD=$LD
• lt_save_GCC=$GCC
• GCC=$GXX

+@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then

• fi
• test -z "${LDCXX+set}" || LD=$LDCXX
• CC=${CXX-"c++"}

++ CFLAGS=$CXXFLAGS

• compiler=$CC
• _LT_TAGVAR(compiler, $1)=$CC
• _LT_CC_BASENAME([$compiler])

+@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then

•       _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
  

•       # Determine the default libpath from the value encoded in an empty
  

•       # executable.
  

+- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1])

•       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•       _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"
  

+@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then

•       else
  

•    # Determine the default libpath from the value encoded in an
  

•    # empty executable.
  

+- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1])

•    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•    # Warning - without using the other run time loading flags,
  

•    # -berok will link without error, but may produce a broken library.
  

+@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then

•     ;;
  

•   cygwin* | mingw* | pw32* | cegcc*)
  

+- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_TAGVAR(always_export_symbols, $1)=no +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- +- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +- _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' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $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' +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++ case $GXX,$cc_basename in ++ ,cl* | no,cl*) ++ # Native MSVC ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ $SED -n -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' -e '1\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ $SED -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ func_to_tool_file "$lt_outputfile"~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # g++ ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ _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' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $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' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;;

•   darwin* | rhapsody*)
  

•     _LT_DARWIN_LINKER_FEATURES($1)
  

• ;;

+@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then

•         ;;
  

•       *)
  

•         if test "$GXX" = yes; then
  

+- _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' ++ _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'

•         else
  

•           # FIXME: insert proper C++ library support
  

•           _LT_TAGVAR(ld_shlibs, $1)=no
  

+@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then

•            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  

•            ;;
  

•          ia64*)
  

+- _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' ++ _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'

•            ;;
  

•          *)
  

+- _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' ++ _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'

•            ;;
  

•        esac
  

•      fi
  

+@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then

•       *)
  

•    if test "$GXX" = yes; then
  

•      if test "$with_gnu_ld" = no; then
  

+- _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' ++ _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'

•      else
  

+- _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' ++ _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'

•      fi
  

•    fi
  

•    _LT_TAGVAR(link_all_deplibs, $1)=yes
  

+@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then

•      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
  

• rm -rf $tpldir~
  

• $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
  

+- compile_command="$compile_command `find $tpldir -name *.o | $NL2SP`"' ++ compile_command="$compile_command `find $tpldir -name *.o | sort | $NL2SP`"'

•      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
  

• rm -rf $tpldir~
  

• $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
  

+- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name *.o | $NL2SP`~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name *.o | sort | $NL2SP`~

• $RANLIB $oldlib'
  

•      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
  

• rm -rf $tpldir~
  

• $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
  

+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name *.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name *.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

•      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
  

• rm -rf $tpldir~
  

• $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
  

+- $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' ++ $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'

•      ;;
  

•    *) # Version 6 and above use weak symbols
  

•      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  

+@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then

•          _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'
  

•   ;;
  

•        *)
  

+- _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' ++ _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'

•   ;;
  

•      esac
  

+@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then

•   solaris*)
  

•     case $cc_basename in
  

+- CC*) ++ CC* | sunCC*)

•    # Sun C++ 4.2, 5.x and Centerline C++
  

•         _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
  

•    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
  

+@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then

•    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  

•      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
  

•      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
  

+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _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'

•        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  

+- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'

•        # Commands to make compiler produce verbose output that lists
  

•        # what "hidden" libraries, object files and flags are used when
  

+@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then

• fi # test -n "$compiler"
• CC=$lt_save_CC

++ CFLAGS=$lt_save_CFLAGS

• LDCXX=$LD
• LD=$lt_save_LD
• GCC=$lt_save_GCC

+@@ -6445,6 +6825,29 @@ AC_LANG_POP

• ])# _LT_LANG_CXX_CONFIG

++# _LT_FUNC_STRIPNAME_CNF ++# ---------------------- ++# func_stripname_cnf prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# ++# This function is identical to the (non-XSI) version of func_stripname, ++# except this one can be used by m4 code that may be executed by configure, ++# rather than the libtool script. ++m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl ++AC_REQUIRE([_LT_DECL_SED]) ++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) ++func_stripname_cnf () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\${2}$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}$%%"`;; ++ esac ++} # func_stripname_cnf ++])# _LT_FUNC_STRIPNAME_CNF ++

• # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
• # ---------------------------------
• # Figure out "hidden" library dependencies from verbose

+@@ -6453,6 +6856,7 @@ AC_LANG_POP

• # objects, libraries and library flags.
• m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
• [m4_require([_LT_FILEUTILS_DEFAULTS])dnl

++AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl

• # Dependencies to place before and after the object being linked:
• _LT_TAGVAR(predep_objects, $1)=
• _LT_TAGVAR(postdep_objects, $1)=

+@@ -6503,6 +6907,13 @@ public class foo {

• };
• _LT_EOF
• ])

++ ++_lt_libdeps_save_CFLAGS=$CFLAGS ++case "$CC $CFLAGS " in #( ++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; ++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; ++esac ++

• dnl Parse the compiler output and extract the necessary
• dnl objects, libraries and library flags.
• if AC_TRY_EVAL(ac_compile); then

+@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then

• pre_test_object_deps_done=no
• for p in `eval "$output_verbose_link_cmd"`; do

+- case $p in ++ case ${prev}${p} in

• -L* | -R* | -l*)
  

•    # Some compilers place space between "-{L,R}" and the path.
  

+@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then

•       test $p = "-R"; then
  

• prev=$p
  

• continue
  

+- else +- prev=

•    fi
  

++ # Expand the sysroot to ease extracting the directories later. ++ if test -z "$prev"; then ++ case $p in ++ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; ++ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; ++ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; ++ esac ++ fi ++ case $p in ++ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; ++ esac

•    if test "$pre_test_object_deps_done" = no; then
  

+- case $p in +- -L* | -R*) ++ case ${prev} in ++ -L | -R)

•   # Internal compiler library paths should come after those
  

•   # provided the user.  The postdeps already come after the
  

•   # user supplied libs so there is no need to process them.
  

+@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then

•   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
  

• fi
  

•    fi
  

++ prev=

•    ;;
  

++ *.lto.$objext) ;; # Ignore GCC LTO objects

• *.$objext)
  

•    # This assumes that the test object file only shows up
  

•    # once in the compiler output.
  

+@@ -6586,6 +7008,7 @@ else

• fi
• $RM -f confest.$objext

++CFLAGS=$_lt_libdeps_save_CFLAGS

• # PORTME: override above test on systems where it is broken
• m4_if([$1], [CXX],

+@@ -6622,7 +7045,7 @@ linux*)

• solaris*)
• case $cc_basename in

+- CC*) ++ CC* | sunCC*)

• # The more standards-conforming stlport4 library is
  

• # incompatible with the Cstd library. Avoid specifying
  

• # it if it's in CXXFLAGS. Ignore libCrun as
  

+@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then

• # Allow CC to be a program name with arguments.
• lt_save_CC="$CC"
• lt_save_GCC=$GCC

++ lt_save_CFLAGS=$CFLAGS

• CC=${F77-"f77"}

++ CFLAGS=$FFLAGS

• compiler=$CC
• _LT_TAGVAR(compiler, $1)=$CC
• _LT_CC_BASENAME([$compiler])

+@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then

• GCC=$lt_save_GCC
• CC="$lt_save_CC"

++ CFLAGS="$lt_save_CFLAGS"

• fi # test "$_lt_disable_F77" != yes
• AC_LANG_POP

+@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then

• # Allow CC to be a program name with arguments.
• lt_save_CC="$CC"
• lt_save_GCC=$GCC

++ lt_save_CFLAGS=$CFLAGS

• CC=${FC-"f95"}

++ CFLAGS=$FCFLAGS

• compiler=$CC
• GCC=$ac_cv_fc_compiler_gnu

+@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then

• fi # test -n "$compiler"
• GCC=$lt_save_GCC

+- CC="$lt_save_CC" ++ CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS

• fi # test "$_lt_disable_FC" != yes
• AC_LANG_POP

+@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE

• _LT_LINKER_BOILERPLATE
• # Allow CC to be a program name with arguments.

+-lt_save_CC="$CC" ++lt_save_CC=$CC ++lt_save_CFLAGS=$CFLAGS

• lt_save_GCC=$GCC
• GCC=yes
• CC=${GCJ-"gcj"}

++CFLAGS=$GCJFLAGS

• compiler=$CC
• _LT_TAGVAR(compiler, $1)=$CC
• _LT_TAGVAR(LD, $1)="$LD"

+@@ -6992,7 +7423,8 @@ fi

• AC_LANG_RESTORE
• GCC=$lt_save_GCC

+-CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS

• ])# _LT_LANG_GCJ_CONFIG

+@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE

• # Allow CC to be a program name with arguments.
• lt_save_CC="$CC"

++lt_save_CFLAGS=$CFLAGS

• lt_save_GCC=$GCC
• GCC=
• CC=${RC-"windres"}

++CFLAGS=

• compiler=$CC
• _LT_TAGVAR(compiler, $1)=$CC
• _LT_CC_BASENAME([$compiler])

+@@ -7042,7 +7476,8 @@ fi

• GCC=$lt_save_GCC
• AC_LANG_RESTORE

+-CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS

• ])# _LT_LANG_RC_CONFIG

+@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])

• AC_SUBST([OBJDUMP])
• ])

++# _LT_DECL_DLLTOOL ++# ---------------- ++# Ensure DLLTOOL variable is set. ++m4_defun([_LT_DECL_DLLTOOL], ++[AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) ++AC_SUBST([DLLTOOL]) ++])

• # _LT_DECL_SED
• # ------------

+@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],

• # Try some XSI features
• xsi_shell=no
• ( _lt_dummy="a/b/c"

+- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \

• && eval 'test $(( 1 + 1 )) -eq 2 \
  

• && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  

• && xsi_shell=yes

+@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl

• ])# _LT_CHECK_SHELL_FEATURES

+-# _LT_PROG_XSI_SHELLFNS +-# --------------------- +-# Bourne and XSI compatible variants of some useful shell functions. +-m4_defun([_LT_PROG_XSI_SHELLFNS], +-[case $xsi_shell in +- yes) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $[*] )) +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} ++# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) ++# ------------------------------------------------------ ++# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and ++# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. ++m4_defun([_LT_PROG_FUNCTION_REPLACE], ++[dnl { ++sed -e '/^$1 ()$/,/^} # $1 /c\ ++$1 ()\ ++{\ ++m4_bpatsubsts([$2], [$], [\], [^([ ])], [\\1]) ++} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++])

+-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << _LT_EOF >> "$cfgfile"

+-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} ++# _LT_PROG_REPLACE_SHELLFNS ++# ------------------------- ++# Replace existing portable implementations of several shell functions with ++# equivalent extended shell implementations where those features are available.. ++m4_defun([_LT_PROG_REPLACE_SHELLFNS], ++[if test x"$xsi_shell" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac]) ++ ++ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl ++ func_basename_result="${1##*/}"]) ++ ++ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}"])

+-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"}])

+-dnl func_dirname_and_basename +-dnl A portable version of this function is already defined in general.m4sh +-dnl so there is no need for it here. ++ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl ++ func_split_long_opt_name=${1%%=*} ++ func_split_long_opt_arg=${1#*=}])

+-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\${2}$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}$%%"`;; +- esac +-} ++ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl ++ func_split_short_opt_arg=${1#??} ++ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])

+-# sed scripts: +-my_sed_long_opt='1s/^(-[[^=]]*)=.*/\1/;q' +-my_sed_long_arg='1s/^-[[^=]]*=//' ++ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac])

+-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])

+-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])

+-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/.[[^.]]*$/.lo/'` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) ++fi

+-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$[@]"` +-} ++if test x"$lt_shell_append" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\${2}"])

+-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl ++ func_quote_for_eval "${2}" ++dnl m4 expansion turns \\ into \, and then the shell eval turns that into \ ++ eval "${1}+=\\ \$func_quote_for_eval_result"])

+-_LT_EOF +-esac ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append ([[a-zA-Z_]]{1,}) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append ([[a-zA-Z_]]{1,}) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi

+-case $lt_shell_append in +- yes) +- cat << _LT_EOF >> "$cfgfile" ++if test x"$_lt_function_replace_fail" = x":"; then ++ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) ++fi ++])

+-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]+=$[2]" +-} +-_LT_EOF ++# _LT_PATH_CONVERSION_FUNCTIONS ++# ----------------------------- ++# Determine which file name conversion functions should be used by ++# func_to_host_file (and, implicitly, by func_to_host_path). These are needed ++# for certain cross-compile configurations and native mingw. ++m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_MSG_CHECKING([how to convert $build file names to $host format]) ++AC_CACHE_VAL(lt_cv_to_host_file_cmd, ++[case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac

• ;;
  

+- *) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]=$$[1]$[2]" +-} +- +-_LT_EOF ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac

• ;;
  

+- esac ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++]) ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) ++_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], ++ [0], [convert $build file names to $host format])dnl ++ ++AC_MSG_CHECKING([how to convert $build file names to toolchain format]) ++AC_CACHE_VAL(lt_cv_to_tool_file_cmd, ++[#assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac

• ])

++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) ++_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], ++ [0], [convert $build files to toolchain format])dnl ++])# _LT_PATH_CONVERSION_FUNCTIONS +diff --git a/ltmain.sh b/ltmain.sh +index 9503ec8..70e856e 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -1,10 +1,9 @@ +-# Generated from ltmain.m4sh.

+-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a ++# libtool (GNU libtool) 2.4

• # Written by Gordon Matzigkeit gord@gnu.ai.mit.edu, 1996
• # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,

+-# 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.

• # This is free software; see the source for copying conditions. There is NO
• # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

+@@ -38,7 +37,6 @@

• # -n, --dry-run display commands without modifying any files
• # --features display basic configuration information and exit
• # --mode=MODE use operation mode MODE

+-# --no-finish let install mode avoid finish commands

• # --preserve-dup-deps don't remove duplicate dependency libraries
• # --quiet, --silent don't print informational messages
• # --no-quiet, --no-silent

+@@ -71,17 +69,19 @@

• # compiler: $LTCC
• # compiler flags: $LTCFLAGS
• # linker: $LD (gnu? $with_gnu_ld)

+-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a ++# $progname: (GNU libtool) 2.4

• # automake: $automake_version
• # autoconf: $autoconf_version
• #
• # Report bugs to bug-libtool@gnu.org.

++# GNU libtool home page: http://www.gnu.org/software/libtool/. ++# General help using GNU software: http://www.gnu.org/gethelp/.

• PROGRAM=libtool
• PACKAGE=libtool

+-VERSION=2.2.7a +-TIMESTAMP=" 1.3134 2009-11-29" +-package_revision=1.3134 ++VERSION=2.4 ++TIMESTAMP="" ++package_revision=1.3293

• # Be Bourne compatible
• if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

+@@ -106,9 +106,6 @@ _LTECHO_EOF'

• }
• # NLS nuisances: We save the old values to restore during execute mode.

+-# Only set LANG and LC_ALL to C if already set. +-# These must not be set unconditionally because not all systems understand +-# e.g. LANG=C (notably SCO).

• lt_user_locale=
• lt_safe_locale=
• for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES

+@@ -121,15 +118,13 @@ do

•  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
  

• fi"
• done

++LC_ALL=C ++LANGUAGE=C ++export LANGUAGE LC_ALL

• $lt_unset CDPATH

+- +- +- +- +-

• # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
• # is ksh but when the shell is invoked as "sh" and the current value of
• # the _XPG environment variable is not equal to 1 (one), the special

+@@ -140,7 +135,7 @@ progpath="$0"

• : ${CP="cp -f"}

+-: ${ECHO=$as_echo} ++test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}

• : ${EGREP="/bin/grep -E"}
• : ${FGREP="/bin/grep -F"}
• : ${GREP="/bin/grep"}

+@@ -149,7 +144,7 @@ progpath="$0"

• : ${MKDIR="mkdir"}
• : ${MV="mv -f"}
• : ${RM="rm -f"}

+-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} ++: ${SED="/bin/sed"}

• : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
• : ${Xsed="$SED -e 1s/^X//"}

+@@ -169,6 +164,27 @@ IFS=" $lt_nl"

• dirname="s,/[^/]*$,,"
• basename="s,^.*/,,"

++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} # func_dirname may be replaced by extended shell implementation ++ ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "${1}" | $SED "$basename"` ++} # func_basename may be replaced by extended shell implementation ++ ++

• # func_dirname_and_basename file append nondir_replacement
• # perform func_basename and func_dirname in a single function
• # call:

+@@ -183,17 +199,31 @@ basename="s,^.*/,,"

• # those functions but instead duplicate the functionality here.
• func_dirname_and_basename ()
• {

+- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +-} ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` ++} # func_dirname_and_basename may be replaced by extended shell implementation ++ ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# func_strip_suffix prefix name ++func_stripname () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\${2}$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}$%%"`;; ++ esac ++} # func_stripname may be replaced by extended shell implementation

+-# Generated shell functions inserted here.

• # These SED scripts presuppose an absolute path with a trailing slash.
• pathcar='s,^/([^/]*).*$,\1,'

+@@ -376,6 +406,15 @@ sed_quote_subst='s/([`"$\])/\\1/g'

• # Same as above, but do not quote variable references.
• double_quote_subst='s/(["`\])/\\1/g'

++# Sed substitution that turns a string into a regex matching for the ++# string literally. ++sed_make_literal_regex='s,[].[^$\*/],\&,g' ++ ++# Sed substitution that converts a w32 file name or path ++# which contains forward slashes, into one that contains ++# (escaped) backslashes. A very naive implementation. ++lt_sed_naive_backslashify='s|\\*|\|g;s|/|\|g;s|\|\\|g' ++

• # Re-`' parameter expansions in output of double_quote_subst that were
• # `'-ed in input to the same. If an odd number of `' preceded a '$'
• # in input to double_quote_subst, that '$' was protected from expansion.

+@@ -404,7 +443,7 @@ opt_warning=:

• # name if it has been set yet.
• func_echo ()
• {

+- $ECHO "$progname${mode+: }$mode: $*" ++ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"

• }
• # func_verbose arg...

+@@ -430,14 +469,14 @@ func_echo_all ()

• # Echo program name prefixed message to standard error.
• func_error ()
• {

+- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 ++ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2

• }
• # func_warning arg...
• # Echo program name prefixed warning message to standard error.
• func_warning ()
• {

+- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 ++ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2

• # bash bug again:
  

• :
  

+@@ -656,19 +695,35 @@ func_show_eval_locale ()

• fi
  

• }

+- +- ++# func_tr_sh ++# Turn $1 into a string suitable for a shell variable name. ++# Result is stored in $func_tr_sh_result. All characters ++# not in the set a-zA-Z0-9_ are replaced with '_'. Further, ++# if $1 begins with a digit, a '_' is prepended as well. ++func_tr_sh () ++{ ++ case $1 in ++ [0-9]* | *[!a-zA-Z0-9_]*) ++ func_tr_sh_result=`$ECHO "$1" | $SED 's/^([0-9])/_\1/; s/[^a-zA-Z0-9_]/_/g'` ++ ;; ++ * ) ++ func_tr_sh_result=$1 ++ ;; ++ esac ++}

• # func_version
• # Echo version message to standard output and exit.
• func_version ()
• {

++ $opt_debug ++

• $SED -n '/(C)/!b go
  

• :more
• /./!{

•  N
  

+- s/\n# // ++ s/\n# / /

•  b more
  

• }
• :go

+@@ -685,7 +740,9 @@ func_version ()

• # Echo short help message to standard output and exit.
• func_usage ()
• {

+- $SED -n '/^# Usage:/,/^# *-h/ { ++ $opt_debug ++ ++ $SED -n '/^# Usage:/,/^# *.*--help/ {

•     s/^# //
  

• s/^# *$//
• s/$progname/'$progname'/

+@@ -701,7 +758,10 @@ func_usage ()

• # unless 'noexit' is passed as argument.
• func_help ()
• {

++ $opt_debug ++

• $SED -n '/^# Usage:/,/# Report bugs to/ {
  

++ :print

•     s/^# //
  

• s/^# *$//
• s*$progname*'$progname'*

+@@ -714,7 +774,11 @@ func_help ()

• s/$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
• s/$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
• p

+- }' < "$progpath" ++ d ++ } ++ /^# .* home page:/b print ++ /^# General help using/b print ++ ' < "$progpath"

• ret=$?
  

• if test -z "$1"; then
  

•   exit $ret
  

+@@ -726,12 +790,39 @@ func_help ()

• # exit_cmd.
• func_missing_arg ()
• {

+- func_error "missing argument for $1" ++ $opt_debug ++ ++ func_error "missing argument for $1."

• exit_cmd=exit
  

• }

+-exit_cmd=:

++# func_split_short_opt shortopt ++# Set func_split_short_opt_name and func_split_short_opt_arg shell ++# variables after splitting SHORTOPT after the 2nd character. ++func_split_short_opt () ++{ ++ my_sed_short_opt='1s/^(..).*$/\1/;q' ++ my_sed_short_rest='1s/^..(.*)$/\1/;q' ++ ++ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` ++ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` ++} # func_split_short_opt may be replaced by extended shell implementation ++ ++ ++# func_split_long_opt longopt ++# Set func_split_long_opt_name and func_split_long_opt_arg shell ++# variables after splitting LONGOPT at the `=' sign. ++func_split_long_opt () ++{ ++ my_sed_long_opt='1s/^(--[^=]*)=.*/\1/;q' ++ my_sed_long_arg='1s/^--[^=]*=//' ++ ++ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` ++ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` ++} # func_split_long_opt may be replaced by extended shell implementation ++ ++exit_cmd=:

+@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%"

• magic_exe="%%%MAGIC EXE variable%%%"
• # Global variables.

+-# $mode is unset

• nonopt=

+-execute_dlfiles=

• preserve_args=
• lo2o="s/\.lo$/.${objext}/"
• o2lo="s/\.${objext}$/.lo/"
• extracted_archives=
• extracted_serial=0

+-opt_dry_run=false +-opt_finish=: +-opt_duplicate_deps=false +-opt_silent=false +-opt_debug=: +-

• # If this variable is set in any of the actions, the command in it
• # will be execed at the end. This prevents here-documents from being
• # left over by shells.
• exec_cmd=

++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "${1}=$${1}${2}" ++} # func_append may be replaced by extended shell implementation ++ ++# func_append_quoted var value ++# Quote VALUE and append to the end of shell variable VAR, separated ++# by a space. ++func_append_quoted () ++{ ++ func_quote_for_eval "${2}" ++ eval "${1}=$${1}\ $func_quote_for_eval_result" ++} # func_append_quoted may be replaced by extended shell implementation ++ ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "${@}"` ++} # func_arith may be replaced by extended shell implementation ++ ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` ++} # func_len may be replaced by extended shell implementation ++ ++ ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` ++} # func_lo2o may be replaced by extended shell implementation ++ ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "${1}" | $SED 's/.[^.]*$/.lo/'` ++} # func_xform may be replaced by extended shell implementation ++ ++

• # func_fatal_configuration arg...
• # Echo program name prefixed message to standard error, followed by
• # a configuration failure hint, and exit.

+@@ -850,130 +979,204 @@ func_enable_tag ()

• esac
• }

+-# Parse options once, thoroughly. This comes as soon as possible in +-# the script to make things like `libtool --version' happen quickly. ++# func_check_version_match ++# Ensure that we are using m4 macros, and libtool script from the same ++# release of libtool. ++func_check_version_match ()

• {

++ if test "$package_revision" != "$macro_revision"; then ++ if test "$VERSION" != "$macro_version"; then ++ if test -z "$macro_version"; then ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from an older release. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ fi ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, ++$progname: but the definition of this LT_INIT comes from revision $macro_revision. ++$progname: You should recreate aclocal.m4 with macros from revision $package_revision ++$progname: of $PACKAGE $VERSION and run autoconf again. ++_LT_EOF ++ fi

+- # Shorthand for --mode=foo, only valid as the first argument +- case $1 in +- clean|clea|cle|cl) +- shift; set dummy --mode clean ${1+"$@"}; shift +- ;; +- compile|compil|compi|comp|com|co|c) +- shift; set dummy --mode compile ${1+"$@"}; shift +- ;; +- execute|execut|execu|exec|exe|ex|e) +- shift; set dummy --mode execute ${1+"$@"}; shift +- ;; +- finish|finis|fini|fin|fi|f) +- shift; set dummy --mode finish ${1+"$@"}; shift +- ;; +- install|instal|insta|inst|ins|in|i) +- shift; set dummy --mode install ${1+"$@"}; shift +- ;; +- link|lin|li|l) +- shift; set dummy --mode link ${1+"$@"}; shift +- ;; +- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) +- shift; set dummy --mode uninstall ${1+"$@"}; shift +- ;; +- esac ++ exit $EXIT_MISMATCH ++ fi ++} ++ ++ ++# Shorthand for --mode=foo, only valid as the first argument ++case $1 in ++clean|clea|cle|cl) ++ shift; set dummy --mode clean ${1+"$@"}; shift ++ ;; ++compile|compil|compi|comp|com|co|c) ++ shift; set dummy --mode compile ${1+"$@"}; shift ++ ;; ++execute|execut|execu|exec|exe|ex|e) ++ shift; set dummy --mode execute ${1+"$@"}; shift ++ ;; ++finish|finis|fini|fin|fi|f) ++ shift; set dummy --mode finish ${1+"$@"}; shift ++ ;; ++install|instal|insta|inst|ins|in|i) ++ shift; set dummy --mode install ${1+"$@"}; shift ++ ;; ++link|lin|li|l) ++ shift; set dummy --mode link ${1+"$@"}; shift ++ ;; ++uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) ++ shift; set dummy --mode uninstall ${1+"$@"}; shift ++ ;; ++esac

+- # Parse non-mode specific arguments: +- while test "$#" -gt 0; do ++ ++ ++# Option defaults: ++opt_debug=: ++opt_dry_run=false ++opt_config=false ++opt_preserve_dup_deps=false ++opt_features=false ++opt_finish=false ++opt_help=false ++opt_help_all=false ++opt_silent=: ++opt_verbose=: ++opt_silent=false ++opt_verbose=false ++ ++ ++# Parse options once, thoroughly. This comes as soon as possible in the ++# script to make things like `--version' happen as quickly as we can. ++{ ++ # this just eases exit handling ++ while test $# -gt 0; do

• opt="$1"
  

• shift
  

+-

• case $opt in
  

+- --config) func_config ;; +- +- --debug) preserve_args="$preserve_args $opt" ++ --debug|-x) opt_debug='set -x'

• 	func_echo "enabling shell trace mode"
  

+- opt_debug='set -x'

• 	$opt_debug
  

• 	;;
  

+- +- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break +- execute_dlfiles="$execute_dlfiles $1" +- shift ++ --dry-run|--dryrun|-n) ++ opt_dry_run=:

• 	;;
  

+- +- --dry-run | -n) opt_dry_run=: ;; +- --features) func_features ;; +- --finish) mode="finish" ;; +- --no-finish) opt_finish=false ;; +- +- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break +- case $1 in +- # Valid mode arguments: +- clean) ;; +- compile) ;; +- execute) ;; +- finish) ;; +- install) ;; +- link) ;; +- relink) ;; +- uninstall) ;; +- +- # Catch anything else as an error +- *) func_error "invalid argument for $opt" +- exit_cmd=exit +- break +- ;; +- esac +- +- mode="$1" ++ --config) ++ opt_config=: ++func_config ++ ;; ++ --dlopen|-dlopen) ++ optarg="$1" ++ opt_dlopen="${opt_dlopen+$opt_dlopen ++}$optarg"

• 	shift
  

• 	;;
  

+-

•   --preserve-dup-deps)
  

+- opt_duplicate_deps=: ;; +- +- --quiet|--silent) preserve_args="$preserve_args $opt" +- opt_silent=: +- opt_verbose=false ++ opt_preserve_dup_deps=:

• 	;;
  

+- +- --no-quiet|--no-silent) +- preserve_args="$preserve_args $opt" +- opt_silent=false ++ --features) ++ opt_features=: ++func_features

• 	;;
  

+- +- --verbose| -v) preserve_args="$preserve_args $opt" ++ --finish) ++ opt_finish=: ++set dummy --mode finish ${1+"$@"}; shift ++ ;; ++ --help) ++ opt_help=: ++ ;; ++ --help-all) ++ opt_help_all=: ++opt_help=': help-all' ++ ;; ++ --mode) ++ test $# = 0 && func_missing_arg $opt && break ++ optarg="$1" ++ opt_mode="$optarg" ++case $optarg in ++ # Valid mode arguments: ++ clean|compile|execute|finish|install|link|relink|uninstall) ;; ++ ++ # Catch anything else as an error ++ *) func_error "invalid argument for $opt" ++ exit_cmd=exit ++ break ++ ;; ++esac ++ shift ++ ;; ++ --no-silent|--no-quiet)

• 	opt_silent=false
  

+- opt_verbose=: ++func_append preserve_args " $opt"

• 	;;
  

+- +- --no-verbose) preserve_args="$preserve_args $opt" ++ --no-verbose)

• 	opt_verbose=false
  

++func_append preserve_args " $opt"

• 	;;
  

+- +- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break +- preserve_args="$preserve_args $opt $1" +- func_enable_tag "$1" # tagname is set here ++ --silent|--quiet) ++ opt_silent=: ++func_append preserve_args " $opt" ++ opt_verbose=false ++ ;; ++ --verbose|-v) ++ opt_verbose=: ++func_append preserve_args " $opt" ++opt_silent=false ++ ;; ++ --tag) ++ test $# = 0 && func_missing_arg $opt && break ++ optarg="$1" ++ opt_tag="$optarg" ++func_append preserve_args " $opt $optarg" ++func_enable_tag "$optarg"

• 	shift
  

• 	;;
  

++ -?|-h) func_usage ;; ++ --help) func_help ;; ++ --version) func_version ;; ++

•   # Separate optargs to long options:
  

+- -dlopen=*|--mode=*|--tag=*) +- func_opt_split "$opt" +- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} ++ --*=*) ++ func_split_long_opt "$opt" ++ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}

• 	shift
  

• 	;;
  

+- -?|-h) func_usage ;; +- --help) opt_help=: ;; +- --help-all) opt_help=': help-all' ;; +- --version) func_version ;; +- +- -*) func_fatal_help "unrecognized option `$opt'" ;; +- +- *) nonopt="$opt" +- break ++ # Separate non-argument short options: ++ -?*|-h*|-n*|-v*) ++ func_split_short_opt "$opt" ++ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} ++ shift

• 	;;
  

++ ++ --) break ;; ++ -*) func_fatal_help "unrecognized option `$opt'" ;; ++ *) set dummy "$opt" ${1+"$@"}; shift; break ;;

• esac
  

• done

++ # Validate options: ++ ++ # save first non-option argument ++ if test "$#" -gt 0; then ++ nonopt="$opt" ++ shift ++ fi ++ ++ # preserve --debug ++ test "$opt_debug" = : || func_append preserve_args " --debug"

• case $host in

• *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* )
  

+@@ -981,82 +1184,44 @@ func_enable_tag ()

•   opt_duplicate_compiler_generated_deps=:
  

•   ;;
  

• *)
  

+- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps ++ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps

•   ;;
  

• esac

+- # Having warned about all mis-specified options, bail out if +- # anything was wrong. +- $exit_cmd $EXIT_FAILURE +-} ++ $opt_help || { ++ # Sanity checks first: ++ func_check_version_match

+-# func_check_version_match +-# Ensure that we are using m4 macros, and libtool script from the same +-# release of libtool. +-func_check_version_match () +-{ +- if test "$package_revision" != "$macro_revision"; then +- if test "$VERSION" != "$macro_version"; then +- if test -z "$macro_version"; then +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +-$progname: definition of this LT_INIT comes from an older release. +-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +-$progname: and run autoconf again. +-_LT_EOF +- else +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +-$progname: and run autoconf again. +-_LT_EOF +- fi +- else +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +-$progname: but the definition of this LT_INIT comes from revision $macro_revision. +-$progname: You should recreate aclocal.m4 with macros from revision $package_revision +-$progname: of $PACKAGE $VERSION and run autoconf again. +-_LT_EOF ++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then ++ func_fatal_configuration "not configured to build any kind of library"

• fi
  

+- exit $EXIT_MISMATCH +- fi +-} +- ++ # Darwin sucks ++ eval std_shrext="$shrext_cmds"

+-## ----------- ## +-## Main. ## +-## ----------- ## +- +-$opt_help || { +- # Sanity checks first: +- func_check_version_match +- +- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then +- func_fatal_configuration "not configured to build any kind of library" +- fi ++ # Only execute mode is allowed to have -dlopen flags. ++ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then ++ func_error "unrecognized option `-dlopen'" ++ $ECHO "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi

+- test -z "$mode" && func_fatal_error "error: you must specify a MODE." ++ # Change the help message to a mode-specific one. ++ generic_help="$help" ++ help="Try `$progname --help --mode=$opt_mode' for more information." ++ }

+- # Darwin sucks +- eval "std_shrext="$shrext_cmds"" ++ # Bail if the options were screwed ++ $exit_cmd $EXIT_FAILURE ++}

+- # Only execute mode is allowed to have -dlopen flags. +- if test -n "$execute_dlfiles" && test "$mode" != execute; then +- func_error "unrecognized option `-dlopen'" +- $ECHO "$help" 1>&2 +- exit $EXIT_FAILURE +- fi

+- # Change the help message to a mode-specific one. +- generic_help="$help" +- help="Try `$progname --help --mode=$mode' for more information." +-}

++## ----------- ## ++## Main. ## ++## ----------- ##

• # func_lalib_p file
• # True iff FILE is a libtool `.la' library or `.lo' object file.

+@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p ()

• # temporary ltwrapper_script.
• func_ltwrapper_scriptname ()
• {

+- func_ltwrapper_scriptname_result="" +- if func_ltwrapper_executable_p "$1"; then +- func_dirname_and_basename "$1" "" "." +- func_stripname '' '.exe' "$func_basename_result" +- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" +- fi ++ func_dirname_and_basename "$1" "" "." ++ func_stripname '' '.exe' "$func_basename_result" ++ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"

• }
• # func_ltwrapper_p file

+@@ -1149,7 +1311,7 @@ func_execute_cmds ()

• save_ifs=$IFS; IFS='~'
  

• for cmd in $1; do
  

•   IFS=$save_ifs
  

+- eval "cmd="$cmd"" ++ eval cmd="$cmd"

•   func_show_eval "$cmd" "${2-:}"
  

• done
  

• IFS=$save_ifs
  

+@@ -1172,6 +1334,37 @@ func_source ()

• }

++# func_resolve_sysroot PATH ++# Replace a leading = in PATH with a sysroot. Store the result into ++# func_resolve_sysroot_result ++func_resolve_sysroot () ++{ ++ func_resolve_sysroot_result=$1 ++ case $func_resolve_sysroot_result in ++ =*) ++ func_stripname '=' '' "$func_resolve_sysroot_result" ++ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result ++ ;; ++ esac ++} ++ ++# func_replace_sysroot PATH ++# If PATH begins with the sysroot, replace it with = and ++# store the result into func_replace_sysroot_result. ++func_replace_sysroot () ++{ ++ case "$lt_sysroot:$1" in ++ ?*:"$lt_sysroot"*) ++ func_stripname "$lt_sysroot" '' "$1" ++ func_replace_sysroot_result="=$func_stripname_result" ++ ;; ++ *) ++ # Including no sysroot. ++ func_replace_sysroot_result=$1 ++ ;; ++ esac ++} ++

• # func_infer_tag arg
• # Infer tagged configuration to use if any are available and
• # if one wasn't chosen via the "--tag" command line option.

+@@ -1184,8 +1377,7 @@ func_infer_tag ()

• if test -n "$available_tags" && test -z "$tagname"; then
  

•   CC_quoted=
  

•   for arg in $CC; do
  

+- func_quote_for_eval "$arg" +- CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ func_append_quoted CC_quoted "$arg"

•   done
  

•   CC_expanded=`func_echo_all $CC`
  

•   CC_quoted_expanded=`func_echo_all $CC_quoted`
  

+@@ -1204,8 +1396,7 @@ func_infer_tag ()

•    CC_quoted=
  

•    for arg in $CC; do
  

•      # Double-quote args containing other shell metacharacters.
  

+- func_quote_for_eval "$arg" +- CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ func_append_quoted CC_quoted "$arg"

•    done
  

•    CC_expanded=`func_echo_all $CC`
  

•    CC_quoted_expanded=`func_echo_all $CC_quoted`
  

+@@ -1274,6 +1465,486 @@ EOF

• }
  

• }

++ ++################################################## ++# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # ++################################################## ++ ++# func_convert_core_file_wine_to_w32 ARG ++# Helper function used by file name conversion functions when $build is *nix, ++# and $host is mingw, cygwin, or some other w32 environment. Relies on a ++# correctly configured wine environment available, with the winepath program ++# in $build's $PATH. ++# ++# ARG is the $build file name to be converted to w32 format. ++# Result is available in $func_convert_core_file_wine_to_w32_result, and will ++# be empty on error (or when ARG is empty) ++func_convert_core_file_wine_to_w32 () ++{ ++ $opt_debug ++ func_convert_core_file_wine_to_w32_result="$1" ++ if test -n "$1"; then ++ # Unfortunately, winepath does not exit with a non-zero error code, so we ++ # are forced to check the contents of stdout. On the other hand, if the ++ # command is not found, the shell will set an exit code of 127 and print ++ # *an error message* to stdout. So we must check for both error code of ++ # zero AND non-empty stdout, which explains the odd construction: ++ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` ++ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then ++ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | ++ $SED -e "$lt_sed_naive_backslashify"` ++ else ++ func_convert_core_file_wine_to_w32_result= ++ fi ++ fi ++} ++# end: func_convert_core_file_wine_to_w32 ++ ++ ++# func_convert_core_path_wine_to_w32 ARG ++# Helper function used by path conversion functions when $build is *nix, and ++# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly ++# configured wine environment available, with the winepath program in $build's ++# $PATH. Assumes ARG has no leading or trailing path separator characters. ++# ++# ARG is path to be converted from $build format to win32. ++# Result is available in $func_convert_core_path_wine_to_w32_result. ++# Unconvertible file (directory) names in ARG are skipped; if no directory names ++# are convertible, then the result may be empty. ++func_convert_core_path_wine_to_w32 () ++{ ++ $opt_debug ++ # unfortunately, winepath doesn't convert paths, only file names ++ func_convert_core_path_wine_to_w32_result="" ++ if test -n "$1"; then ++ oldIFS=$IFS ++ IFS=: ++ for func_convert_core_path_wine_to_w32_f in $1; do ++ IFS=$oldIFS ++ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" ++ if test -n "$func_convert_core_file_wine_to_w32_result" ; then ++ if test -z "$func_convert_core_path_wine_to_w32_result"; then ++ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" ++ else ++ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" ++ fi ++ fi ++ done ++ IFS=$oldIFS ++ fi ++} ++# end: func_convert_core_path_wine_to_w32 ++ ++ ++# func_cygpath ARGS... ++# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when ++# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) ++# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or ++# (2), returns the Cygwin file name or path in func_cygpath_result (input ++# file name or path is assumed to be in w32 format, as previously converted ++# from $build's *nix or MSYS format). In case (3), returns the w32 file name ++# or path in func_cygpath_result (input file name or path is assumed to be in ++# Cygwin format). Returns an empty string on error. ++# ++# ARGS are passed to cygpath, with the last one being the file name or path to ++# be converted. ++# ++# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH ++# environment variable; do not put it in $PATH. ++func_cygpath () ++{ ++ $opt_debug ++ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then ++ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` ++ if test "$?" -ne 0; then ++ # on failure, ensure result is empty ++ func_cygpath_result= ++ fi ++ else ++ func_cygpath_result= ++ func_error "LT_CYGPATH is empty or specifies non-existent file: `$LT_CYGPATH'" ++ fi ++} ++#end: func_cygpath ++ ++ ++# func_convert_core_msys_to_w32 ARG ++# Convert file name or path ARG from MSYS format to w32 format. Return ++# result in func_convert_core_msys_to_w32_result. ++func_convert_core_msys_to_w32 () ++{ ++ $opt_debug ++ # awkward: cmd appends spaces to result ++ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | ++ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` ++} ++#end: func_convert_core_msys_to_w32 ++ ++ ++# func_convert_file_check ARG1 ARG2 ++# Verify that ARG1 (a file name in $build format) was converted to $host ++# format in ARG2. Otherwise, emit an error message, but continue (resetting ++# func_to_host_file_result to ARG1). ++func_convert_file_check () ++{ ++ $opt_debug ++ if test -z "$2" && test -n "$1" ; then ++ func_error "Could not determine host file name corresponding to" ++ func_error " `$1'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback: ++ func_to_host_file_result="$1" ++ fi ++} ++# end func_convert_file_check ++ ++ ++# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH ++# Verify that FROM_PATH (a path in $build format) was converted to $host ++# format in TO_PATH. Otherwise, emit an error message, but continue, resetting ++# func_to_host_file_result to a simplistic fallback value (see below). ++func_convert_path_check () ++{ ++ $opt_debug ++ if test -z "$4" && test -n "$3"; then ++ func_error "Could not determine the host path corresponding to" ++ func_error " `$3'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback. This is a deliberately simplistic "conversion" and ++ # should not be "improved". See libtool.info. ++ if test "x$1" != "x$2"; then ++ lt_replace_pathsep_chars="s|$1|$2|g" ++ func_to_host_path_result=`echo "$3" | ++ $SED -e "$lt_replace_pathsep_chars"` ++ else ++ func_to_host_path_result="$3" ++ fi ++ fi ++} ++# end func_convert_path_check ++ ++ ++# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG ++# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT ++# and appending REPL if ORIG matches BACKPAT. ++func_convert_path_front_back_pathsep () ++{ ++ $opt_debug ++ case $4 in ++ $1 ) func_to_host_path_result="$3$func_to_host_path_result" ++ ;; ++ esac ++ case $4 in ++ $2 ) func_append func_to_host_path_result "$3" ++ ;; ++ esac ++} ++# end func_convert_path_front_back_pathsep ++ ++ ++################################################## ++# $build to $host FILE NAME CONVERSION FUNCTIONS # ++################################################## ++# invoked via `$to_host_file_cmd ARG' ++# ++# In each case, ARG is the path to be converted from $build to $host format. ++# Result will be available in $func_to_host_file_result. ++ ++ ++# func_to_host_file ARG ++# Converts the file name ARG from $build format to $host format. Return result ++# in func_to_host_file_result. ++func_to_host_file () ++{ ++ $opt_debug ++ $to_host_file_cmd "$1" ++} ++# end func_to_host_file ++ ++ ++# func_to_tool_file ARG LAZY ++# converts the file name ARG from $build format to toolchain format. Return ++# result in func_to_tool_file_result. If the conversion in use is listed ++# in (the comma separated) LAZY, no conversion takes place. ++func_to_tool_file () ++{ ++ $opt_debug ++ case ,$2, in ++ *,"$to_tool_file_cmd",*) ++ func_to_tool_file_result=$1 ++ ;; ++ *) ++ $to_tool_file_cmd "$1" ++ func_to_tool_file_result=$func_to_host_file_result ++ ;; ++ esac ++} ++# end func_to_tool_file ++ ++ ++# func_convert_file_noop ARG ++# Copy ARG to func_to_host_file_result. ++func_convert_file_noop () ++{ ++ func_to_host_file_result="$1" ++} ++# end func_convert_file_noop ++ ++ ++# func_convert_file_msys_to_w32 ARG ++# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic ++# conversion to w32 is not available inside the cwrapper. Returns result in ++# func_to_host_file_result. ++func_convert_file_msys_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_msys_to_w32 "$1" ++ func_to_host_file_result="$func_convert_core_msys_to_w32_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_msys_to_w32 ++ ++ ++# func_convert_file_cygwin_to_w32 ARG ++# Convert file name ARG from Cygwin to w32 format. Returns result in ++# func_to_host_file_result. ++func_convert_file_cygwin_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use ++ # LT_CYGPATH in this case. ++ func_to_host_file_result=`cygpath -m "$1"` ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_cygwin_to_w32 ++ ++ ++# func_convert_file_nix_to_w32 ARG ++# Convert file name ARG from *nix to w32 format. Requires a wine environment ++# and a working winepath. Returns result in func_to_host_file_result. ++func_convert_file_nix_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_file_wine_to_w32 "$1" ++ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_nix_to_w32 ++ ++ ++# func_convert_file_msys_to_cygwin ARG ++# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. ++# Returns result in func_to_host_file_result. ++func_convert_file_msys_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_msys_to_w32 "$1" ++ func_cygpath -u "$func_convert_core_msys_to_w32_result" ++ func_to_host_file_result="$func_cygpath_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_msys_to_cygwin ++ ++ ++# func_convert_file_nix_to_cygwin ARG ++# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed ++# in a wine environment, working winepath, and LT_CYGPATH set. Returns result ++# in func_to_host_file_result. ++func_convert_file_nix_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. ++ func_convert_core_file_wine_to_w32 "$1" ++ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" ++ func_to_host_file_result="$func_cygpath_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_nix_to_cygwin ++ ++ ++############################################# ++# $build to $host PATH CONVERSION FUNCTIONS # ++############################################# ++# invoked via `$to_host_path_cmd ARG' ++# ++# In each case, ARG is the path to be converted from $build to $host format. ++# The result will be available in $func_to_host_path_result. ++# ++# Path separators are also converted from $build format to $host format. If ++# ARG begins or ends with a path separator character, it is preserved (but ++# converted to $host format) on output. ++# ++# All path conversion functions are named using the following convention: ++# file name conversion function : func_convert_file_X_to_Y () ++# path conversion function : func_convert_path_X_to_Y () ++# where, for any given $build/$host combination the 'X_to_Y' value is the ++# same. If conversion functions are added for new $build/$host combinations, ++# the two new functions must follow this pattern, or func_init_to_host_path_cmd ++# will break. ++ ++ ++# func_init_to_host_path_cmd ++# Ensures that function "pointer" variable $to_host_path_cmd is set to the ++# appropriate value, based on the value of $to_host_file_cmd. ++to_host_path_cmd= ++func_init_to_host_path_cmd () ++{ ++ $opt_debug ++ if test -z "$to_host_path_cmd"; then ++ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" ++ to_host_path_cmd="func_convert_path_${func_stripname_result}" ++ fi ++} ++ ++ ++# func_to_host_path ARG ++# Converts the path ARG from $build format to $host format. Return result ++# in func_to_host_path_result. ++func_to_host_path () ++{ ++ $opt_debug ++ func_init_to_host_path_cmd ++ $to_host_path_cmd "$1" ++} ++# end func_to_host_path ++ ++ ++# func_convert_path_noop ARG ++# Copy ARG to func_to_host_path_result. ++func_convert_path_noop () ++{ ++ func_to_host_path_result="$1" ++} ++# end func_convert_path_noop ++ ++ ++# func_convert_path_msys_to_w32 ARG ++# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic ++# conversion to w32 is not available inside the cwrapper. Returns result in ++# func_to_host_path_result. ++func_convert_path_msys_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # Remove leading and trailing path separator characters from ARG. MSYS ++ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; ++ # and winepath ignores them completely. ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" ++ func_to_host_path_result="$func_convert_core_msys_to_w32_result" ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_msys_to_w32 ++ ++ ++# func_convert_path_cygwin_to_w32 ARG ++# Convert path ARG from Cygwin to w32 format. Returns result in ++# func_to_host_file_result. ++func_convert_path_cygwin_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_cygwin_to_w32 ++ ++ ++# func_convert_path_nix_to_w32 ARG ++# Convert path ARG from *nix to w32 format. Requires a wine environment and ++# a working winepath. Returns result in func_to_host_file_result. ++func_convert_path_nix_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" ++ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_nix_to_w32 ++ ++ ++# func_convert_path_msys_to_cygwin ARG ++# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. ++# Returns result in func_to_host_file_result. ++func_convert_path_msys_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" ++ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" ++ func_to_host_path_result="$func_cygpath_result" ++ func_convert_path_check : : \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" : "$1" ++ fi ++} ++# end func_convert_path_msys_to_cygwin ++ ++ ++# func_convert_path_nix_to_cygwin ARG ++# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a ++# a wine environment, working winepath, and LT_CYGPATH set. Returns result in ++# func_to_host_file_result. ++func_convert_path_nix_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # Remove leading and trailing path separator characters from ++ # ARG. msys behavior is inconsistent here, cygpath turns them ++ # into '.;' and ';.', and winepath ignores them completely. ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" ++ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" ++ func_to_host_path_result="$func_cygpath_result" ++ func_convert_path_check : : \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" : "$1" ++ fi ++} ++# end func_convert_path_nix_to_cygwin ++ ++

• # func_mode_compile arg...
• func_mode_compile ()
• {

+@@ -1314,12 +1985,12 @@ func_mode_compile ()

•  ;;
  

• -pie | -fpie | -fPIE)

+- pie_flag="$pie_flag $arg" ++ func_append pie_flag " $arg"

•  continue
  

•  ;;
  

• -shared | -static | -prefer-pic | -prefer-non-pic)

+- later="$later $arg" ++ func_append later " $arg"

•  continue
  

•  ;;
  

+@@ -1340,15 +2011,14 @@ func_mode_compile ()

•  save_ifs="$IFS"; IFS=','
  

•  for arg in $args; do
  

•    IFS="$save_ifs"
  

+- func_quote_for_eval "$arg" +- lastarg="$lastarg $func_quote_for_eval_result" ++ func_append_quoted lastarg "$arg"

•  done
  

•  IFS="$save_ifs"
  

•  func_stripname ' ' '' "$lastarg"
  

•  lastarg=$func_stripname_result
  

•  # Add the arguments to base_compile.
  

+- base_compile="$base_compile $lastarg" ++ func_append base_compile " $lastarg"

•  continue
  

•  ;;
  

+@@ -1364,8 +2034,7 @@ func_mode_compile ()

•   esac    #  case $arg_mode
  

•   # Aesthetically quote the previous argument.
  

+- func_quote_for_eval "$lastarg" +- base_compile="$base_compile $func_quote_for_eval_result" ++ func_append_quoted base_compile "$lastarg"

• done # for arg
  

• case $arg_mode in
  

+@@ -1496,17 +2165,16 @@ compiler."

• $opt_dry_run || $RM $removelist
• exit $EXIT_FAILURE

•   fi
  

+- removelist="$removelist $output_obj" ++ func_append removelist " $output_obj"

•   $ECHO "$srcfile" > "$lockfile"
  

• fi
  

• $opt_dry_run || $RM $removelist
  

+- removelist="$removelist $lockfile" ++ func_append removelist " $lockfile"

• trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
  

+- if test -n "$fix_srcfile_path"; then +- eval "srcfile="$fix_srcfile_path"" +- fi ++ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 ++ srcfile=$func_to_tool_file_result

• func_quote_for_eval "$srcfile"
  

• qsrcfile=$func_quote_for_eval_result
  

+@@ -1526,7 +2194,7 @@ compiler."

•   if test -z "$output_obj"; then
  

• # Place PIC objects in $objdir

+- command="$command -o $lobj" ++ func_append command " -o $lobj"

•   fi
  

•   func_show_eval_locale "$command"	\
  

+@@ -1573,11 +2241,11 @@ compiler."

• command="$base_compile $qsrcfile $pic_flag"

•   fi
  

•   if test "$compiler_c_o" = yes; then
  

+- command="$command -o $obj" ++ func_append command " -o $obj"

•   fi
  

•   # Suppress compiler output if we already did a PIC compilation.
  

+- command="$command$suppress_output" ++ func_append command "$suppress_output"

•   func_show_eval_locale "$command" \
  

•     '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
  

+@@ -1622,13 +2290,13 @@ compiler."

• }
• $opt_help || {

+- test "$mode" = compile && func_mode_compile ${1+"$@"} ++ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}

• }
• func_mode_help ()
• {

• # We need to display help for each of the modes.
  

+- case $mode in ++ case $opt_mode in

•   "")
  

•     # Generic help is extracted from the usage comments
  

•     # at the start of this file.
  

+@@ -1659,8 +2327,8 @@ This mode accepts the following additional options:

• -o OUTPUT-FILE set the output file name to OUTPUT-FILE
• -no-suppress do not suppress compiler output for multiple passes

+- -prefer-pic try to building PIC objects only +- -prefer-non-pic try to building non-PIC objects only ++ -prefer-pic try to build PIC objects only ++ -prefer-non-pic try to build non-PIC objects only

• -shared do not build a `.o' file suitable for static linking
• -static only build a `.o' file suitable for static linking
• -Wc,FLAG pass FLAG directly to the compiler

+@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM."

•     ;;
  

•   *)
  

+- func_fatal_help "invalid operation mode `$mode'" ++ func_fatal_help "invalid operation mode `$opt_mode'"

•     ;;
  

• esac
  

+@@ -1819,13 +2487,13 @@ if $opt_help; then

• else

• {
  

•   func_help noexit
  

+- for mode in compile link execute install finish uninstall clean; do ++ for opt_mode in compile link execute install finish uninstall clean; do

• func_mode_help

•   done
  

• } | sed -n '1p; 2,$s/^Usage:/  or: /p'
  

• {
  

•   func_help noexit
  

+- for mode in compile link execute install finish uninstall clean; do ++ for opt_mode in compile link execute install finish uninstall clean; do

• echo
• func_mode_help

•   done
  

+@@ -1854,13 +2522,16 @@ func_mode_execute ()

•   func_fatal_help "you must specify a COMMAND"
  

• # Handle -dlopen flags immediately.
  

+- for file in $execute_dlfiles; do ++ for file in $opt_dlopen; do

•   test -f "$file" \
  

• || func_fatal_help "`$file' is not a file"

•   dir=
  

•   case $file in
  

•   *.la)
  

++ func_resolve_sysroot "$file" ++ file=$func_resolve_sysroot_result ++

• # Check to see that this really is a libtool archive.
• func_lalib_unsafe_p "$file" \

•  || func_fatal_help "\`$lib' is not a valid libtool archive"
  

+@@ -1882,7 +2553,7 @@ func_mode_execute ()

• dir="$func_dirname_result"
• if test -f "$dir/$objdir/$dlname"; then

+- dir="$dir/$objdir" ++ func_append dir "/$objdir"

• else

•  if test ! -f "$dir/$dlname"; then
  

•    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
  

+@@ -1907,10 +2578,10 @@ func_mode_execute ()

•   test -n "$absdir" && dir="$absdir"
  

•   # Now add the directory to shlibpath_var.
  

+- if eval test -z "$$shlibpath_var"; then +- eval $shlibpath_var=$dir ++ if eval "test -z "$$shlibpath_var""; then ++ eval "$shlibpath_var="$dir""

•   else
  

+- eval $shlibpath_var=$dir:$$shlibpath_var ++ eval "$shlibpath_var="$dir:$$shlibpath_var""

•   fi
  

• done
  

+@@ -1939,8 +2610,7 @@ func_mode_execute ()

• ;;

•   esac
  

•   # Quote arguments (to preserve shell metacharacters).
  

+- func_quote_for_eval "$file" +- args="$args $func_quote_for_eval_result" ++ func_append_quoted args "$file"

• done
  

• if test "X$opt_dry_run" = Xfalse; then
  

+@@ -1972,22 +2642,59 @@ func_mode_execute ()

• fi
  

• }

+-test "$mode" = execute && func_mode_execute ${1+"$@"} ++test "$opt_mode" = execute && func_mode_execute ${1+"$@"}

• # func_mode_finish arg...
• func_mode_finish ()
• {

• $opt_debug
  

+- libdirs="$nonopt" ++ libs= ++ libdirs=

• admincmds=
  

+- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then +- for dir +- do +- libdirs="$libdirs $dir" +- done ++ for opt in "$nonopt" ${1+"$@"} ++ do ++ if test -d "$opt"; then ++ func_append libdirs " $opt"

++ elif test -f "$opt"; then ++ if func_lalib_unsafe_p "$opt"; then ++ func_append libs " $opt" ++ else ++ func_warning "`$opt' is not a valid libtool archive" ++ fi ++ ++ else ++ func_fatal_error "invalid argument `$opt'" ++ fi ++ done ++ ++ if test -n "$libs"; then ++ if test -n "$lt_sysroot"; then ++ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` ++ sysroot_cmd="s/([ '])$sysroot_regex/\1/g;" ++ else ++ sysroot_cmd= ++ fi ++ ++ # Remove sysroot references ++ if $opt_dry_run; then ++ for lib in $libs; do ++ echo "removing references to $lt_sysroot and `=' prefixes from $lib" ++ done ++ else ++ tmpdir=`func_mktempdir` ++ for lib in $libs; do ++ sed -e "${sysroot_cmd} s/([ ']-[LR])=/\1/g; s/([ '])=/\1/g" $lib \ ++ > $tmpdir/tmp-la ++ mv -f $tmpdir/tmp-la $lib ++ done ++ ${RM}r "$tmpdir" ++ fi ++ fi ++ ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then

•   for libdir in $libdirs; do
  

• if test -n "$finish_cmds"; then

•  # Do each command in the finish commands.
  

+@@ -1997,7 +2704,7 @@ func_mode_finish ()

• if test -n "$finish_eval"; then

•  # Do the single finish_eval.
  

•  eval cmds=\"$finish_eval\"
  

+- $opt_dry_run || eval "$cmds" || admincmds="$admincmds ++ $opt_dry_run || eval "$cmds" || func_append admincmds "

•    $cmds"
  

• fi

•   done
  

+@@ -2006,53 +2713,55 @@ func_mode_finish ()

• # Exit here if they wanted silent mode.
  

• $opt_silent && exit $EXIT_SUCCESS
  

+- echo "----------------------------------------------------------------------" +- echo "Libraries have been installed in:" +- for libdir in $libdirs; do +- $ECHO " $libdir" +- done +- echo +- echo "If you ever happen to want to link against installed libraries" +- echo "in a given directory, LIBDIR, you must either use libtool, and" +- echo "specify the full pathname of the library, or use the `-LLIBDIR'" +- echo "flag during linking and do at least one of the following:" +- if test -n "$shlibpath_var"; then +- echo " - add LIBDIR to the `$shlibpath_var' environment variable" +- echo " during execution" +- fi +- if test -n "$runpath_var"; then +- echo " - add LIBDIR to the `$runpath_var' environment variable" +- echo " during linking" +- fi +- if test -n "$hardcode_libdir_flag_spec"; then +- libdir=LIBDIR +- eval "flag="$hardcode_libdir_flag_spec"" ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then ++ echo "----------------------------------------------------------------------" ++ echo "Libraries have been installed in:" ++ for libdir in $libdirs; do ++ $ECHO " $libdir" ++ done ++ echo ++ echo "If you ever happen to want to link against installed libraries" ++ echo "in a given directory, LIBDIR, you must either use libtool, and" ++ echo "specify the full pathname of the library, or use the `-LLIBDIR'" ++ echo "flag during linking and do at least one of the following:" ++ if test -n "$shlibpath_var"; then ++ echo " - add LIBDIR to the `$shlibpath_var' environment variable" ++ echo " during execution" ++ fi ++ if test -n "$runpath_var"; then ++ echo " - add LIBDIR to the `$runpath_var' environment variable" ++ echo " during linking" ++ fi ++ if test -n "$hardcode_libdir_flag_spec"; then ++ libdir=LIBDIR ++ eval flag="$hardcode_libdir_flag_spec"

+- $ECHO " - use the `$flag' linker flag" +- fi +- if test -n "$admincmds"; then +- $ECHO " - have your system administrator run these commands:$admincmds" +- fi +- if test -f /etc/ld.so.conf; then +- echo " - have your system administrator add LIBDIR to `/etc/ld.so.conf'" +- fi +- echo ++ $ECHO " - use the `$flag' linker flag" ++ fi ++ if test -n "$admincmds"; then ++ $ECHO " - have your system administrator run these commands:$admincmds" ++ fi ++ if test -f /etc/ld.so.conf; then ++ echo " - have your system administrator add LIBDIR to `/etc/ld.so.conf'" ++ fi ++ echo

+- echo "See any operating system documentation about shared libraries for" +- case $host in +- solaris2.[6789]|solaris2.1[0-9]) +- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" +- echo "pages." +- ;; +- *) +- echo "more information, such as the ld(1) and ld.so(8) manual pages." +- ;; +- esac +- echo "----------------------------------------------------------------------" ++ echo "See any operating system documentation about shared libraries for" ++ case $host in ++ solaris2.[6789]|solaris2.1[0-9]) ++ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" ++ echo "pages." ++ ;; ++ *) ++ echo "more information, such as the ld(1) and ld.so(8) manual pages." ++ ;; ++ esac ++ echo "----------------------------------------------------------------------" ++ fi

• exit $EXIT_SUCCESS
  

• }

+-test "$mode" = finish && func_mode_finish ${1+"$@"} ++test "$opt_mode" = finish && func_mode_finish ${1+"$@"}

• # func_mode_install arg...

+@@ -2077,7 +2786,7 @@ func_mode_install ()

• # The real first argument should be the name of the installation program.
  

• # Aesthetically quote it.
  

• func_quote_for_eval "$arg"
  

+- install_prog="$install_prog$func_quote_for_eval_result" ++ func_append install_prog "$func_quote_for_eval_result"

• install_shared_prog=$install_prog
  

• case " $install_prog " in
  

•   *[\\\ /]cp\ *) install_cp=: ;;
  

+@@ -2097,7 +2806,7 @@ func_mode_install ()

• do
  

•   arg2=
  

•   if test -n "$dest"; then
  

+- files="$files $dest" ++ func_append files " $dest"

• dest=$arg
• continue

•   fi
  

+@@ -2135,11 +2844,11 @@ func_mode_install ()

•   # Aesthetically quote the argument.
  

•   func_quote_for_eval "$arg"
  

+- install_prog="$install_prog $func_quote_for_eval_result" ++ func_append install_prog " $func_quote_for_eval_result"

•   if test -n "$arg2"; then
  

• func_quote_for_eval "$arg2"

•   fi
  

+- install_shared_prog="$install_shared_prog $func_quote_for_eval_result" ++ func_append install_shared_prog " $func_quote_for_eval_result"

• done
  

• test -z "$install_prog" && \
  

+@@ -2151,7 +2860,7 @@ func_mode_install ()

• if test -n "$install_override_mode" && $no_mode; then
  

•   if $install_cp; then :; else
  

• func_quote_for_eval "$install_override_mode"

+- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" ++ func_append install_shared_prog " -m $func_quote_for_eval_result"

•   fi
  

• fi
  

+@@ -2209,10 +2918,13 @@ func_mode_install ()

•   case $file in
  

•   *.$libext)
  

• # Do the static libraries later.

+- staticlibs="$staticlibs $file" ++ func_append staticlibs " $file"

• ;;

•   *.la)
  

++ func_resolve_sysroot "$file" ++ file=$func_resolve_sysroot_result ++

• # Check to see that this really is a libtool archive.
• func_lalib_unsafe_p "$file" \

•  || func_fatal_help "\`$file' is not a valid libtool archive"
  

+@@ -2226,23 +2938,30 @@ func_mode_install ()

• if test "X$destdir" = "X$libdir"; then

•  case "$current_libdirs " in
  

•  *" $libdir "*) ;;
  

+- *) current_libdirs="$current_libdirs $libdir" ;; ++ *) func_append current_libdirs " $libdir" ;;

•  esac
  

• else

•  # Note the libdir as a future libdir.
  

•  case "$future_libdirs " in
  

•  *" $libdir "*) ;;
  

+- *) future_libdirs="$future_libdirs $libdir" ;; ++ *) func_append future_libdirs " $libdir" ;;

•  esac
  

• fi
• func_dirname "$file" "/" ""
• dir="$func_dirname_result"

+- dir="$dir$objdir" ++ func_append dir "$objdir"

• if test -n "$relink_command"; then

++ # Strip any trailing slash from the destination. ++ func_stripname '' '/' "$libdir" ++ destlibdir=$func_stripname_result ++ ++ func_stripname '' '/' "$destdir" ++ s_destdir=$func_stripname_result ++

•  # Determine the prefix the user has applied to our future dir.
  

+- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir$%%"` ++ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir$%%"`

•  # Don't allow the user to place us outside of our expected
  

•  # location b/c this prevents finding dependent libraries that
  

+@@ -2315,7 +3034,7 @@ func_mode_install ()

• func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
• # Maybe install the static library, too.

+- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ++ test -n "$old_library" && func_append staticlibs " $dir/$old_library"

• ;;

•   *.lo)
  

+@@ -2503,7 +3222,7 @@ func_mode_install ()

• test -n "$future_libdirs" && \
  

•   func_warning "remember to run \`$progname --finish$future_libdirs'"
  

+- if test -n "$current_libdirs" && $opt_finish; then ++ if test -n "$current_libdirs"; then

•   # Maybe just do a dry run.
  

•   $opt_dry_run && current_libdirs=" -n$current_libdirs"
  

•   exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
  

+@@ -2512,7 +3231,7 @@ func_mode_install ()

• fi
  

• }

+-test "$mode" = install && func_mode_install ${1+"$@"} ++test "$opt_mode" = install && func_mode_install ${1+"$@"}

• # func_generate_dlsyms outputname originator pic_p

+@@ -2559,6 +3278,18 @@ extern "C" {

• #pragma GCC diagnostic ignored "-Wstrict-prototypes"
• #endif

++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++

• /* External symbol declarations for the compiler. */\
• "

+@@ -2570,21 +3301,22 @@ extern "C" {

•  # Add our own program objects to the symbol list.
  

•  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
  

•  for progfile in $progfiles; do
  

+- func_verbose "extracting global C symbols from `$progfile'" +- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" ++ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 ++ func_verbose "extracting global C symbols from `$func_to_tool_file_result'" ++ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"

•  done
  

•  if test -n "$exclude_expsyms"; then
  

•    $opt_dry_run || {
  

+- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"'

•    }
  

•  fi
  

•  if test -n "$export_symbols_regex"; then
  

•    $opt_dry_run || {
  

+- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"'

•    }
  

•  fi
  

+@@ -2593,23 +3325,23 @@ extern "C" {

•    export_symbols="$output_objdir/$outputname.exp"
  

•    $opt_dry_run || {
  

•      $RM $export_symbols
  

+- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* (.*)$/\1/p' < "$nlist" > "$export_symbols" ++ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* (.*)$/\1/p' "'< "$nlist" > "$export_symbols"'

•      case $host in
  

•      *cygwin* | *mingw* | *cegcc* )
  

+- echo EXPORTS > "$output_objdir/$outputname.def" +- cat "$export_symbols" >> "$output_objdir/$outputname.def" ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'

•        ;;
  

•      esac
  

•    }
  

•  else
  

•    $opt_dry_run || {
  

+- ${SED} -e 's/([].[*^$])/\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" +- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval "${SED} -e 's/([].[*^$])/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' ++ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"'

•      case $host in
  

•        *cygwin* | *mingw* | *cegcc* )
  

+- echo EXPORTS > "$output_objdir/$outputname.def" +- cat "$nlist" >> "$output_objdir/$outputname.def" ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'

•          ;;
  

•      esac
  

•    }
  

+@@ -2620,10 +3352,52 @@ extern "C" {

•  func_verbose "extracting global C symbols from \`$dlprefile'"
  

•  func_basename "$dlprefile"
  

•  name="$func_basename_result"
  

+- $opt_dry_run || { +- $ECHO ": $name " >> "$nlist" +- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" +- } ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ # if an import library, we need to obtain dlname ++ if func_win32_import_lib_p "$dlprefile"; then ++ func_tr_sh "$dlprefile" ++ eval "curr_lafile=$libfile_$func_tr_sh_result" ++ dlprefile_dlbasename="" ++ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then ++ # Use subshell, to avoid clobbering current variable values ++ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` ++ if test -n "$dlprefile_dlname" ; then ++ func_basename "$dlprefile_dlname" ++ dlprefile_dlbasename="$func_basename_result" ++ else ++ # no lafile. user explicitly requested -dlpreopen <import library>. ++ $sharedlib_from_linklib_cmd "$dlprefile" ++ dlprefile_dlbasename=$sharedlib_from_linklib_result ++ fi ++ fi ++ $opt_dry_run || { ++ if test -n "$dlprefile_dlbasename" ; then ++ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' ++ else ++ func_warning "Could not compute DLL name from $name" ++ eval '$ECHO ": $name " >> "$nlist"' ++ fi ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM "$func_to_tool_file_result" 2>/dev/null | $global_symbol_pipe | ++ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" ++ } ++ else # not an import lib ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM "$func_to_tool_file_result" 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ fi ++ ;; ++ *) ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM "$func_to_tool_file_result" 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ ;; ++ esac

• done
• $opt_dry_run || {

+@@ -2661,26 +3435,9 @@ typedef struct {

• const char *name;
• void *address;
• } lt_dlsymlist;

+-" +- case $host in +- *cygwin* | *mingw* | *cegcc* ) +- echo >> "$output_objdir/$my_dlsyms" "\ +-/* DATA imports from DLLs on WIN32 con't be const, because +- runtime relocations are performed -- see ld's documentation +- on pseudo-relocs. */" +- lt_dlsym_const= ;; +- *osf5*) +- echo >> "$output_objdir/$my_dlsyms" "\ +-/* This system does not cope well with relocations in const data */" +- lt_dlsym_const= ;; +- *) +- lt_dlsym_const=const ;; +- esac +- +- echo >> "$output_objdir/$my_dlsyms" "\ +-extern $lt_dlsym_const lt_dlsymlist ++extern LT_DLSYM_CONST lt_dlsymlist

• lt_${my_prefix}_LTX_preloaded_symbols[];

+-$lt_dlsym_const lt_dlsymlist ++LT_DLSYM_CONST lt_dlsymlist

• lt_${my_prefix}_LTX_preloaded_symbols[] =
• {\
• { "$my_originator", (void *) 0 },"

+@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() {

• for arg in $LTCFLAGS; do

•  case $arg in
  

•  -pie | -fpie | -fPIE) ;;
  

+- *) symtab_cflags="$symtab_cflags $arg" ;; ++ *) func_append symtab_cflags " $arg" ;;

•  esac
  

• done

+@@ -2796,9 +3553,11 @@ func_win32_libid ()

• win32_libid_type="x86 archive import"
  

• ;;
  

• *ar\ archive*) # could be an import, or static

+- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | +- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then +- win32_nmres=`$NM -f posix -A "$1" | ++ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. ++ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | ++ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ win32_nmres=`eval $NM -f posix -A "$func_to_tool_file_result" |

• $SED -n -e '

•    1,100{
  

• / I /{
  

+@@ -2827,6 +3586,131 @@ func_win32_libid ()

• $ECHO "$win32_libid_type"
• }

++# func_cygming_dll_for_implib ARG ++# ++# Platform-specific function to extract the ++# name of the DLL associated with the specified ++# import library ARG. ++# Invoked by eval'ing the libtool variable ++# $sharedlib_from_linklib_cmd ++# Result is available in the variable ++# $sharedlib_from_linklib_result ++func_cygming_dll_for_implib () ++{ ++ $opt_debug ++ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` ++} ++ ++# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs ++# ++# The is the core of a fallback implementation of a ++# platform-specific function to extract the name of the ++# DLL associated with the specified import library LIBNAME. ++# ++# SECTION_NAME is either .idata$6 or .idata$7, depending ++# on the platform and compiler that created the implib. ++# ++# Echos the name of the DLL associated with the ++# specified import library. ++func_cygming_dll_for_implib_fallback_core () ++{ ++ $opt_debug ++ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` ++ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | ++ $SED '/^Contents of section '"$match_literal"':/{ ++ # Place marker at beginning of archive member dllname section ++ s/.*/====MARK====/ ++ p ++ d ++ } ++ # These lines can sometimes be longer than 43 characters, but ++ # are always uninteresting ++ /:[ ]*file format pe[i]{,1}-/d ++ /^In archive [^:]*:/d ++ # Ensure marker is printed ++ /^====MARK====/p ++ # Remove all lines with less than 43 characters ++ /^.{43}/!d ++ # From remaining lines, remove first 43 characters ++ s/^.{43}//' | ++ $SED -n ' ++ # Join marker and all lines until next marker into a single line ++ /^====MARK====/ b para ++ H ++ $ b para ++ b ++ :para ++ x ++ s/\n//g ++ # Remove the marker ++ s/^====MARK====// ++ # Remove trailing dots and whitespace ++ s/[. \t]*$// ++ # Print ++ /./p' | ++ # we now have a list, one entry per line, of the stringified ++ # contents of the appropriate section of all members of the ++ # archive which possess that section. Heuristic: eliminate ++ # all those which have a first or second character that is ++ # a '.' (that is, objdump's representation of an unprintable ++ # character.) This should work for all archives with less than ++ # 0x302f exports -- but will fail for DLLs whose name actually ++ # begins with a literal '.' or a single character followed by ++ # a '.'. ++ # ++ # Of those that remain, print the first one. ++ $SED -e '/^./d;/^../d;q' ++} ++ ++# func_cygming_gnu_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is a GNU/binutils-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_gnu_implib_p () ++{ ++ $opt_debug ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ 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)$'` ++ test -n "$func_cygming_gnu_implib_tmp" ++} ++ ++# func_cygming_ms_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is an MS-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_ms_implib_p () ++{ ++ $opt_debug ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` ++ test -n "$func_cygming_ms_implib_tmp" ++} ++ ++# func_cygming_dll_for_implib_fallback ARG ++# Platform-specific function to extract the ++# name of the DLL associated with the specified ++# import library ARG. ++# ++# This fallback implementation is for use when $DLLTOOL ++# does not support the --identify-strict option. ++# Invoked by eval'ing the libtool variable ++# $sharedlib_from_linklib_cmd ++# Result is available in the variable ++# $sharedlib_from_linklib_result ++func_cygming_dll_for_implib_fallback () ++{ ++ $opt_debug ++ if func_cygming_gnu_implib_p "$1" ; then ++ # binutils import library ++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` ++ elif func_cygming_ms_implib_p "$1" ; then ++ # ms-generated import library ++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` ++ else ++ # unknown ++ sharedlib_from_linklib_result="" ++ fi ++}

• # func_extract_an_archive dir oldlib

+@@ -2917,7 +3801,7 @@ func_extract_archives ()

•    darwin_file=
  

•    darwin_files=
  

•    for darwin_file in $darwin_filelist; do
  

+- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` ++ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`

•      $LIPO -create -output "$darwin_file" $darwin_files
  

•    done # $darwin_filelist
  

•    $RM -rf unfat-$$
  

+@@ -2932,7 +3816,7 @@ func_extract_archives ()

•     func_extract_an_archive "$my_xdir" "$my_xabs"
  

• ;;

•   esac
  

+- my_oldobjs="$my_oldobjs "`find $my_xdir -name *.$objext -print -o -name *.lo -print | $NL2SP` ++ my_oldobjs="$my_oldobjs "`find $my_xdir -name *.$objext -print -o -name *.lo -print | sort | $NL2SP`

• done
  

• func_extract_archives_result="$my_oldobjs"
  

+@@ -3014,7 +3898,110 @@ func_fallback_echo ()

• _LTECHO_EOF'
• }

• ECHO=\"$qECHO\"
  

+- fi\ ++ fi ++ ++# Very basic option parsing. These options are (a) specific to ++# the libtool wrapper, (b) are identical between the wrapper ++# /script/ and the wrapper /executable/ which is used only on ++# windows platforms, and (c) all begin with the string "--lt-" ++# (application programs are unlikely to have options which match ++# this pattern). ++# ++# There are only two supported options: --lt-debug and ++# --lt-dump-script. There is, deliberately, no --lt-help. ++# ++# The first argument to this parsing function should be the ++# script's $0 value, followed by "$@". ++lt_option_debug= ++func_parse_lt_options () ++{ ++ lt_script_arg0=$0 ++ shift ++ for lt_opt ++ do ++ case "$lt_opt" in ++ --lt-debug) lt_option_debug=1 ;; ++ --lt-dump-script) ++ lt_dump_D=`$ECHO "X$lt_script_arg0" | $SED -e 's/^X//' -e 's%/[^/]*$%%'` ++ test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=. ++ lt_dump_F=`$ECHO "X$lt_script_arg0" | $SED -e 's/^X//' -e 's%^.*/%%'` ++ cat "$lt_dump_D/$lt_dump_F" ++ exit 0 ++ ;; ++ --lt-*) ++ $ECHO "Unrecognized --lt- option: '$lt_opt'" 1>&2 ++ exit 1 ++ ;; ++ esac ++ done ++ ++ # Print the debug banner immediately: ++ if test -n "$lt_option_debug"; then ++ echo "${outputname}:${output}:${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION" 1>&2 ++ fi ++} ++ ++# Used when --lt-debug. Prints its arguments to stdout ++# (redirection is the responsibility of the caller) ++func_lt_dump_args () ++{ ++ lt_dump_args_N=1; ++ for lt_arg ++ do ++ $ECHO "${outputname}:${output}:${LINENO}: newargv[$lt_dump_args_N]: $lt_arg" ++ lt_dump_args_N=`expr $lt_dump_args_N + 1` ++ done ++} ++ ++# Core function for launching the target application ++func_exec_program_core () ++{ ++" ++ case $host in ++ # Backslashes separate directories on plain windows ++ *-*-mingw | *-*-os2* | *-cegcc*) ++ $ECHO "\ ++ if test -n "$lt_option_debug"; then ++ $ECHO "${outputname}:${output}:${LINENO}: newargv[0]: $progdir\\$program" 1>&2 ++ func_lt_dump_args ${1+"$@"} 1>&2 ++ fi ++ exec "$progdir\\$program" ${1+"$@"} ++" ++ ;; ++ ++ *) ++ $ECHO "\ ++ if test -n "$lt_option_debug"; then ++ $ECHO "${outputname}:${output}:${LINENO}: newargv[0]: $progdir/$program" 1>&2 ++ func_lt_dump_args ${1+"$@"} 1>&2 ++ fi ++ exec "$progdir/$program" ${1+"$@"} ++" ++ ;; ++ esac ++ $ECHO "\ ++ $ECHO "$0: cannot exec $program $*" 1>&2 ++ exit 1 ++} ++ ++# A function to encapsulate launching the target application ++# Strips options in the --lt-* namespace from $@ and ++# launches target application with the remaining arguments. ++func_exec_program () ++{ ++ for lt_wr_arg ++ do ++ case $lt_wr_arg in ++ --lt-*) ;; ++ *) set x "$@" "$lt_wr_arg"; shift;; ++ esac ++ shift ++ done ++ func_exec_program_core ${1+"$@"} ++} ++ ++ # Parse options ++ func_parse_lt_options "$0" ${1+"$@"}

• # Find the directory that this script lives in.
• thisdir=`$ECHO "$file" | $SED 's%/[^/]*$%%'`

+@@ -3078,7 +4065,7 @@ _LTECHO_EOF'

• # relink executable if necessary
  

• if test -n \"\$relink_command\"; then
  

+- if relink_command_output=`eval "$relink_command" 2>&1`; then : ++ if relink_command_output=`eval $relink_command 2>&1`; then :

•   else
  

• $ECHO "$relink_command_output" >&2
• $RM "$progdir/$file"

+@@ -3102,6 +4089,18 @@ _LTECHO_EOF'

• if test -f "$progdir/$program"; then"

++ # fixup the dll searchpath if we need to. ++ # ++ # Fix the DLL searchpath if we need to. Do this before prepending ++ # to shlibpath, because on Windows, both are PATH and uninstalled ++ # libraries must come first. ++ if test -n "$dllsearchpath"; then ++ $ECHO "\ ++ # Add the dll search path components to the executable PATH ++ PATH=$dllsearchpath:$PATH ++" ++ fi ++

• # Export our shlibpath_var if we have one.
• if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then

•  $ECHO "\
  

+@@ -3116,35 +4115,10 @@ _LTECHO_EOF'

• "
• fi

+- # fixup the dll searchpath if we need to. +- if test -n "$dllsearchpath"; then +- $ECHO "\ +- # Add the dll search path components to the executable PATH +- PATH=$dllsearchpath:$PATH +-" +- fi +-

• $ECHO "\

• if test \"\$libtool_execute_magic\" != \"$magic\"; then
  

•   # Run the actual program with our arguments.
  

+-" +- case $host in +- # Backslashes separate directories on plain windows +- *-*-mingw | *-*-os2* | *-cegcc*) +- $ECHO "\ +- exec "$progdir\\$program" ${1+"$@"} +-" +- ;; +- +- *) +- $ECHO "\ +- exec "$progdir/$program" ${1+"$@"} +-" +- ;; +- esac +- $ECHO "\ +- $ECHO "$0: cannot exec $program $*" 1>&2 +- exit 1 ++ func_exec_program ${1+"$@"}

• fi
  

• else

• # The program doesn't exist.
  

+@@ -3158,166 +4132,6 @@ fi\

• }

+-# func_to_host_path arg +-# +-# Convert paths to host format when used with build tools. +-# Intended for use with "native" mingw (where libtool itself +-# is running under the msys shell), or in the following cross- +-# build environments: +-# $build $host +-# mingw (msys) mingw [e.g. native] +-# cygwin mingw +-# *nix + wine mingw +-# where wine is equipped with the `winepath' executable. +-# In the native mingw case, the (msys) shell automatically +-# converts paths for any non-msys applications it launches, +-# but that facility isn't available from inside the cwrapper. +-# Similar accommodations are necessary for $host mingw and +-# $build cygwin. Calling this function does no harm for other +-# $host/$build combinations not listed above. +-# +-# ARG is the path (on $build) that should be converted to +-# the proper representation for $host. The result is stored +-# in $func_to_host_path_result. +-func_to_host_path () +-{ +- func_to_host_path_result="$1" +- if test -n "$1"; then +- case $host in +- *mingw* ) +- lt_sed_naive_backslashify='s|\\*|\|g;s|/|\|g;s|\|\\|g' +- case $build in +- *mingw* ) # actually, msys +- # awkward: cmd appends spaces to result +- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | +- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +- ;; +- *cygwin* ) +- func_to_host_path_result=`cygpath -w "$1" | +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- * ) +- # Unfortunately, winepath does not exit with a non-zero +- # error code, so we are forced to check the contents of +- # stdout. On the other hand, if the command is not +- # found, the shell will set an exit code of 127 and print +- # *an error message* to stdout. So we must check for both +- # error code of zero AND non-empty stdout, which explains +- # the odd construction: +- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` +- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then +- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | +- $SED -e "$lt_sed_naive_backslashify"` +- else +- # Allow warning below. +- func_to_host_path_result= +- fi +- ;; +- esac +- if test -z "$func_to_host_path_result" ; then +- func_error "Could not determine host path corresponding to" +- func_error " `$1'" +- func_error "Continuing, but uninstalled executables may not work." +- # Fallback: +- func_to_host_path_result="$1" +- fi +- ;; +- esac +- fi +-} +-# end: func_to_host_path +- +-# func_to_host_pathlist arg +-# +-# Convert pathlists to host format when used with build tools. +-# See func_to_host_path(), above. This function supports the +-# following $build/$host combinations (but does no harm for +-# combinations not listed here): +-# $build $host +-# mingw (msys) mingw [e.g. native] +-# cygwin mingw +-# *nix + wine mingw +-# +-# Path separators are also converted from $build format to +-# $host format. If ARG begins or ends with a path separator +-# character, it is preserved (but converted to $host format) +-# on output. +-# +-# ARG is a pathlist (on $build) that should be converted to +-# the proper representation on $host. The result is stored +-# in $func_to_host_pathlist_result. +-func_to_host_pathlist () +-{ +- func_to_host_pathlist_result="$1" +- if test -n "$1"; then +- case $host in +- *mingw* ) +- lt_sed_naive_backslashify='s|\\*|\|g;s|/|\|g;s|\|\\|g' +- # Remove leading and trailing path separator characters from +- # ARG. msys behavior is inconsistent here, cygpath turns them +- # into '.;' and ';.', and winepath ignores them completely. +- func_stripname : : "$1" +- func_to_host_pathlist_tmp1=$func_stripname_result +- case $build in +- *mingw* ) # Actually, msys. +- # Awkward: cmd appends spaces to result. +- func_to_host_pathlist_result=` +- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | +- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +- ;; +- *cygwin* ) +- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- * ) +- # unfortunately, winepath doesn't convert pathlists +- func_to_host_pathlist_result="" +- func_to_host_pathlist_oldIFS=$IFS +- IFS=: +- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do +- IFS=$func_to_host_pathlist_oldIFS +- if test -n "$func_to_host_pathlist_f" ; then +- func_to_host_path "$func_to_host_pathlist_f" +- if test -n "$func_to_host_path_result" ; then +- if test -z "$func_to_host_pathlist_result" ; then +- func_to_host_pathlist_result="$func_to_host_path_result" +- else +- func_append func_to_host_pathlist_result ";$func_to_host_path_result" +- fi +- fi +- fi +- done +- IFS=$func_to_host_pathlist_oldIFS +- ;; +- esac +- if test -z "$func_to_host_pathlist_result"; then +- func_error "Could not determine the host path(s) corresponding to" +- func_error " `$1'" +- func_error "Continuing, but uninstalled executables may not work." +- # Fallback. This may break if $1 contains DOS-style drive +- # specifications. The fix is not to complicate the expression +- # below, but for the user to provide a working wine installation +- # with winepath so that path translation in the cross-to-mingw +- # case works properly. +- lt_replace_pathsep_nix_to_dos="s|:|;|g" +- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ +- $SED -e "$lt_replace_pathsep_nix_to_dos"` +- fi +- # Now, add the leading and trailing path separators back +- case "$1" in +- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" +- ;; +- esac +- case "$1" in +- *: ) func_append func_to_host_pathlist_result ";" +- ;; +- esac +- ;; +- esac +- fi +-} +-# end: func_to_host_pathlist +-

• # func_emit_cwrapperexe_src
• # emit the source code for a wrapper executable on stdout
• # Must ONLY be called from within func_mode_link because

+@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src ()

• This wrapper executable should never be moved out of the build directory.
• If it is, it will not operate correctly.

+- +- Currently, it simply execs the wrapper *script* "$SHELL $output", +- but could eventually absorb all of the scripts functionality and +- exec $objdir/$outputname directly.

• */
• EOF

•    cat <<"EOF"
  

+@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int);

• if (stale) { free ((void *) stale); stale = 0; } \
• } while (0)

+-#undef LTWRAPPER_DEBUGPRINTF +-#if defined LT_DEBUGWRAPPER +-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args +-static void +-ltwrapper_debugprintf (const char *fmt, ...) +-{ +- va_list args; +- va_start (args, fmt); +- (void) vfprintf (stderr, fmt, args); +- va_end (args); +-} ++#if defined(LT_DEBUGWRAPPER) ++static int lt_debug = 1;

• #else

+-# define LTWRAPPER_DEBUGPRINTF(args) ++static int lt_debug = 0;

• #endif

+-const char *program_name = NULL; ++const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */

• void *xmalloc (size_t num);
• char *xstrdup (const char *string);

+@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec);

• int make_executable (const char *path);
• int check_executable (const char *path);
• char *strendzap (char *str, const char *pat);

+-void lt_fatal (const char *message, ...); ++void lt_debugprintf (const char *file, int line, const char *fmt, ...); ++void lt_fatal (const char *file, int line, const char *message, ...); ++static const char *nonnull (const char *s); ++static const char *nonempty (const char *s);

• void lt_setenv (const char *name, const char *value);
• char *lt_extend_str (const char *orig_value, const char *add, int to_end);
• void lt_update_exe_path (const char *name, const char *value);

+@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f);

• EOF

•    cat <<EOF
  

+-const char * MAGIC_EXE = "$magic_exe"; ++volatile const char * MAGIC_EXE = "$magic_exe";

• const char * LIB_PATH_VARNAME = "$shlibpath_var";
• EOF

•    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
  

+- func_to_host_pathlist "$temp_rpath" ++ func_to_host_path "$temp_rpath"

•      cat <<EOF
  

+-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result"; ++const char * LIB_PATH_VALUE = "$func_to_host_path_result";

• EOF

•    else
  

•      cat <<"EOF"
  

+@@ -3513,10 +4317,10 @@ EOF

•    fi
  

•    if test -n "$dllsearchpath"; then
  

+- func_to_host_pathlist "$dllsearchpath:" ++ func_to_host_path "$dllsearchpath:"

•      cat <<EOF
  

• const char * EXE_PATH_VARNAME = "PATH";

+-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result"; ++const char * EXE_PATH_VALUE = "$func_to_host_path_result";

• EOF

•    else
  

•      cat <<"EOF"
  

+@@ -3539,12 +4343,10 @@ EOF

•    cat <<"EOF"
  

• #define LTWRAPPER_OPTION_PREFIX "--lt-"

+-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5

+-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;

• static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;

+-

• static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";

++static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";

• int
• main (int argc, char *argv[])

+@@ -3561,10 +4363,13 @@ main (int argc, char *argv[])

• int i;
• program_name = (char *) xstrdup (base_name (argv[0]));

+- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); +- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); ++ newargz = XMALLOC (char *, argc + 1);

+- /* very simple arg parsing; don't want to rely on getopt */ ++ /* very simple arg parsing; don't want to rely on getopt ++ * also, copy all non cwrapper options to newargz, except ++ * argz[0], which is handled differently ++ */ ++ newargc=0;

• for (i = 1; i < argc; i++)

• {
  

•   if (strcmp (argv[i], dumpscript_opt) == 0)
  

+@@ -3581,21 +4386,54 @@ EOF

•  lt_dump_script (stdout);
  

•  return 0;
  

• }

++ if (strcmp (argv[i], debug_opt) == 0) ++ { ++ lt_debug = 1; ++ continue; ++ } ++ if (strcmp (argv[i], ltwrapper_option_prefix) == 0) ++ { ++ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX ++ namespace, but it is not one of the ones we know about and ++ have already dealt with, above (inluding dump-script), then ++ report an error. Otherwise, targets might begin to believe ++ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX ++ namespace. The first time any user complains about this, we'll ++ need to make LTWRAPPER_OPTION_PREFIX a configure-time option ++ or a configure.ac-settable value. ++ */ ++ lt_fatal (__FILE__, __LINE__, ++ "unrecognized %s option: '%s'", ++ ltwrapper_option_prefix, argv[i]); ++ } ++ /* otherwise ... */ ++ newargz[++newargc] = xstrdup (argv[i]);

• }
  

++ newargz[++newargc] = NULL; ++ ++EOF ++ cat <<EOF ++ /* The GNU banner must be the first non-error debug message */ ++ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n"); ++EOF ++ cat <<"EOF" ++ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]); ++ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);

+- newargz = XMALLOC (char *, argc + 1);

• tmp_pathspec = find_executable (argv[0]);
• if (tmp_pathspec == NULL)

+- lt_fatal ("Couldn't find %s", argv[0]); +- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", +- tmp_pathspec)); ++ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(main) found exe (before symlink chase) at: %s\n", ++ tmp_pathspec);

• actual_cwrapper_path = chase_symlinks (tmp_pathspec);

+- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", +- actual_cwrapper_path)); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(main) found exe (after symlink chase) at: %s\n", ++ actual_cwrapper_path);

• XFREE (tmp_pathspec);

+- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); ++ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));

• strendzap (actual_cwrapper_path, actual_cwrapper_name);
• /* wrapper name transforms */

+@@ -3613,8 +4451,9 @@ EOF

• target_name = tmp_pathspec;
• tmp_pathspec = 0;

+- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", +- target_name)); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(main) libtool target name: %s\n", ++ target_name);

• EOF

•    cat <<EOF
  

+@@ -3664,35 +4503,19 @@ EOF

• lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
• lt_setenv ("DUALCASE", "1"); /* for MSK sh */

+- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); ++ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must ++ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath) ++ because on Windows, both *_VARNAMEs are PATH but uninstalled ++ libraries must come first. */

• lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);

++ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);

+- newargc=0; +- for (i = 1; i < argc; i++) +- { +- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) +- { +- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX +- namespace, but it is not one of the ones we know about and +- have already dealt with, above (inluding dump-script), then +- report an error. Otherwise, targets might begin to believe +- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX +- namespace. The first time any user complains about this, we'll +- need to make LTWRAPPER_OPTION_PREFIX a configure-time option +- or a configure.ac-settable value. +- */ +- lt_fatal ("Unrecognized option in %s namespace: '%s'", +- ltwrapper_option_prefix, argv[i]); +- } +- /* otherwise ... */ +- newargz[++newargc] = xstrdup (argv[i]); +- } +- newargz[++newargc] = NULL; +- +- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); ++ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", ++ nonnull (lt_argv_zero));

• for (i = 0; i < newargc; i++)

• {
  

+- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); ++ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", ++ i, nonnull (newargz[i]));

• }
  

• EOF

+@@ -3706,7 +4529,9 @@ EOF

• if (rval == -1)

• {
  

•   /* failed to start process */
  

+- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target "%s": errno = %d\n", lt_argv_zero, errno)); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(main) failed to launch target "%s": %s\n", ++ lt_argv_zero, nonnull (strerror (errno)));

•   return 127;
  

• }
  

• return rval;

+@@ -3728,7 +4553,7 @@ xmalloc (size_t num)

• {
• void *p = (void *) malloc (num);
• if (!p)

+- lt_fatal ("Memory exhausted"); ++ lt_fatal (__FILE__, __LINE__, "memory exhausted");

• return p;
• }

+@@ -3762,8 +4587,8 @@ check_executable (const char *path)

• {
• struct stat st;

+- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", +- path ? (*path ? path : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", ++ nonempty (path));

• if ((!path) || (!*path))

• return 0;
  

+@@ -3780,8 +4605,8 @@ make_executable (const char *path)

• int rval = 0;
• struct stat st;

+- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", +- path ? (*path ? path : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", ++ nonempty (path));

• if ((!path) || (!*path))

• return 0;
  

+@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper)

• int tmp_len;
• char *concat_name;

+- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", +- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", ++ nonempty (wrapper));

• if ((wrapper == NULL) || (*wrapper == '\0'))

• return NULL;
  

+@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper)

• {
  

•   /* empty path: current directory */
  

•   if (getcwd (tmp, LT_PATHMAX) == NULL)
  

+- lt_fatal ("getcwd failed"); ++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", ++ nonnull (strerror (errno)));

•   tmp_len = strlen (tmp);
  

•   concat_name =
  

•     XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
  

+@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper)

• }
  

• /* Relative path | not found in path: prepend cwd */
• if (getcwd (tmp, LT_PATHMAX) == NULL)

+- lt_fatal ("getcwd failed"); ++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", ++ nonnull (strerror (errno)));

• tmp_len = strlen (tmp);
• concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
• memcpy (concat_name, tmp, tmp_len);

+@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec)

• int has_symlinks = 0;
• while (strlen (tmp_pathspec) && !has_symlinks)

• {
  

+- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", +- tmp_pathspec)); ++ lt_debugprintf (__FILE__, __LINE__, ++ "checking path component for symlinks: %s\n", ++ tmp_pathspec);

•   if (lstat (tmp_pathspec, &s) == 0)
  

• {

•  if (S_ISLNK (s.st_mode) != 0)
  

+@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec)

• }

•   else
  

• {

+- char *errstr = strerror (errno); +- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); ++ lt_fatal (__FILE__, __LINE__, ++ "error accessing file "%s": %s", ++ tmp_pathspec, nonnull (strerror (errno)));

• }

• }
  

• XFREE (tmp_pathspec);

+@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec)

• tmp_pathspec = realpath (pathspec, buf);
• if (tmp_pathspec == 0)

• {
  

+- lt_fatal ("Could not follow symlinks for %s", pathspec); ++ lt_fatal (__FILE__, __LINE__, ++ "could not follow symlinks for %s", pathspec);

• }
  

• return xstrdup (tmp_pathspec);
• #endif

+@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat)

• return str;
• }

++void ++lt_debugprintf (const char *file, int line, const char *fmt, ...) ++{ ++ va_list args; ++ if (lt_debug) ++ { ++ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); ++ va_start (args, fmt); ++ (void) vfprintf (stderr, fmt, args); ++ va_end (args); ++ } ++} ++

• static void

+-lt_error_core (int exit_status, const char *mode, ++lt_error_core (int exit_status, const char *file, ++ int line, const char *mode,

•       const char *message, va_list ap)
  

• {

+- fprintf (stderr, "%s: %s: ", program_name, mode); ++ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);

• vfprintf (stderr, message, ap);
• fprintf (stderr, ".\n");

+@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode,

• }
• void

+-lt_fatal (const char *message, ...) ++lt_fatal (const char *file, int line, const char *message, ...)

• {
• va_list ap;
• va_start (ap, message);

+- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); ++ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);

• va_end (ap);
• }

++static const char * ++nonnull (const char *s) ++{ ++ return s ? s : "(null)"; ++} ++ ++static const char * ++nonempty (const char *s) ++{ ++ return (s && !*s) ? "(empty)" : nonnull (s); ++} ++

• void
• lt_setenv (const char *name, const char *value)
• {

+- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", +- (name ? name : "<NULL>"), +- (value ? value : "<NULL>"))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_setenv) setting '%s' to '%s'\n", ++ nonnull (name), nonnull (value));

• {
• #ifdef HAVE_SETENV

• /* always make a copy, for consistency with !HAVE_SETENV */
  

+@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)

• void
• lt_update_exe_path (const char *name, const char *value)
• {

+- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", +- (name ? name : "<NULL>"), +- (value ? value : "<NULL>"))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", ++ nonnull (name), nonnull (value));

• if (name && *name && value && *value)

• {
  

+@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value)

• void
• lt_update_lib_path (const char *name, const char *value)
• {

+- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", +- (name ? name : "<NULL>"), +- (value ? value : "<NULL>"))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", ++ nonnull (name), nonnull (value));

• if (name && *name && value && *value)

• {
  

+@@ -4222,7 +5078,7 @@ EOF

• func_win32_import_lib_p ()
• {

• $opt_debug
  

+- case `eval "$file_magic_cmd "$1" 2>/dev/null" | $SED -e 10q` in ++ case `eval $file_magic_cmd "$1" 2>/dev/null | $SED -e 10q` in

• *import*) : ;;
  

• *) false ;;
  

• esac
  

+@@ -4401,9 +5257,9 @@ func_mode_link ()

•    ;;
  

•  *)
  

•    if test "$prev" = dlfiles; then
  

+- dlfiles="$dlfiles $arg" ++ func_append dlfiles " $arg"

•    else
  

+- dlprefiles="$dlprefiles $arg" ++ func_append dlprefiles " $arg"

•    fi
  

•    prev=
  

•    continue
  

+@@ -4427,7 +5283,7 @@ func_mode_link ()

•    *-*-darwin*)
  

•      case "$deplibs " in
  

• *" $qarg.ltframework "*) ;;
  

+- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later ++ *) func_append deplibs " $qarg.ltframework" # this is fixed later

•    ;;
  

•      esac
  

•      ;;
  

+@@ -4446,7 +5302,7 @@ func_mode_link ()

•    moreargs=
  

•    for fil in `cat "$save_arg"`
  

•    do
  

+-# moreargs="$moreargs $fil" ++# func_append moreargs " $fil"

•      arg=$fil
  

•      # A libtool-controlled object.
  

+@@ -4475,7 +5331,7 @@ func_mode_link ()

•   if test "$prev" = dlfiles; then
  

•     if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
  

+- dlfiles="$dlfiles $pic_object" ++ func_append dlfiles " $pic_object"

•       prev=
  

•       continue
  

•     else
  

+@@ -4487,7 +5343,7 @@ func_mode_link ()

•   # CHECK ME:  I think I busted this.  -Ossama
  

•   if test "$prev" = dlprefiles; then
  

•     # Preload the old-style object.
  

+- dlprefiles="$dlprefiles $pic_object" ++ func_append dlprefiles " $pic_object"

•     prev=
  

•   fi
  

+@@ -4557,12 +5413,12 @@ func_mode_link ()

•  if test "$prev" = rpath; then
  

•    case "$rpath " in
  

•    *" $arg "*) ;;
  

+- *) rpath="$rpath $arg" ;; ++ *) func_append rpath " $arg" ;;

•    esac
  

•  else
  

•    case "$xrpath " in
  

•    *" $arg "*) ;;
  

+- *) xrpath="$xrpath $arg" ;; ++ *) func_append xrpath " $arg" ;;

•    esac
  

•  fi
  

•  prev=
  

+@@ -4574,28 +5430,28 @@ func_mode_link ()

•  continue
  

•  ;;
  

• weak)

+- weak_libs="$weak_libs $arg" ++ func_append weak_libs " $arg"

•  prev=
  

•  continue
  

•  ;;
  

• xcclinker)

+- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $qarg" ++ func_append linker_flags " $qarg" ++ func_append compiler_flags " $qarg"

•  prev=
  

•  func_append compile_command " $qarg"
  

•  func_append finalize_command " $qarg"
  

•  continue
  

•  ;;
  

• xcompiler)

+- compiler_flags="$compiler_flags $qarg" ++ func_append compiler_flags " $qarg"

•  prev=
  

•  func_append compile_command " $qarg"
  

•  func_append finalize_command " $qarg"
  

•  continue
  

•  ;;
  

• xlinker)

+- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $wl$qarg" ++ func_append linker_flags " $qarg" ++ func_append compiler_flags " $wl$qarg"

•  prev=
  

•  func_append compile_command " $wl$qarg"
  

•  func_append finalize_command " $wl$qarg"
  

+@@ -4686,15 +5542,16 @@ func_mode_link ()

• ;;

•   -L*)
  

+- func_stripname '-L' '' "$arg" +- dir=$func_stripname_result +- if test -z "$dir"; then ++ func_stripname "-L" '' "$arg" ++ if test -z "$func_stripname_result"; then

•  if test "$#" -gt 0; then
  

•    func_fatal_error "require no space between \`-L' and \`$1'"
  

•  else
  

•    func_fatal_error "need path for \`-L' option"
  

•  fi
  

• fi

++ func_resolve_sysroot "$func_stripname_result" ++ dir=$func_resolve_sysroot_result

• # We need an absolute path.
• case $dir in
• [\/]* | [A-Za-z]:[\/]*) ;;

+@@ -4706,10 +5563,16 @@ func_mode_link ()

•  ;;
  

• esac
• case "$deplibs " in

+- *" -L$dir "*) ;; ++ *" -L$dir "* | *" $arg "*) ++ # Will only happen for absolute or sysroot arguments ++ ;;

• *)

+- deplibs="$deplibs -L$dir" +- lib_search_path="$lib_search_path $dir" ++ # Preserve sysroot, but never include relative directories ++ case $dir in ++ [\/]* | [A-Za-z]:[\/]* | =*) func_append deplibs " $arg" ;; ++ *) func_append deplibs " -L$dir" ;; ++ esac ++ func_append lib_search_path " $dir"

•  ;;
  

• esac
• case $host in

+@@ -4718,12 +5581,12 @@ func_mode_link ()

•  case :$dllsearchpath: in
  

•  *":$dir:"*) ;;
  

•  ::) dllsearchpath=$dir;;
  

+- *) dllsearchpath="$dllsearchpath:$dir";; ++ *) func_append dllsearchpath ":$dir";;

•  esac
  

•  case :$dllsearchpath: in
  

•  *":$testbindir:"*) ;;
  

•  ::) dllsearchpath=$testbindir;;
  

+- *) dllsearchpath="$dllsearchpath:$testbindir";; ++ *) func_append dllsearchpath ":$testbindir";;

•  esac
  

•  ;;
  

• esac

+@@ -4747,7 +5610,7 @@ func_mode_link ()

•    ;;
  

•  *-*-rhapsody* | *-*-darwin1.[012])
  

•    # Rhapsody C and math libraries are in the System framework
  

+- deplibs="$deplibs System.ltframework" ++ func_append deplibs " System.ltframework"

•    continue
  

•    ;;
  

•  *-*-sco3.2v5* | *-*-sco5v6*)
  

+@@ -4758,9 +5621,6 @@ func_mode_link ()

•    # Compiler inserts libc in the correct place for threads to work
  

•    test "X$arg" = "X-lc" && continue
  

•    ;;
  

+- *-*-linux*) +- test "X$arg" = "X-lc" && continue +- ;;

•  esac
  

• elif test "X$arg" = "X-lc_r"; then

• case $host in
  

+@@ -4770,7 +5630,7 @@ func_mode_link ()

•   ;;
  

• esac
  

• fi

+- deplibs="$deplibs $arg" ++ func_append deplibs " $arg"

• continue
• ;;

+@@ -4782,8 +5642,8 @@ func_mode_link ()

•   # Tru64 UNIX uses -model [arg] to determine the layout of C++
  

•   # classes, name mangling, and exception handling.
  

•   # Darwin uses the -arch flag to determine output architecture.
  

+- -model|-arch|-isysroot) +- compiler_flags="$compiler_flags $arg" ++ -model|-arch|-isysroot|--sysroot) ++ func_append compiler_flags " $arg"

• func_append compile_command " $arg"
• func_append finalize_command " $arg"
• prev=xcompiler

+@@ -4791,12 +5651,12 @@ func_mode_link ()

• ;;

•   -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
  

+- compiler_flags="$compiler_flags $arg" ++ func_append compiler_flags " $arg"

• func_append compile_command " $arg"
• func_append finalize_command " $arg"
• case "$new_inherited_linker_flags " in

•    *" $arg "*) ;;
  

+- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; ++ * ) func_append new_inherited_linker_flags " $arg" ;;

• esac
• continue
• ;;

+@@ -4863,13 +5723,17 @@ func_mode_link ()

• # We need an absolute path.
• case $dir in
• [\/]* | [A-Za-z]:[\/]*) ;;

++ =*) ++ func_stripname '=' '' "$dir" ++ dir=$lt_sysroot$func_stripname_result ++ ;;

• *)

•  func_fatal_error "only absolute run-paths are allowed"
  

•  ;;
  

• esac
• case "$xrpath " in
• *" $dir "*) ;;

+- *) xrpath="$xrpath $dir" ;; ++ *) func_append xrpath " $dir" ;;

• esac
• continue
• ;;

+@@ -4922,8 +5786,8 @@ func_mode_link ()

• for flag in $args; do

•  IFS="$save_ifs"
  

•       func_quote_for_eval "$flag"
  

+- arg="$arg $func_quote_for_eval_result" +- compiler_flags="$compiler_flags $func_quote_for_eval_result" ++ func_append arg " $func_quote_for_eval_result" ++ func_append compiler_flags " $func_quote_for_eval_result"

• done
• IFS="$save_ifs"
• func_stripname ' ' '' "$arg"

+@@ -4938,9 +5802,9 @@ func_mode_link ()

• for flag in $args; do

•  IFS="$save_ifs"
  

•       func_quote_for_eval "$flag"
  

+- arg="$arg $wl$func_quote_for_eval_result" +- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" +- linker_flags="$linker_flags $func_quote_for_eval_result" ++ func_append arg " $wl$func_quote_for_eval_result" ++ func_append compiler_flags " $wl$func_quote_for_eval_result" ++ func_append linker_flags " $func_quote_for_eval_result"

• done
• IFS="$save_ifs"
• func_stripname ' ' '' "$arg"

+@@ -4968,24 +5832,27 @@ func_mode_link ()

• arg="$func_quote_for_eval_result"
• ;;

+- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler +- # -r[0-9][0-9]* specifies the processor on the SGI compiler +- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler +- # +DA*, +DD* enable 64-bit mode on the HP compiler +- # -q* pass through compiler args for the IBM compiler +- # -m*, -t[45]*, -txscale* pass through architecture-specific +- # compiler args for GCC +- # -F/path gives path to uninstalled frameworks, gcc on darwin +- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC +- # @file GCC response files +- # -tp=* Portland pgcc target processor selection ++ # Flags to be passed through unchanged, with rationale: ++ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler ++ # -r[0-9][0-9]* specify processor for the SGI compiler ++ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler ++ # +DA*, +DD* enable 64-bit mode for the HP compiler ++ # -q* compiler args for the IBM compiler ++ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC ++ # -F/path path to uninstalled frameworks, gcc on darwin ++ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC ++ # @file GCC response files ++ # -tp=* Portland pgcc target processor selection ++ # --sysroot=* for sysroot support ++ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization

•   -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
  

+- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)

•     func_quote_for_eval "$arg"
  

• arg="$func_quote_for_eval_result"

•     func_append compile_command " $arg"
  

•     func_append finalize_command " $arg"
  

+- compiler_flags="$compiler_flags $arg" ++ func_append compiler_flags " $arg"

•     continue
  

•     ;;
  

+@@ -4997,7 +5864,7 @@ func_mode_link ()

•   *.$objext)
  

• # A standard object.

+- objs="$objs $arg" ++ func_append objs " $arg"

• ;;

•   *.lo)
  

+@@ -5028,7 +5895,7 @@ func_mode_link ()

•    if test "$prev" = dlfiles; then
  

•      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
  

+- dlfiles="$dlfiles $pic_object" ++ func_append dlfiles " $pic_object"

• prev=
  

• continue
  

•      else
  

+@@ -5040,7 +5907,7 @@ func_mode_link ()

•    # CHECK ME:  I think I busted this.  -Ossama
  

•    if test "$prev" = dlprefiles; then
  

•      # Preload the old-style object.
  

+- dlprefiles="$dlprefiles $pic_object" ++ func_append dlprefiles " $pic_object"

•      prev=
  

•    fi
  

+@@ -5085,24 +5952,25 @@ func_mode_link ()

•   *.$libext)
  

• # An archive.

+- deplibs="$deplibs $arg" +- old_deplibs="$old_deplibs $arg" ++ func_append deplibs " $arg" ++ func_append old_deplibs " $arg"

• continue
• ;;

•   *.la)
  

• # A libtool-controlled library.

++ func_resolve_sysroot "$arg"

• if test "$prev" = dlfiles; then

•  # This library was specified with -dlopen.
  

+- dlfiles="$dlfiles $arg" ++ func_append dlfiles " $func_resolve_sysroot_result"

•  prev=
  

• elif test "$prev" = dlprefiles; then

•  # The library was specified with -dlpreopen.
  

+- dlprefiles="$dlprefiles $arg" ++ func_append dlprefiles " $func_resolve_sysroot_result"

•  prev=
  

• else

+- deplibs="$deplibs $arg" ++ func_append deplibs " $func_resolve_sysroot_result"

• fi
• continue
• ;;

+@@ -5127,7 +5995,7 @@ func_mode_link ()

•   func_fatal_help "the \`$prevarg' option requires an argument"
  

• if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
  

+- eval "arg="$export_dynamic_flag_spec"" ++ eval arg="$export_dynamic_flag_spec"

•   func_append compile_command " $arg"
  

•   func_append finalize_command " $arg"
  

• fi
  

+@@ -5144,11 +6012,13 @@ func_mode_link ()

• else
  

•   shlib_search_path=
  

• fi
  

+- eval "sys_lib_search_path="$sys_lib_search_path_spec"" +- eval "sys_lib_dlsearch_path="$sys_lib_dlsearch_path_spec"" ++ eval sys_lib_search_path="$sys_lib_search_path_spec" ++ eval sys_lib_dlsearch_path="$sys_lib_dlsearch_path_spec"

• func_dirname "$output" "/" ""
  

• output_objdir="$func_dirname_result$objdir"
  

++ func_to_tool_file "$output_objdir/" ++ tool_output_objdir=$func_to_tool_file_result

• # Create the object directory.
  

• func_mkdir_p "$output_objdir"
  

+@@ -5169,12 +6039,12 @@ func_mode_link ()

• # Find all interdependent deplibs by searching for libraries
  

• # that are linked more than once (e.g. -la -lb -la)
  

• for deplib in $deplibs; do
  

+- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then

• case "$libs " in

+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;;

• esac

•   fi
  

+- libs="$libs $deplib" ++ func_append libs " $deplib"

• done
  

• if test "$linkmode" = lib; then
  

+@@ -5187,9 +6057,9 @@ func_mode_link ()

•   if $opt_duplicate_compiler_generated_deps; then
  

• for pre_post_dep in $predeps $postdeps; do

•  case "$pre_post_deps " in
  

+- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; ++ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;

•  esac
  

+- pre_post_deps="$pre_post_deps $pre_post_dep" ++ func_append pre_post_deps " $pre_post_dep"

• done

•   fi
  

•   pre_post_deps=
  

+@@ -5256,8 +6126,9 @@ func_mode_link ()

• for lib in $dlprefiles; do

•  # Ignore non-libtool-libs
  

•  dependency_libs=
  

++ func_resolve_sysroot "$lib"

•  case $lib in
  

+- *.la) func_source "$lib" ;; ++ *.la) func_source "$func_resolve_sysroot_result" ;;

•  esac
  

•  # Collect preopened libtool deplibs, except any this library
  

+@@ -5267,7 +6138,7 @@ func_mode_link ()

•         deplib_base=$func_basename_result
  

•    case " $weak_libs " in
  

•    *" $deplib_base "*) ;;
  

+- *) deplibs="$deplibs $deplib" ;; ++ *) func_append deplibs " $deplib" ;;

•    esac
  

•  done
  

• done

+@@ -5288,11 +6159,11 @@ func_mode_link ()

•    compile_deplibs="$deplib $compile_deplibs"
  

•    finalize_deplibs="$deplib $finalize_deplibs"
  

•  else
  

+- compiler_flags="$compiler_flags $deplib" ++ func_append compiler_flags " $deplib"

•    if test "$linkmode" = lib ; then
  

• case "$new_inherited_linker_flags " in
  

•     *" $deplib "*) ;;
  

+- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ * ) func_append new_inherited_linker_flags " $deplib" ;;

• esac
  

•    fi
  

•  fi
  

+@@ -5377,7 +6248,7 @@ func_mode_link ()

•    if test "$linkmode" = lib ; then
  

• case "$new_inherited_linker_flags " in
  

•     *" $deplib "*) ;;
  

+- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ * ) func_append new_inherited_linker_flags " $deplib" ;;

• esac
  

•    fi
  

•  fi
  

+@@ -5390,7 +6261,8 @@ func_mode_link ()

•    test "$pass" = conv && continue
  

•    newdependency_libs="$deplib $newdependency_libs"
  

•    func_stripname '-L' '' "$deplib"
  

+- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result"

•    ;;
  

•  prog)
  

•    if test "$pass" = conv; then
  

+@@ -5404,7 +6276,8 @@ func_mode_link ()

•      finalize_deplibs="$deplib $finalize_deplibs"
  

•    fi
  

•    func_stripname '-L' '' "$deplib"
  

+- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result"

•    ;;
  

•  *)
  

•    func_warning "\`-L' is ignored for archives/objects"
  

+@@ -5415,17 +6288,21 @@ func_mode_link ()

• -R*)

•  if test "$pass" = link; then
  

•    func_stripname '-R' '' "$deplib"
  

+- dir=$func_stripname_result ++ func_resolve_sysroot "$func_stripname_result" ++ dir=$func_resolve_sysroot_result

•    # Make sure the xrpath contains only unique directories.
  

•    case "$xrpath " in
  

•    *" $dir "*) ;;
  

+- *) xrpath="$xrpath $dir" ;; ++ *) func_append xrpath " $dir" ;;

•    esac
  

•  fi
  

•  deplibs="$deplib $deplibs"
  

•  continue
  

•  ;;
  

+- *.la) lib="$deplib" ;; ++ *.la) ++ func_resolve_sysroot "$deplib" ++ lib=$func_resolve_sysroot_result ++ ;;

• *.$libext)

•  if test "$pass" = conv; then
  

•    deplibs="$deplib $deplibs"
  

+@@ -5488,11 +6365,11 @@ func_mode_link ()

•    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
  

•      # If there is no dlopen support or we're linking statically,
  

•      # we need to preload.
  

+- newdlprefiles="$newdlprefiles $deplib" ++ func_append newdlprefiles " $deplib"

•      compile_deplibs="$deplib $compile_deplibs"
  

•      finalize_deplibs="$deplib $finalize_deplibs"
  

•    else
  

+- newdlfiles="$newdlfiles $deplib" ++ func_append newdlfiles " $deplib"

•    fi
  

•  fi
  

•  continue
  

+@@ -5538,7 +6415,7 @@ func_mode_link ()

•  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
  

•    case " $new_inherited_linker_flags " in
  

•      *" $tmp_inherited_linker_flag "*) ;;
  

+- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; ++ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;

•    esac
  

•  done
  

• fi

+@@ -5546,8 +6423,8 @@ func_mode_link ()

• if test "$linkmode,$pass" = "lib,link" ||

•   test "$linkmode,$pass" = "prog,scan" ||
  

•   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
  

+- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" +- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" ++ test -n "$dlopen" && func_append dlfiles " $dlopen" ++ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"

• fi
• if test "$pass" = conv; then

+@@ -5558,20 +6435,20 @@ func_mode_link ()

•      func_fatal_error "cannot find name of link library for \`$lib'"
  

•    fi
  

•    # It is a libtool convenience library, so add in its objects.
  

+- convenience="$convenience $ladir/$objdir/$old_library" +- old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ func_append convenience " $ladir/$objdir/$old_library" ++ func_append old_convenience " $ladir/$objdir/$old_library"

•  elif test "$linkmode" != prog && test "$linkmode" != lib; then
  

•    func_fatal_error "\`$lib' is not a convenience library"
  

•  fi
  

•  tmp_libs=
  

•  for deplib in $dependency_libs; do
  

•    deplibs="$deplib $deplibs"
  

+- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then

•      case "$tmp_libs " in
  

+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;;

•      esac
  

•    fi
  

+- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $deplib"

•  done
  

•  continue
  

• fi # $pass = conv

+@@ -5579,9 +6456,15 @@ func_mode_link ()

• # Get the name of the library we link against.
• linklib=

+- for l in $old_library $library_names; do +- linklib="$l" +- done ++ if test -n "$old_library" && ++ { test "$prefer_static_libs" = yes || ++ test "$prefer_static_libs,$installed" = "built,no"; }; then ++ linklib=$old_library ++ else ++ for l in $old_library $library_names; do ++ linklib="$l" ++ done ++ fi

• if test -z "$linklib"; then

•  func_fatal_error "cannot find name of link library for \`$lib'"
  

• fi

+@@ -5598,9 +6481,9 @@ func_mode_link ()

•    # statically, we need to preload.  We also need to preload any
  

•    # dependent libraries so libltdl's deplib preloader doesn't
  

•    # bomb out in the load deplibs phase.
  

+- dlprefiles="$dlprefiles $lib $dependency_libs" ++ func_append dlprefiles " $lib $dependency_libs"

•  else
  

+- newdlfiles="$newdlfiles $lib" ++ func_append newdlfiles " $lib"

•  fi
  

•  continue
  

• fi # $pass = dlopen

+@@ -5622,14 +6505,14 @@ func_mode_link ()

• # Find the relevant object directory and library name.
• if test "X$installed" = Xyes; then

+- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then ++ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then

•    func_warning "library \`$lib' was moved."
  

•    dir="$ladir"
  

•    absdir="$abs_ladir"
  

•    libdir="$abs_ladir"
  

•  else
  

+- dir="$libdir" +- absdir="$libdir" ++ dir="$lt_sysroot$libdir" ++ absdir="$lt_sysroot$libdir"

•  fi
  

•  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
  

• else

+@@ -5637,12 +6520,12 @@ func_mode_link ()

•    dir="$ladir"
  

•    absdir="$abs_ladir"
  

•    # Remove this search path later
  

+- notinst_path="$notinst_path $abs_ladir" ++ func_append notinst_path " $abs_ladir"

•  else
  

•    dir="$ladir/$objdir"
  

•    absdir="$abs_ladir/$objdir"
  

•    # Remove this search path later
  

+- notinst_path="$notinst_path $abs_ladir" ++ func_append notinst_path " $abs_ladir"

•  fi
  

• fi # $installed = yes
• func_stripname 'lib' '.la' "$laname"

+@@ -5653,20 +6536,46 @@ func_mode_link ()

•  if test -z "$libdir" && test "$linkmode" = prog; then
  

•    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
  

•  fi
  

+- # Prefer using a static library (so that no silly _DYNAMIC symbols +- # are required to link). +- if test -n "$old_library"; then +- newdlprefiles="$newdlprefiles $dir/$old_library" +- # Keep a list of preopened convenience libraries to check +- # that they are being used correctly in the link pass. +- test -z "$libdir" && \ +- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" +- # Otherwise, use the dlname, so that lt_dlopen finds it. +- elif test -n "$dlname"; then +- newdlprefiles="$newdlprefiles $dir/$dlname" +- else +- newdlprefiles="$newdlprefiles $dir/$linklib" +- fi ++ case "$host" in ++ # special handling for platforms with PE-DLLs. ++ *cygwin* | *mingw* | *cegcc* ) ++ # Linker will automatically link against shared library if both ++ # static and shared are present. Therefore, ensure we extract ++ # symbols from the import library if a shared library is present ++ # (otherwise, the dlopen module name will be incorrect). We do ++ # this by putting the import library name into $newdlprefiles. ++ # We recover the dlopen module name by 'saving' the la file ++ # name in a special purpose variable, and (later) extracting the ++ # dlname from the la file. ++ if test -n "$dlname"; then ++ func_tr_sh "$dir/$linklib" ++ eval "libfile_$func_tr_sh_result=$abs_ladir/$laname" ++ func_append newdlprefiles " $dir/$linklib" ++ else ++ func_append newdlprefiles " $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ func_append dlpreconveniencelibs " $dir/$old_library" ++ fi ++ ;; ++ * ) ++ # Prefer using a static library (so that no silly _DYNAMIC symbols ++ # are required to link). ++ if test -n "$old_library"; then ++ func_append newdlprefiles " $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ func_append dlpreconveniencelibs " $dir/$old_library" ++ # Otherwise, use the dlname, so that lt_dlopen finds it. ++ elif test -n "$dlname"; then ++ func_append newdlprefiles " $dir/$dlname" ++ else ++ func_append newdlprefiles " $dir/$linklib" ++ fi ++ ;; ++ esac

• fi # $pass = dlpreopen
• if test -z "$libdir"; then

+@@ -5684,7 +6593,7 @@ func_mode_link ()

• if test "$linkmode" = prog && test "$pass" != link; then

+- newlib_search_path="$newlib_search_path $ladir" ++ func_append newlib_search_path " $ladir"

•  deplibs="$lib $deplibs"
  

•  linkalldeplibs=no
  

+@@ -5697,7 +6606,8 @@ func_mode_link ()

•  for deplib in $dependency_libs; do
  

•    case $deplib in
  

•    -L*) func_stripname '-L' '' "$deplib"
  

+- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result"

•  ;;
  

•    esac
  

•    # Need to link against all dependency_libs?
  

+@@ -5708,12 +6618,12 @@ func_mode_link ()

•      # or/and link against static libraries
  

•      newdependency_libs="$deplib $newdependency_libs"
  

•    fi
  

+- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then

•      case "$tmp_libs " in
  

+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;;

•      esac
  

•    fi
  

+- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $deplib"

•  done # for deplib
  

•  continue
  

• fi # $linkmode = prog...

+@@ -5728,7 +6638,7 @@ func_mode_link ()

•      # Make sure the rpath contains only unique directories.
  

•      case "$temp_rpath:" in
  

•      *"$absdir:"*) ;;
  

+- *) temp_rpath="$temp_rpath$absdir:" ;; ++ *) func_append temp_rpath "$absdir:" ;;

•      esac
  

•    fi
  

+@@ -5740,7 +6650,7 @@ func_mode_link ()

•    *)
  

•      case "$compile_rpath " in
  

•      *" $absdir "*) ;;
  

+- *) compile_rpath="$compile_rpath $absdir" ++ *) func_append compile_rpath " $absdir" ;;

•      esac
  

•      ;;
  

•    esac
  

+@@ -5749,7 +6659,7 @@ func_mode_link ()

•    *)
  

•      case "$finalize_rpath " in
  

•      *" $libdir "*) ;;
  

+- *) finalize_rpath="$finalize_rpath $libdir" ++ *) func_append finalize_rpath " $libdir" ;;

•      esac
  

•      ;;
  

•    esac
  

+@@ -5774,12 +6684,12 @@ func_mode_link ()

•  case $host in
  

•  *cygwin* | *mingw* | *cegcc*)
  

•      # No point in relinking DLLs because paths are not encoded
  

+- notinst_deplibs="$notinst_deplibs $lib" ++ func_append notinst_deplibs " $lib"

•      need_relink=no
  

•    ;;
  

•  *)
  

•    if test "$installed" = no; then
  

+- notinst_deplibs="$notinst_deplibs $lib" ++ func_append notinst_deplibs " $lib"

•      need_relink=yes
  

•    fi
  

•    ;;
  

+@@ -5814,7 +6724,7 @@ func_mode_link ()

•    *)
  

•      case "$compile_rpath " in
  

•      *" $absdir "*) ;;
  

+- *) compile_rpath="$compile_rpath $absdir" ++ *) func_append compile_rpath " $absdir" ;;

•      esac
  

•      ;;
  

•    esac
  

+@@ -5823,7 +6733,7 @@ func_mode_link ()

•    *)
  

•      case "$finalize_rpath " in
  

•      *" $libdir "*) ;;
  

+- *) finalize_rpath="$finalize_rpath $libdir" ++ *) func_append finalize_rpath " $libdir" ;;

•      esac
  

•      ;;
  

•    esac
  

+@@ -5835,7 +6745,7 @@ func_mode_link ()

•    shift
  

•    realname="$1"
  

•    shift
  

+- eval "libname="$libname_spec"" ++ libname=`eval "\$ECHO "$libname_spec""`

•    # use dlname if we got it. it's perfectly good, no?
  

•    if test -n "$dlname"; then
  

•      soname="$dlname"
  

+@@ -5848,7 +6758,7 @@ func_mode_link ()

• versuffix="-$major"
  

• ;;
  

•      esac
  

+- eval "soname="$soname_spec"" ++ eval soname="$soname_spec"

•    else
  

•      soname="$realname"
  

•    fi
  

+@@ -5877,7 +6787,7 @@ func_mode_link ()

•    linklib=$newlib
  

•  fi # test -n "$old_archive_from_expsyms_cmds"
  

+- if test "$linkmode" = prog || test "$mode" != relink; then ++ if test "$linkmode" = prog || test "$opt_mode" != relink; then

•    add_shlibpath=
  

•    add_dir=
  

•    add=
  

+@@ -5933,7 +6843,7 @@ func_mode_link ()

• if test -n "$inst_prefix_dir"; then
  

•   case $libdir in
  

•     [\\/]*)
  

+- add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ func_append add_dir " -L$inst_prefix_dir$libdir"

•       ;;
  

•   esac
  

• fi
  

+@@ -5955,7 +6865,7 @@ func_mode_link ()

•    if test -n "$add_shlibpath"; then
  

•      case :$compile_shlibpath: in
  

•      *":$add_shlibpath:"*) ;;
  

+- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; ++ *) func_append compile_shlibpath "$add_shlibpath:" ;;

•      esac
  

•    fi
  

•    if test "$linkmode" = prog; then
  

+@@ -5969,13 +6879,13 @@ func_mode_link ()

•  test "$hardcode_shlibpath_var" = yes; then
  

• case :$finalize_shlibpath: in
  

• *":$libdir:"*) ;;
  

+- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ *) func_append finalize_shlibpath "$libdir:" ;;

• esac
  

•      fi
  

•    fi
  

•  fi
  

+- if test "$linkmode" = prog || test "$mode" = relink; then ++ if test "$linkmode" = prog || test "$opt_mode" = relink; then

•    add_shlibpath=
  

•    add_dir=
  

•    add=
  

+@@ -5989,7 +6899,7 @@ func_mode_link ()

•    elif test "$hardcode_shlibpath_var" = yes; then
  

•      case :$finalize_shlibpath: in
  

•      *":$libdir:"*) ;;
  

+- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ *) func_append finalize_shlibpath "$libdir:" ;;

•      esac
  

•      add="-l$name"
  

•    elif test "$hardcode_automatic" = yes; then
  

+@@ -6001,12 +6911,12 @@ func_mode_link ()

•      fi
  

•    else
  

•      # We cannot seem to hardcode it, guess we'll fake it.
  

+- add_dir="-L$libdir" ++ add_dir="-L$lt_sysroot$libdir"

•      # Try looking first in the location we're being installed to.
  

•      if test -n "$inst_prefix_dir"; then
  

• case $libdir in
  

•   [\\/]*)
  

+- add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ func_append add_dir " -L$inst_prefix_dir$libdir"

•     ;;
  

• esac
  

•      fi
  

+@@ -6083,27 +6993,33 @@ func_mode_link ()

•           temp_xrpath=$func_stripname_result
  

•    case " $xrpath " in
  

•    *" $temp_xrpath "*) ;;
  

+- *) xrpath="$xrpath $temp_xrpath";; ++ *) func_append xrpath " $temp_xrpath";;

•    esac;;
  

+- *) temp_deplibs="$temp_deplibs $libdir";; ++ *) func_append temp_deplibs " $libdir";;

•      esac
  

•    done
  

•    dependency_libs="$temp_deplibs"
  

•  fi
  

+- newlib_search_path="$newlib_search_path $absdir" ++ func_append newlib_search_path " $absdir"

•  # Link against this library
  

•  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
  

•  # ... and its dependency_libs
  

•  tmp_libs=
  

•  for deplib in $dependency_libs; do
  

•    newdependency_libs="$deplib $newdependency_libs"
  

+- if $opt_duplicate_deps ; then ++ case $deplib in ++ -L*) func_stripname '-L' '' "$deplib" ++ func_resolve_sysroot "$func_stripname_result";; ++ *) func_resolve_sysroot "$deplib" ;; ++ esac ++ if $opt_preserve_dup_deps ; then

•      case "$tmp_libs " in
  

+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $func_resolve_sysroot_result "*) ++ func_append specialdeplibs " $func_resolve_sysroot_result" ;;

•      esac
  

•    fi
  

+- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $func_resolve_sysroot_result"

•  done
  

•  if test "$link_all_deplibs" != no; then
  

+@@ -6113,8 +7029,10 @@ func_mode_link ()

•      case $deplib in
  

•      -L*) path="$deplib" ;;
  

•      *.la)
  

++ func_resolve_sysroot "$deplib" ++ deplib=$func_resolve_sysroot_result

•        func_dirname "$deplib" "" "."
  

+- dir="$func_dirname_result" ++ dir=$func_dirname_result

• # We need an absolute path.
  

• case $dir in
  

• [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
  

+@@ -6130,7 +7048,7 @@ func_mode_link ()

• case $host in
  

• *-*-darwin*)
  

•   depdepl=
  

+- deplibrary_names=`${SED} -n -e 's/^library_names=(.*)$/\1/p' $deplib` ++ eval deplibrary_names=`${SED} -n -e 's/^library_names=(.*)$/\1/p' $deplib`

•   if test -n "$deplibrary_names" ; then
  

•     for tmp in $deplibrary_names ; do
  

•       depdepl=$tmp
  

+@@ -6141,8 +7059,8 @@ func_mode_link ()

•                   if test -z "$darwin_install_name"; then
  

•                       darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
  

•                   fi
  

+- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" +- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" ++ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" ++ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"

•       path=
  

•     fi
  

•   fi
  

+@@ -6152,7 +7070,7 @@ func_mode_link ()

•   ;;
  

• esac
  

• else
  

+- libdir=`${SED} -n -e 's/^libdir=(.*)$/\1/p' $deplib` ++ eval libdir=`${SED} -n -e 's/^libdir=(.*)$/\1/p' $deplib`

•   test -z "$libdir" && \
  

•     func_fatal_error "\`$deplib' is not a valid libtool archive"
  

•   test "$absdir" != "$libdir" && \
  

+@@ -6192,7 +7110,7 @@ func_mode_link ()

•  for dir in $newlib_search_path; do
  

•    case "$lib_search_path " in
  

•    *" $dir "*) ;;
  

+- *) lib_search_path="$lib_search_path $dir" ;; ++ *) func_append lib_search_path " $dir" ;;

•    esac
  

•  done
  

•  newlib_search_path=
  

+@@ -6205,7 +7123,7 @@ func_mode_link ()

• fi
• for var in $vars dependency_libs; do

•  # Add libraries to $var in reverse order
  

+- eval tmp_libs=$$var ++ eval tmp_libs="$$var"

•  new_libs=
  

•  for deplib in $tmp_libs; do
  

•    # FIXME: Pedantically, this is the right thing to do, so
  

+@@ -6250,13 +7168,13 @@ func_mode_link ()

•    -L*)
  

•      case " $tmp_libs " in
  

•      *" $deplib "*) ;;
  

+- *) tmp_libs="$tmp_libs $deplib" ;; ++ *) func_append tmp_libs " $deplib" ;;

•      esac
  

•      ;;
  

+- *) tmp_libs="$tmp_libs $deplib" ;; ++ *) func_append tmp_libs " $deplib" ;;

•    esac
  

•  done
  

+- eval $var=$tmp_libs ++ eval $var="$tmp_libs"

• done # for var

•   fi
  

•   # Last step: remove runtime libs from dependency_libs
  

+@@ -6269,7 +7187,7 @@ func_mode_link ()

•  ;;
  

• esac
• if test -n "$i" ; then

+- tmp_libs="$tmp_libs $i" ++ func_append tmp_libs " $i"

• fi

•   done
  

•   dependency_libs=$tmp_libs
  

+@@ -6310,7 +7228,7 @@ func_mode_link ()

•   # Now set the variables for building old libraries.
  

•   build_libtool_libs=no
  

•   oldlibs="$output"
  

+- objs="$objs$old_deplibs" ++ func_append objs "$old_deplibs"

•   ;;
  

• lib)
  

+@@ -6319,8 +7237,8 @@ func_mode_link ()

•   lib*)
  

• func_stripname 'lib' '.la' "$outputname"
• name=$func_stripname_result

+- eval "shared_ext="$shrext_cmds"" +- eval "libname="$libname_spec"" ++ eval shared_ext="$shrext_cmds" ++ eval libname="$libname_spec"

• ;;

•   *)
  

• test "$module" = no && \

+@@ -6330,8 +7248,8 @@ func_mode_link ()

•  # Add the "lib" prefix for modules if required
  

•  func_stripname '' '.la' "$outputname"
  

•  name=$func_stripname_result
  

+- eval "shared_ext="$shrext_cmds"" +- eval "libname="$libname_spec"" ++ eval shared_ext="$shrext_cmds" ++ eval libname="$libname_spec"

• else

•  func_stripname '' '.la' "$outputname"
  

•  libname=$func_stripname_result
  

+@@ -6346,7 +7264,7 @@ func_mode_link ()

•  echo
  

•  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
  

•  $ECHO "*** objects $objs is not portable!"
  

+- libobjs="$libobjs $objs" ++ func_append libobjs " $objs"

• fi

•   fi
  

+@@ -6544,7 +7462,7 @@ func_mode_link ()

•  done
  

•  # Make executables depend on our current version.
  

+- verstring="$verstring:${current}.0" ++ func_append verstring ":${current}.0"

•  ;;
  

• qnx)

+@@ -6612,10 +7530,10 @@ func_mode_link ()

•   fi
  

•   func_generate_dlsyms "$libname" "$libname" "yes"
  

+- libobjs="$libobjs $symfileobj" ++ func_append libobjs " $symfileobj"

•   test "X$libobjs" = "X " && libobjs=
  

+- if test "$mode" != relink; then ++ if test "$opt_mode" != relink; then

• # Remove our outputs, but don't remove object files since they
• # may have been created when compiling PIC objects.
• removelist=

+@@ -6631,7 +7549,7 @@ func_mode_link ()

•    continue
  

•  fi
  

•       fi
  

+- removelist="$removelist $p" ++ func_append removelist " $p"

•       ;;
  

•    *) ;;
  

•  esac
  

+@@ -6642,7 +7560,7 @@ func_mode_link ()

•   # Now set the variables for building old libraries.
  

•   if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
  

+- oldlibs="$oldlibs $output_objdir/$libname.$libext" ++ func_append oldlibs " $output_objdir/$libname.$libext"

• # Transform .lo files to .o files.
• oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/.${libext}$/d; $lo2o" | $NL2SP`

+@@ -6659,10 +7577,11 @@ func_mode_link ()

• # If the user specified any rpath flags, then add them.
• temp_xrpath=
• for libdir in $xrpath; do

+- temp_xrpath="$temp_xrpath -R$libdir" ++ func_replace_sysroot "$libdir" ++ func_append temp_xrpath " -R$func_replace_sysroot_result"

•  case "$finalize_rpath " in
  

•  *" $libdir "*) ;;
  

+- *) finalize_rpath="$finalize_rpath $libdir" ;; ++ *) func_append finalize_rpath " $libdir" ;;

•  esac
  

• done
• if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then

+@@ -6676,7 +7595,7 @@ func_mode_link ()

•   for lib in $old_dlfiles; do
  

• case " $dlprefiles $dlfiles " in
• *" $lib "*) ;;

+- *) dlfiles="$dlfiles $lib" ;; ++ *) func_append dlfiles " $lib" ;;

• esac

•   done
  

+@@ -6686,7 +7605,7 @@ func_mode_link ()

•   for lib in $old_dlprefiles; do
  

• case "$dlprefiles " in
• *" $lib "*) ;;

+- *) dlprefiles="$dlprefiles $lib" ;; ++ *) func_append dlprefiles " $lib" ;;

• esac

•   done
  

+@@ -6698,7 +7617,7 @@ func_mode_link ()

•    ;;
  

•  *-*-rhapsody* | *-*-darwin1.[012])
  

•    # Rhapsody C library is in the System framework
  

+- deplibs="$deplibs System.ltframework" ++ func_append deplibs " System.ltframework"

•    ;;
  

•  *-*-netbsd*)
  

•    # Don't link with libc until the a.out ld.so is fixed.
  

+@@ -6715,7 +7634,7 @@ func_mode_link ()

•  *)
  

•    # Add libc to deplibs on all other systems if necessary.
  

•    if test "$build_libtool_need_lc" = "yes"; then
  

+- deplibs="$deplibs -lc" ++ func_append deplibs " -lc"

•    fi
  

•    ;;
  

•  esac
  

+@@ -6764,18 +7683,18 @@ EOF

• if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
  

•   case " $predeps $postdeps " in
  

•   *" $i "*)
  

+- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i"

•     i=""
  

•     ;;
  

•   esac
  

• fi
  

• if test -n "$i" ; then
  

+- eval "libname="$libname_spec"" +- eval "deplib_matches="$library_names_spec"" ++ libname=`eval "\$ECHO "$libname_spec""` ++ deplib_matches=`eval "\$ECHO "$library_names_spec""`

•   set dummy $deplib_matches; shift
  

•   deplib_match=$1
  

•   if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
  

+- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i"

•   else
  

•     droppeddeps=yes
  

•     echo
  

+@@ -6789,7 +7708,7 @@ EOF

• fi
  

• ;;
  

•      *)
  

+- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i"

• ;;
  

•      esac
  

•    done
  

+@@ -6807,18 +7726,18 @@ EOF

•   if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
  

•     case " $predeps $postdeps " in
  

•     *" $i "*)
  

+- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i"

•       i=""
  

•       ;;
  

•     esac
  

•   fi
  

•   if test -n "$i" ; then
  

+- eval "libname="$libname_spec"" +- eval "deplib_matches="$library_names_spec"" ++ libname=`eval "\$ECHO "$libname_spec""` ++ deplib_matches=`eval "\$ECHO "$library_names_spec""`

•     set dummy $deplib_matches; shift
  

•     deplib_match=$1
  

•     if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
  

+- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i"

•     else
  

•       droppeddeps=yes
  

•       echo
  

+@@ -6840,7 +7759,7 @@ EOF

• fi
  

• ;;
  

•      *)
  

+- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i"

• ;;
  

•      esac
  

•    done
  

+@@ -6857,15 +7776,27 @@ EOF

•      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
  

• case " $predeps $postdeps " in
  

• *" $a_deplib "*)
  

+- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib"

•   a_deplib=""
  

•   ;;
  

• esac
  

•      fi
  

•      if test -n "$a_deplib" ; then
  

+- eval "libname="$libname_spec"" ++ libname=`eval "\$ECHO "$libname_spec""` ++ if test -n "$file_magic_glob"; then ++ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` ++ else ++ libnameglob=$libname ++ fi ++ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`

• for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
  

+- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` ++ if test "$want_nocaseglob" = yes; then ++ shopt -s nocaseglob ++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` ++ $nocaseglob ++ else ++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` ++ fi

•   for potent_lib in $potential_libs; do
  

•       # Follow soft links.
  

•       if ls -lLd "$potent_lib" 2>/dev/null |
  

+@@ -6885,10 +7816,10 @@ EOF

• 	*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
  

• 	esac
  

•       done
  

+- if eval "$file_magic_cmd "$potlib"" 2>/dev/null | ++ if eval $file_magic_cmd "$potlib" 2>/dev/null |

• 	 $SED -e 10q |
  

• 	 $EGREP "$file_magic_regex" > /dev/null; then
  

+- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib"

• 	a_deplib=""
  

• 	break 2
  

•       fi
  

+@@ -6913,7 +7844,7 @@ EOF

•      ;;
  

•    *)
  

•      # Add a -L argument.
  

+- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib"

•      ;;
  

•    esac
  

•  done # Gone through all deplibs.
  

+@@ -6929,20 +7860,20 @@ EOF

•      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
  

• case " $predeps $postdeps " in
  

• *" $a_deplib "*)
  

+- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib"

•   a_deplib=""
  

•   ;;
  

• esac
  

•      fi
  

•      if test -n "$a_deplib" ; then
  

+- eval "libname="$libname_spec"" ++ libname=`eval "\$ECHO "$libname_spec""`

• for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
  

•   potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
  

•   for potent_lib in $potential_libs; do
  

•     potlib="$potent_lib" # see symlink-check above in file_magic test
  

•     if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
  

•        $EGREP "$match_pattern_regex" > /dev/null; then
  

+- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib"

•       a_deplib=""
  

•       break 2
  

•     fi
  

+@@ -6967,7 +7898,7 @@ EOF

•      ;;
  

•    *)
  

•      # Add a -L argument.
  

+- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib"

•      ;;
  

•    esac
  

•  done # Gone through all deplibs.
  

+@@ -7071,7 +8002,7 @@ EOF

• *)

•  case " $deplibs " in
  

•  *" -L$path/$objdir "*)
  

+- new_libs="$new_libs -L$path/$objdir" ;; ++ func_append new_libs " -L$path/$objdir" ;;

•  esac
  

•  ;;
  

• esac

+@@ -7081,10 +8012,10 @@ EOF

• -L*)

•  case " $new_libs " in
  

•  *" $deplib "*) ;;
  

+- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;;

•  esac
  

•  ;;
  

+- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;;

• esac

•   done
  

•   deplibs="$new_libs"
  

+@@ -7101,10 +8032,12 @@ EOF

•  hardcode_libdirs=
  

•  dep_rpath=
  

•  rpath="$finalize_rpath"
  

+- test "$mode" != relink && rpath="$compile_rpath$rpath" ++ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"

•  for libdir in $rpath; do
  

•    if test -n "$hardcode_libdir_flag_spec"; then
  

•      if test -n "$hardcode_libdir_separator"; then
  

++ func_replace_sysroot "$libdir" ++ libdir=$func_replace_sysroot_result

• if test -z "$hardcode_libdirs"; then
  

•   hardcode_libdirs="$libdir"
  

• else
  

+@@ -7113,18 +8046,18 @@ EOF

•   *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
  

•     ;;
  

•   *)
  

+- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"

•     ;;
  

•   esac
  

• fi
  

•      else
  

+- eval "flag="$hardcode_libdir_flag_spec"" +- dep_rpath="$dep_rpath $flag" ++ eval flag="$hardcode_libdir_flag_spec" ++ func_append dep_rpath " $flag"

•      fi
  

•    elif test -n "$runpath_var"; then
  

•      case "$perm_rpath " in
  

•      *" $libdir "*) ;;
  

+- *) perm_rpath="$perm_rpath $libdir" ;; ++ *) func_append perm_rpath " $libdir" ;;

•      esac
  

•    fi
  

•  done
  

+@@ -7133,40 +8066,38 @@ EOF

•     test -n "$hardcode_libdirs"; then
  

•    libdir="$hardcode_libdirs"
  

•    if test -n "$hardcode_libdir_flag_spec_ld"; then
  

+- eval "dep_rpath="$hardcode_libdir_flag_spec_ld"" ++ eval dep_rpath="$hardcode_libdir_flag_spec_ld"

•    else
  

+- eval "dep_rpath="$hardcode_libdir_flag_spec"" ++ eval dep_rpath="$hardcode_libdir_flag_spec"

•    fi
  

•  fi
  

•  if test -n "$runpath_var" && test -n "$perm_rpath"; then
  

•    # We should set the runpath_var.
  

•    rpath=
  

•    for dir in $perm_rpath; do
  

+- rpath="$rpath$dir:" ++ func_append rpath "$dir:"

•    done
  

+- eval $runpath_var=$rpath$$runpath_var +- export $runpath_var ++ eval "$runpath_var='$rpath$$runpath_var'; export $runpath_var"

•  fi
  

•  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
  

• fi
• shlibpath="$finalize_shlibpath"

+- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" ++ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"

• if test -n "$shlibpath"; then

+- eval $shlibpath_var=$shlibpath$$shlibpath_var +- export $shlibpath_var ++ eval "$shlibpath_var='$shlibpath$$shlibpath_var'; export $shlibpath_var"

• fi
• # Get the real and link names of the library.

+- eval "shared_ext="$shrext_cmds"" +- eval "library_names="$library_names_spec"" ++ eval shared_ext="$shrext_cmds" ++ eval library_names="$library_names_spec"

• set dummy $library_names
• shift
• realname="$1"
• shift
• if test -n "$soname_spec"; then

+- eval "soname="$soname_spec"" ++ eval soname="$soname_spec"

• else

•  soname="$realname"
  

• fi

+@@ -7178,7 +8109,7 @@ EOF

• linknames=
• for link
• do

+- linknames="$linknames $link" ++ func_append linknames " $link"

• done
• # Use standard objects if they are pic

+@@ -7189,7 +8120,7 @@ EOF

• if test -n "$export_symbols" && test -n "$include_expsyms"; then

•  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
  

•  export_symbols="$output_objdir/$libname.uexp"
  

+- delfiles="$delfiles $export_symbols" ++ func_append delfiles " $export_symbols"

• fi
• orig_export_symbols=

+@@ -7220,13 +8151,45 @@ EOF

•    $opt_dry_run || $RM $export_symbols
  

•    cmds=$export_symbols_cmds
  

•    save_ifs="$IFS"; IFS='~'
  

+- for cmd in $cmds; do ++ for cmd1 in $cmds; do

•      IFS="$save_ifs"
  

+- eval "cmd="$cmd"" +- func_len " $cmd" +- len=$func_len_result +- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ # Take the normal branch if the nm_file_list_spec branch ++ # doesn't work or if tool conversion is not needed. ++ case $nm_file_list_spec~$to_tool_file_cmd in ++ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) ++ try_normal_branch=yes ++ eval cmd="$cmd1" ++ func_len " $cmd" ++ len=$func_len_result ++ ;; ++ *) ++ try_normal_branch=no ++ ;; ++ esac ++ if test "$try_normal_branch" = yes \ ++ && { test "$len" -lt "$max_cmd_len" \ ++ || test "$max_cmd_len" -le -1; } ++ then ++ func_show_eval "$cmd" 'exit $?' ++ skipped_export=false ++ elif test -n "$nm_file_list_spec"; then ++ func_basename "$output" ++ output_la=$func_basename_result ++ save_libobjs=$libobjs ++ save_output=$output ++ output=${output_objdir}/${output_la}.nm ++ func_to_tool_file "$output" ++ libobjs=$nm_file_list_spec$func_to_tool_file_result ++ func_append delfiles " $output" ++ func_verbose "creating $NM input file list: $output" ++ for obj in $save_libobjs; do ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" ++ done > "$output" ++ eval cmd="$cmd1"

• func_show_eval "$cmd" 'exit $?'
  

++ output=$save_output ++ libobjs=$save_libobjs

• skipped_export=false
  

•      else
  

• # The command line is too long to execute in one step.
  

+@@ -7248,7 +8211,7 @@ EOF

• if test -n "$export_symbols" && test -n "$include_expsyms"; then

•  tmp_export_symbols="$export_symbols"
  

•  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
  

+- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" ++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'

• fi
• if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then

+@@ -7260,7 +8223,7 @@ EOF

•  # global variables. join(1) would be nice here, but unfortunately
  

•  # isn't a blessed tool.
  

•  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
  

+- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ func_append delfiles " $export_symbols $output_objdir/$libname.filter"

•  export_symbols=$output_objdir/$libname.def
  

•  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
  

• fi

+@@ -7270,7 +8233,7 @@ EOF

•  case " $convenience " in
  

•  *" $test_deplib "*) ;;
  

•  *)
  

+- tmp_deplibs="$tmp_deplibs $test_deplib" ++ func_append tmp_deplibs " $test_deplib"

•    ;;
  

•  esac
  

• done

+@@ -7286,43 +8249,43 @@ EOF

•  fi
  

•  if test -n "$whole_archive_flag_spec"; then
  

•    save_libobjs=$libobjs
  

+- eval "libobjs="$libobjs $whole_archive_flag_spec"" ++ eval libobjs="$libobjs $whole_archive_flag_spec"

•    test "X$libobjs" = "X " && libobjs=
  

•  else
  

•    gentop="$output_objdir/${outputname}x"
  

+- generated="$generated $gentop" ++ func_append generated " $gentop"

•    func_extract_archives $gentop $convenience
  

+- libobjs="$libobjs $func_extract_archives_result" ++ func_append libobjs " $func_extract_archives_result"

•    test "X$libobjs" = "X " && libobjs=
  

•  fi
  

• fi
• if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then

+- eval "flag="$thread_safe_flag_spec"" +- linker_flags="$linker_flags $flag" ++ eval flag="$thread_safe_flag_spec" ++ func_append linker_flags " $flag"

• fi
• # Make a backup of the uninstalled library when relinking

+- if test "$mode" = relink; then +- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? ++ if test "$opt_mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?

• fi
• # Do each of the archive commands.
• if test "$module" = yes && test -n "$module_cmds" ; then

•  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
  

+- eval "test_cmds="$module_expsym_cmds"" ++ eval test_cmds="$module_expsym_cmds"

•    cmds=$module_expsym_cmds
  

•  else
  

+- eval "test_cmds="$module_cmds"" ++ eval test_cmds="$module_cmds"

•    cmds=$module_cmds
  

•  fi
  

• else

•  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
  

+- eval "test_cmds="$archive_expsym_cmds"" ++ eval test_cmds="$archive_expsym_cmds"

•    cmds=$archive_expsym_cmds
  

•  else
  

+- eval "test_cmds="$archive_cmds"" ++ eval test_cmds="$archive_cmds"

•    cmds=$archive_cmds
  

•  fi
  

• fi

+@@ -7366,10 +8329,13 @@ EOF

•    echo 'INPUT (' > $output
  

•    for obj in $save_libobjs
  

•    do
  

+- $ECHO "$obj" >> $output ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" >> $output

•    done
  

•    echo ')' >> $output
  

+- delfiles="$delfiles $output" ++ func_append delfiles " $output" ++ func_to_tool_file "$output" ++ output=$func_to_tool_file_result

•  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
  

•    output=${output_objdir}/${output_la}.lnk
  

•    func_verbose "creating linker input file list: $output"
  

+@@ -7383,15 +8349,17 @@ EOF

•    fi
  

•    for obj
  

•    do
  

+- $ECHO "$obj" >> $output ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" >> $output

•    done
  

+- delfiles="$delfiles $output" +- output=$firstobj"$file_list_spec$output" ++ func_append delfiles " $output" ++ func_to_tool_file "$output" ++ output=$firstobj"$file_list_spec$func_to_tool_file_result"

•  else
  

•    if test -n "$save_libobjs"; then
  

•      func_verbose "creating reloadable object files..."
  

•      output=$output_objdir/$output_la-${k}.$objext
  

+- eval "test_cmds="$reload_cmds"" ++ eval test_cmds="$reload_cmds"

•      func_len " $test_cmds"
  

•      len0=$func_len_result
  

•      len=$len0
  

+@@ -7411,12 +8379,12 @@ EOF

•   if test "$k" -eq 1 ; then
  

•     # The first file doesn't have a previous command to add.
  

•     reload_objs=$objlist
  

+- eval "concat_cmds="$reload_cmds"" ++ eval concat_cmds="$reload_cmds"

•   else
  

•     # All subsequent reloadable object files will link in
  

•     # the last one created.
  

•     reload_objs="$objlist $last_robj"
  

+- eval "concat_cmds="$concat_cmds~$reload_cmds~$RM $last_robj"" ++ eval concat_cmds="$concat_cmds~$reload_cmds~$RM $last_robj"

•   fi
  

•   last_robj=$output_objdir/$output_la-${k}.$objext
  

•   func_arith $k + 1
  

+@@ -7433,11 +8401,11 @@ EOF

•      # files will link in the last one created.
  

•      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
  

•      reload_objs="$objlist $last_robj"
  

+- eval "concat_cmds="${concat_cmds}$reload_cmds"" ++ eval concat_cmds="${concat_cmds}$reload_cmds"

•      if test -n "$last_robj"; then
  

+- eval "concat_cmds="${concat_cmds}~$RM $last_robj"" ++ eval concat_cmds="${concat_cmds}~$RM $last_robj"

•      fi
  

+- delfiles="$delfiles $output" ++ func_append delfiles " $output"

•    else
  

•      output=
  

+@@ -7450,9 +8418,9 @@ EOF

•      libobjs=$output
  

•      # Append the command to create the export file.
  

•      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
  

+- eval "concat_cmds="$concat_cmds$export_symbols_cmds"" ++ eval concat_cmds="$concat_cmds$export_symbols_cmds"

•      if test -n "$last_robj"; then
  

+- eval "concat_cmds="$concat_cmds~$RM $last_robj"" ++ eval concat_cmds="$concat_cmds~$RM $last_robj"

•      fi
  

•    fi
  

+@@ -7471,7 +8439,7 @@ EOF

• lt_exit=$?
  

• # Restore the uninstalled library and exit
  

+- if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then

•   ( cd "$output_objdir" && \
  

•     $RM "${realname}T" && \
  

•     $MV "${realname}U" "$realname" )
  

+@@ -7492,7 +8460,7 @@ EOF

•    if test -n "$export_symbols" && test -n "$include_expsyms"; then
  

•      tmp_export_symbols="$export_symbols"
  

•      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
  

+- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" ++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'

•    fi
  

•    if test -n "$orig_export_symbols"; then
  

+@@ -7504,7 +8472,7 @@ EOF

•      # global variables. join(1) would be nice here, but unfortunately
  

•      # isn't a blessed tool.
  

•      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
  

+- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ func_append delfiles " $export_symbols $output_objdir/$libname.filter"

•      export_symbols=$output_objdir/$libname.def
  

•      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
  

•    fi
  

+@@ -7515,7 +8483,7 @@ EOF

•  output=$save_output
  

•  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
  

+- eval "libobjs="$libobjs $whole_archive_flag_spec"" ++ eval libobjs="$libobjs $whole_archive_flag_spec"

•    test "X$libobjs" = "X " && libobjs=
  

•  fi
  

•  # Expand the library linking commands again to reset the
  

+@@ -7539,23 +8507,23 @@ EOF

• if test -n "$delfiles"; then

•  # Append the command to remove temporary files to $cmds.
  

+- eval "cmds="$cmds~$RM $delfiles"" ++ eval cmds="$cmds~$RM $delfiles"

• fi
• # Add any objects from preloaded convenience libraries
• if test -n "$dlprefiles"; then

•  gentop="$output_objdir/${outputname}x"
  

+- generated="$generated $gentop" ++ func_append generated " $gentop"

•  func_extract_archives $gentop $dlprefiles
  

+- libobjs="$libobjs $func_extract_archives_result" ++ func_append libobjs " $func_extract_archives_result"

•  test "X$libobjs" = "X " && libobjs=
  

• fi
• save_ifs="$IFS"; IFS='~'
• for cmd in $cmds; do

•  IFS="$save_ifs"
  

+- eval "cmd="$cmd"" ++ eval cmd="$cmd"

•  $opt_silent || {
  

•    func_quote_for_expand "$cmd"
  

•    eval "func_echo $func_quote_for_expand_result"
  

+@@ -7564,7 +8532,7 @@ EOF

•    lt_exit=$?
  

•    # Restore the uninstalled library and exit
  

+- if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then

•      ( cd "$output_objdir" && \
  

•        $RM "${realname}T" && \
  

• $MV "${realname}U" "$realname" )
  

+@@ -7576,8 +8544,8 @@ EOF

• IFS="$save_ifs"
• # Restore the uninstalled library and exit

+- if test "$mode" = relink; then +- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? ++ if test "$opt_mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?

•  if test -n "$convenience"; then
  

•    if test -z "$whole_archive_flag_spec"; then
  

+@@ -7656,17 +8624,20 @@ EOF

•   if test -n "$convenience"; then
  

• if test -n "$whole_archive_flag_spec"; then

+- eval "tmp_whole_archive_flags="$whole_archive_flag_spec"" ++ eval tmp_whole_archive_flags="$whole_archive_flag_spec"

•  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
  

• else

•  gentop="$output_objdir/${obj}x"
  

+- generated="$generated $gentop" ++ func_append generated " $gentop"

•  func_extract_archives $gentop $convenience
  

•  reload_conv_objs="$reload_objs $func_extract_archives_result"
  

• fi

•   fi
  

++ # If we're not building shared, we need to use non_pic_objs ++ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" ++

•   # Create the old-style object.
  

•   reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
  

+@@ -7690,7 +8661,7 @@ EOF

• # Create an invalid libtool object if no PIC, so that we don't
• # accidentally link it into a program.
• # $show "echo timestamp > $libobj"

+- # $opt_dry_run || echo timestamp > $libobj || exit $? ++ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?

• exit $EXIT_SUCCESS

•   fi
  

+@@ -7740,8 +8711,8 @@ EOF

• if test "$tagname" = CXX ; then

•  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
  

•    10.[0123])
  

+- compile_command="$compile_command ${wl}-bind_at_load" +- finalize_command="$finalize_command ${wl}-bind_at_load" ++ func_append compile_command " ${wl}-bind_at_load" ++ func_append finalize_command " ${wl}-bind_at_load"

•    ;;
  

•  esac
  

• fi

+@@ -7761,7 +8732,7 @@ EOF

• *)

•  case " $compile_deplibs " in
  

•  *" -L$path/$objdir "*)
  

+- new_libs="$new_libs -L$path/$objdir" ;; ++ func_append new_libs " -L$path/$objdir" ;;

•  esac
  

•  ;;
  

• esac

+@@ -7771,17 +8742,17 @@ EOF

• -L*)

•  case " $new_libs " in
  

•  *" $deplib "*) ;;
  

+- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;;

•  esac
  

•  ;;
  

+- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;;

• esac

•   done
  

•   compile_deplibs="$new_libs"
  

+- compile_command="$compile_command $compile_deplibs" +- finalize_command="$finalize_command $finalize_deplibs" ++ func_append compile_command " $compile_deplibs" ++ func_append finalize_command " $finalize_deplibs"

•   if test -n "$rpath$xrpath"; then
  

• # If the user specified any rpath flags, then add them.

+@@ -7789,7 +8760,7 @@ EOF

•  # This is the magic to use -rpath.
  

•  case "$finalize_rpath " in
  

•  *" $libdir "*) ;;
  

+- *) finalize_rpath="$finalize_rpath $libdir" ;; ++ *) func_append finalize_rpath " $libdir" ;;

•  esac
  

• done

•   fi
  

+@@ -7808,18 +8779,18 @@ EOF

•      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
  

• ;;
  

•      *)
  

+- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"

• ;;
  

•      esac
  

•    fi
  

•  else
  

+- eval "flag="$hardcode_libdir_flag_spec"" +- rpath="$rpath $flag" ++ eval flag="$hardcode_libdir_flag_spec" ++ func_append rpath " $flag"

•  fi
  

• elif test -n "$runpath_var"; then

•  case "$perm_rpath " in
  

•  *" $libdir "*) ;;
  

+- *) perm_rpath="$perm_rpath $libdir" ;; ++ *) func_append perm_rpath " $libdir" ;;

•  esac
  

• fi
• case $host in

+@@ -7828,12 +8799,12 @@ EOF

•  case :$dllsearchpath: in
  

•  *":$libdir:"*) ;;
  

•  ::) dllsearchpath=$libdir;;
  

+- *) dllsearchpath="$dllsearchpath:$libdir";; ++ *) func_append dllsearchpath ":$libdir";;

•  esac
  

•  case :$dllsearchpath: in
  

•  *":$testbindir:"*) ;;
  

•  ::) dllsearchpath=$testbindir;;
  

+- *) dllsearchpath="$dllsearchpath:$testbindir";; ++ *) func_append dllsearchpath ":$testbindir";;

•  esac
  

•  ;;
  

• esac

+@@ -7842,7 +8813,7 @@ EOF

•   if test -n "$hardcode_libdir_separator" &&
  

• test -n "$hardcode_libdirs"; then
  

• libdir="$hardcode_libdirs"

+- eval "rpath=" $hardcode_libdir_flag_spec"" ++ eval rpath=" $hardcode_libdir_flag_spec"

•   fi
  

•   compile_rpath="$rpath"
  

+@@ -7859,18 +8830,18 @@ EOF

•      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
  

• ;;
  

•      *)
  

+- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"

• ;;
  

•      esac
  

•    fi
  

•  else
  

+- eval "flag="$hardcode_libdir_flag_spec"" +- rpath="$rpath $flag" ++ eval flag="$hardcode_libdir_flag_spec" ++ func_append rpath " $flag"

•  fi
  

• elif test -n "$runpath_var"; then

•  case "$finalize_perm_rpath " in
  

•  *" $libdir "*) ;;
  

+- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; ++ *) func_append finalize_perm_rpath " $libdir" ;;

•  esac
  

• fi

•   done
  

+@@ -7878,7 +8849,7 @@ EOF

•   if test -n "$hardcode_libdir_separator" &&
  

• test -n "$hardcode_libdirs"; then
  

• libdir="$hardcode_libdirs"

+- eval "rpath=" $hardcode_libdir_flag_spec"" ++ eval rpath=" $hardcode_libdir_flag_spec"

•   fi
  

•   finalize_rpath="$rpath"
  

+@@ -7921,6 +8892,12 @@ EOF

• exit_status=0
• func_show_eval "$link_command" 'exit_status=$?'

++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++

• # Delete the generated files.
• if test -f "$output_objdir/${outputname}S.${objext}"; then

•  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
  

+@@ -7943,7 +8920,7 @@ EOF

•  # We should set the runpath_var.
  

•  rpath=
  

•  for dir in $perm_rpath; do
  

+- rpath="$rpath$dir:" ++ func_append rpath "$dir:"

•  done
  

•  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
  

• fi

+@@ -7951,7 +8928,7 @@ EOF

•  # We should set the runpath_var.
  

•  rpath=
  

•  for dir in $finalize_perm_rpath; do
  

+- rpath="$rpath$dir:" ++ func_append rpath "$dir:"

•  done
  

•  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
  

• fi

+@@ -7966,6 +8943,13 @@ EOF

• $opt_dry_run || $RM $output
• # Link the executable and exit
• func_show_eval "$link_command" 'exit $?'

++ ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++

• exit $EXIT_SUCCESS

•   fi
  

+@@ -7999,6 +8983,12 @@ EOF

•   func_show_eval "$link_command" 'exit $?'
  

++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output_objdir/$outputname" ++ 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'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++

•   # Now create the wrapper script.
  

•   func_verbose "creating $output"
  

+@@ -8096,7 +9086,7 @@ EOF

• else

•  oldobjs="$old_deplibs $non_pic_objects"
  

•  if test "$preload" = yes && test -f "$symfileobj"; then
  

+- oldobjs="$oldobjs $symfileobj" ++ func_append oldobjs " $symfileobj"

•  fi
  

• fi
• addlibs="$old_convenience"

+@@ -8104,10 +9094,10 @@ EOF

•   if test -n "$addlibs"; then
  

• gentop="$output_objdir/${outputname}x"

+- generated="$generated $gentop" ++ func_append generated " $gentop"

• func_extract_archives $gentop $addlibs

+- oldobjs="$oldobjs $func_extract_archives_result" ++ func_append oldobjs " $func_extract_archives_result"

•   fi
  

•   # Do each command in the archive commands.
  

+@@ -8118,10 +9108,10 @@ EOF

• # Add any objects from preloaded convenience libraries
• if test -n "$dlprefiles"; then

•  gentop="$output_objdir/${outputname}x"
  

+- generated="$generated $gentop" ++ func_append generated " $gentop"

•  func_extract_archives $gentop $dlprefiles
  

+- oldobjs="$oldobjs $func_extract_archives_result" ++ func_append oldobjs " $func_extract_archives_result"

• fi
• # POSIX demands no paths to be encoded in archives. We have

+@@ -8139,7 +9129,7 @@ EOF

• else

•  echo "copying selected object files to avoid basename conflicts..."
  

•  gentop="$output_objdir/${outputname}x"
  

+- generated="$generated $gentop" ++ func_append generated " $gentop"

•  func_mkdir_p "$gentop"
  

•  save_oldobjs=$oldobjs
  

•  oldobjs=
  

+@@ -8163,18 +9153,28 @@ EOF

• esac
  

•      done
  

•      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
  

+- oldobjs="$oldobjs $gentop/$newobj" ++ func_append oldobjs " $gentop/$newobj"

•      ;;
  

+- *) oldobjs="$oldobjs $obj" ;; ++ *) func_append oldobjs " $obj" ;;

•    esac
  

•  done
  

• fi

+- eval "cmds="$old_archive_cmds"" ++ eval cmds="$old_archive_cmds"

• func_len " $cmds"
• len=$func_len_result
• if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then

•  cmds=$old_archive_cmds
  

++ elif test -n "$archiver_list_spec"; then ++ func_verbose "using command file archive linking..." ++ for obj in $oldobjs ++ do ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" ++ done > $output_objdir/$libname.libcmd ++ func_to_tool_file "$output_objdir/$libname.libcmd" ++ oldobjs=" $archiver_list_spec$func_to_tool_file_result" ++ cmds=$old_archive_cmds

• else

•  # the command line is too long to link in one step, link in parts
  

•  func_verbose "using piecewise archive linking..."
  

+@@ -8189,7 +9189,7 @@ EOF

•  do
  

•    last_oldobj=$obj
  

•  done
  

+- eval "test_cmds="$old_archive_cmds"" ++ eval test_cmds="$old_archive_cmds"

•  func_len " $test_cmds"
  

•  len0=$func_len_result
  

•  len=$len0
  

+@@ -8208,7 +9208,7 @@ EOF

• RANLIB=$save_RANLIB
  

•      fi
  

•      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
  

+- eval "concat_cmds="${concat_cmds}$old_archive_cmds"" ++ eval concat_cmds="${concat_cmds}$old_archive_cmds"

•      objlist=
  

•      len=$len0
  

•    fi
  

+@@ -8216,9 +9216,9 @@ EOF

•  RANLIB=$save_RANLIB
  

•  oldobjs=$objlist
  

•  if test "X$oldobjs" = "X" ; then
  

+- eval "cmds="$concat_cmds"" ++ eval cmds="$concat_cmds"

•  else
  

+- eval "cmds="$concat_cmds~$old_archive_cmds"" ++ eval cmds="$concat_cmds~$old_archive_cmds"

•  fi
  

• fi

•   fi
  

+@@ -8268,12 +9268,23 @@ EOF

•      *.la)
  

• func_basename "$deplib"
  

• name="$func_basename_result"
  

+- libdir=`${SED} -n -e 's/^libdir=(.*)$/\1/p' $deplib` ++ func_resolve_sysroot "$deplib" ++ eval libdir=`${SED} -n -e 's/^libdir=(.*)$/\1/p' $func_resolve_sysroot_result`

• test -z "$libdir" && \
  

•   func_fatal_error "\`$deplib' is not a valid libtool archive"
  

+- newdependency_libs="$newdependency_libs $libdir/$name" ++ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ++ ;; ++ -L*) ++ func_stripname -L '' "$deplib" ++ func_replace_sysroot "$func_stripname_result" ++ func_append newdependency_libs " -L$func_replace_sysroot_result"

• ;;
  

+- *) newdependency_libs="$newdependency_libs $deplib" ;; ++ -R*) ++ func_stripname -R '' "$deplib" ++ func_replace_sysroot "$func_stripname_result" ++ func_append newdependency_libs " -R$func_replace_sysroot_result" ++ ;; ++ *) func_append newdependency_libs " $deplib" ;;

•      esac
  

•    done
  

•    dependency_libs="$newdependency_libs"
  

+@@ -8284,12 +9295,14 @@ EOF

•      *.la)
  

•        func_basename "$lib"
  

• name="$func_basename_result"
  

+- libdir=`${SED} -n -e 's/^libdir=(.*)$/\1/p' $lib` ++ func_resolve_sysroot "$lib" ++ eval libdir=`${SED} -n -e 's/^libdir=(.*)$/\1/p' $func_resolve_sysroot_result` ++

• test -z "$libdir" && \
  

•   func_fatal_error "\`$lib' is not a valid libtool archive"
  

+- newdlfiles="$newdlfiles $libdir/$name" ++ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"

• ;;
  

+- *) newdlfiles="$newdlfiles $lib" ;; ++ *) func_append newdlfiles " $lib" ;;

•      esac
  

•    done
  

•    dlfiles="$newdlfiles"
  

+@@ -8303,10 +9316,11 @@ EOF

• # the library:
  

• func_basename "$lib"
  

• name="$func_basename_result"
  

+- libdir=`${SED} -n -e 's/^libdir=(.*)$/\1/p' $lib` ++ func_resolve_sysroot "$lib" ++ eval libdir=`${SED} -n -e 's/^libdir=(.*)$/\1/p' $func_resolve_sysroot_result`

• test -z "$libdir" && \
  

•   func_fatal_error "\`$lib' is not a valid libtool archive"
  

+- newdlprefiles="$newdlprefiles $libdir/$name" ++ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"

• ;;
  

•      esac
  

•    done
  

+@@ -8318,7 +9332,7 @@ EOF

• [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
  

• *) abs=`pwd`"/$lib" ;;
  

•      esac
  

+- newdlfiles="$newdlfiles $abs" ++ func_append newdlfiles " $abs"

•    done
  

•    dlfiles="$newdlfiles"
  

•    newdlprefiles=
  

+@@ -8327,7 +9341,7 @@ EOF

• [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
  

• *) abs=`pwd`"/$lib" ;;
  

•      esac
  

+- newdlprefiles="$newdlprefiles $abs" ++ func_append newdlprefiles " $abs"

•    done
  

•    dlprefiles="$newdlprefiles"
  

•  fi
  

+@@ -8412,7 +9426,7 @@ relink_command="$relink_command""

• exit $EXIT_SUCCESS
  

• }

+-{ test "$mode" = link || test "$mode" = relink; } && ++{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&

• func_mode_link ${1+"$@"}
  

+@@ -8432,9 +9446,9 @@ func_mode_uninstall ()

• for arg
  

• do
  

•   case $arg in
  

+- -f) RM="$RM $arg"; rmforce=yes ;; +- -*) RM="$RM $arg" ;; +- *) files="$files $arg" ;; ++ -f) func_append RM " $arg"; rmforce=yes ;; ++ -*) func_append RM " $arg" ;; ++ *) func_append files " $arg" ;;

•   esac
  

• done
  

+@@ -8443,24 +9457,23 @@ func_mode_uninstall ()

• rmdirs=
  

+- origobjdir="$objdir"

• for file in $files; do
  

•   func_dirname "$file" "" "."
  

•   dir="$func_dirname_result"
  

•   if test "X$dir" = X.; then
  

+- objdir="$origobjdir" ++ odir="$objdir"

•   else
  

+- objdir="$dir/$origobjdir" ++ odir="$dir/$objdir"

•   fi
  

•   func_basename "$file"
  

•   name="$func_basename_result"
  

+- test "$mode" = uninstall && objdir="$dir" ++ test "$opt_mode" = uninstall && odir="$dir"

+- # Remember objdir for removal later, being careful to avoid duplicates +- if test "$mode" = clean; then ++ # Remember odir for removal later, being careful to avoid duplicates ++ if test "$opt_mode" = clean; then

• case " $rmdirs " in

+- *" $objdir "*) ;; +- *) rmdirs="$rmdirs $objdir" ;; ++ *" $odir "*) ;; ++ *) func_append rmdirs " $odir" ;;

• esac

•   fi
  

+@@ -8486,18 +9499,17 @@ func_mode_uninstall ()

•  # Delete the libtool libraries and symlinks.
  

•  for n in $library_names; do
  

+- rmfiles="$rmfiles $objdir/$n" ++ func_append rmfiles " $odir/$n"

•  done
  

+- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" ++ test -n "$old_library" && func_append rmfiles " $odir/$old_library"

+- case "$mode" in ++ case "$opt_mode" in

•  clean)
  

+- case " $library_names " in +- # " " in the beginning catches empty $dlname ++ case " $library_names " in

•    *" $dlname "*) ;;
  

+- *) rmfiles="$rmfiles $objdir/$dlname" ;; ++ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;

•    esac
  

+- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ++ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"

•    ;;
  

•  uninstall)
  

•    if test -n "$library_names"; then
  

+@@ -8525,19 +9537,19 @@ func_mode_uninstall ()

•  # Add PIC object to the list of files to remove.
  

•  if test -n "$pic_object" &&
  

•     test "$pic_object" != none; then
  

+- rmfiles="$rmfiles $dir/$pic_object" ++ func_append rmfiles " $dir/$pic_object"

•  fi
  

•  # Add non-PIC object to the list of files to remove.
  

•  if test -n "$non_pic_object" &&
  

•     test "$non_pic_object" != none; then
  

+- rmfiles="$rmfiles $dir/$non_pic_object" ++ func_append rmfiles " $dir/$non_pic_object"

•  fi
  

• fi
• ;;

•   *)
  

+- if test "$mode" = clean ; then ++ if test "$opt_mode" = clean ; then

•  noexename=$name
  

•  case $file in
  

•  *.exe)
  

+@@ -8547,7 +9559,7 @@ func_mode_uninstall ()

•    noexename=$func_stripname_result
  

•    # $file with .exe has already been added to rmfiles,
  

•    # add $file without .exe
  

+- rmfiles="$rmfiles $file" ++ func_append rmfiles " $file"

•    ;;
  

•  esac
  

•  # Do a test to see if this is a libtool program.
  

+@@ -8556,7 +9568,7 @@ func_mode_uninstall ()

•      func_ltwrapper_scriptname "$file"
  

•      relink_command=
  

•      func_source $func_ltwrapper_scriptname_result
  

+- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" ++ func_append rmfiles " $func_ltwrapper_scriptname_result"

•    else
  

•      relink_command=
  

•      func_source $dir/$noexename
  

+@@ -8564,12 +9576,12 @@ func_mode_uninstall ()

•    # note $name still contains .exe if it was in $file originally
  

•    # as does the version of $file that was added into $rmfiles
  

+- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" ++ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"

•    if test "$fast_install" = yes && test -n "$relink_command"; then
  

+- rmfiles="$rmfiles $objdir/lt-$name" ++ func_append rmfiles " $odir/lt-$name"

•    fi
  

•    if test "X$noexename" != "X$name" ; then
  

+- rmfiles="$rmfiles $objdir/lt-${noexename}.c" ++ func_append rmfiles " $odir/lt-${noexename}.c"

•    fi
  

•  fi
  

• fi

+@@ -8577,7 +9589,6 @@ func_mode_uninstall ()

•   esac
  

•   func_show_eval "$RM $rmfiles" 'exit_status=1'
  

• done
  

+- objdir="$origobjdir"

• # Try to remove the ${objdir}s in the directories where we deleted files
  

• for dir in $rmdirs; do
  

+@@ -8589,16 +9600,16 @@ func_mode_uninstall ()

• exit $exit_status
  

• }

+-{ test "$mode" = uninstall || test "$mode" = clean; } && ++{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&

• func_mode_uninstall ${1+"$@"}
  

+-test -z "$mode" && { ++test -z "$opt_mode" && {

• help="$generic_help"
• func_fatal_help "you must specify a MODE"
• }
• test -z "$exec_cmd" && \

+- func_fatal_help "invalid operation mode `$mode'" ++ func_fatal_help "invalid operation mode `$opt_mode'"

• if test -n "$exec_cmd"; then
• eval exec "$exec_cmd"

+diff --git a/ltoptions.m4 b/ltoptions.m4 +index 5ef12ce..17cfd51 100644 +--- a/ltoptions.m4 ++++ b/ltoptions.m4 +@@ -8,7 +8,7 @@

• # unlimited permission to copy and/or distribute it, with or without
• # modifications, as long as this notice is preserved.

+-# serial 6 ltoptions.m4 ++# serial 7 ltoptions.m4

• # This is to help aclocal find these macros, as it can't see m4_define.
• AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])

+diff --git a/ltversion.m4 b/ltversion.m4 +index bf87f77..9c7b5d4 100644 +--- a/ltversion.m4 ++++ b/ltversion.m4 +@@ -7,17 +7,17 @@

• # unlimited permission to copy and/or distribute it, with or without
• # modifications, as long as this notice is preserved.

+-# Generated from ltversion.in. ++# @configure_input@

+-# serial 3134 ltversion.m4 ++# serial 3293 ltversion.m4

• # This file is part of GNU Libtool

+-m4_define([LT_PACKAGE_VERSION], [2.2.7a]) +-m4_define([LT_PACKAGE_REVISION], [1.3134]) ++m4_define([LT_PACKAGE_VERSION], [2.4]) ++m4_define([LT_PACKAGE_REVISION], [1.3293])

• AC_DEFUN([LTVERSION_VERSION],

+-[macro_version='2.2.7a' +-macro_revision='1.3134' ++[macro_version='2.4' ++macro_revision='1.3293'

• _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
• _LT_DECL(, macro_revision, 0)
• ])

+diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 +index bf92b5e..c573da9 100644 +--- a/lt~obsolete.m4 ++++ b/lt~obsolete.m4 +@@ -7,7 +7,7 @@

• # unlimited permission to copy and/or distribute it, with or without
• # modifications, as long as this notice is preserved.

+-# serial 4 lt~obsolete.m4 ++# serial 5 lt~obsolete.m4

• # These exist entirely to fool aclocal when bootstrapping libtool.
• #

+diff --git a/opcodes/configure b/opcodes/configure +index f615634..a340983 100755 +--- a/opcodes/configure ++++ b/opcodes/configure +@@ -649,6 +649,9 @@ OTOOL

• LIPO
• NMEDIT
• DSYMUTIL

++MANIFEST_TOOL ++ac_ct_AR ++DLLTOOL

• OBJDUMP
• LN_S
• NM

+@@ -762,6 +765,7 @@ enable_static

• with_pic
• enable_fast_install
• with_gnu_ld

++with_libtool_sysroot

• enable_libtool_lock
• enable_targets
• enable_werror

+@@ -1422,6 +1426,8 @@ Optional Packages:

• --with-pic try to use only PIC/non-PIC objects [default=use

•                       both]
  

• --with-gnu-ld assume the C compiler uses GNU ld [default=no]

++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified).

• Some influential environment variables:
• CC C compiler command

+@@ -5114,8 +5120,8 @@ esac

+-macro_version='2.2.7a' +-macro_revision='1.3134' ++macro_version='2.4' ++macro_revision='1.3293'

+@@ -5155,7 +5161,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
• $as_echo_n "checking how to print strings... " >&6; }
• # Test print first, because it will be a builtin if present.

+-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \

• test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
• ECHO='print -r --'
• elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then

+@@ -5841,8 +5847,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;

• # Try some XSI features
• xsi_shell=no
• ( _lt_dummy="a/b/c"

+- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \

• && eval 'test $(( 1 + 1 )) -eq 2 \
  

• && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  

• && xsi_shell=yes

+@@ -5891,6 +5897,80 @@ esac

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 ++$as_echo_n "checking how to convert $build file names to $host format... " >&6; } ++if test "${lt_cv_to_host_file_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac ++ ;; ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac ++ ;; ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++ ++fi ++ ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 ++$as_echo "$lt_cv_to_host_file_cmd" >&6; } ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 ++$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } ++if test "${lt_cv_to_tool_file_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ #assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac ++ ++fi ++ ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 ++$as_echo "$lt_cv_to_tool_file_cmd" >&6; } ++ ++ ++ ++ ++

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
• $as_echo_n "checking for $LD option to reload object files... " >&6; }
• if test "${lt_cv_ld_reload_flag+set}" = set; then :

+@@ -5907,6 +5987,11 @@ case $reload_flag in

• esac
• reload_cmds='$LD$reload_flag -o $output$reload_objs'
• case $host_os in

++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;;

• darwin*)

• if test "$GCC" = yes; then
  

•   reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  

+@@ -6075,7 +6160,8 @@ mingw* | pw32*)

• lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  

• lt_cv_file_magic_cmd='func_win32_libid'
  

• else

+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'

• lt_cv_file_magic_cmd='$OBJDUMP -f'
  

• fi
• ;;

+@@ -6229,6 +6315,21 @@ esac

• fi
• { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
• $as_echo "$lt_cv_deplibs_check_method" >&6; }

++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/(..)/s/[\1]/[\1]/g;/g"` ++ fi ++ ;; ++ esac ++fi ++

• file_magic_cmd=$lt_cv_file_magic_cmd
• deplibs_check_method=$lt_cv_deplibs_check_method
• test -z "$deplibs_check_method" && deplibs_check_method=unknown

+@@ -6244,9 +6345,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown

++ ++ ++ ++ ++ ++ ++ ++ ++ ++

• if test -n "$ac_tool_prefix"; then

+- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 ++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DLLTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DLLTOOL"; then ++ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DLLTOOL=$ac_cv_prog_DLLTOOL ++if test -n "$DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 ++$as_echo "$DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DLLTOOL"; then ++ ac_ct_DLLTOOL=$DLLTOOL ++ # Extract the first word of "dlltool", so it can be a program name with args. ++set dummy dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DLLTOOL"; then ++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DLLTOOL="dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL ++if test -n "$ac_ct_DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 ++$as_echo "$ac_ct_DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_DLLTOOL" = x; then ++ DLLTOOL="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DLLTOOL=$ac_ct_DLLTOOL ++ fi ++else ++ DLLTOOL="$ac_cv_prog_DLLTOOL" ++fi ++ ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 ++$as_echo_n "checking how to associate runtime and link libraries... " >&6; } ++if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 ++$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ for ac_prog in ar ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
• $as_echo_n "checking for $ac_word... " >&6; }
• if test "${ac_cv_prog_AR+set}" = set; then :

+@@ -6262,7 +6516,7 @@ do

• test -z "$as_dir" && as_dir=.

• for ac_exec_ext in '' $ac_executable_extensions; do
  

• if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+- ac_cv_prog_AR="${ac_tool_prefix}ar" ++ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"

• $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  

• break 2
  

• fi

+@@ -6282,11 +6536,15 @@ $as_echo "no" >&6; }

• fi

++ test -n "$AR" && break ++ done

• fi

+-if test -z "$ac_cv_prog_AR"; then ++if test -z "$AR"; then

• ac_ct_AR=$AR

+- # Extract the first word of "ar", so it can be a program name with args. +-set dummy ar; ac_word=$2 ++ for ac_prog in ar ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
• $as_echo_n "checking for $ac_word... " >&6; }
• if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :

+@@ -6302,7 +6560,7 @@ do

• test -z "$as_dir" && as_dir=.

• for ac_exec_ext in '' $ac_executable_extensions; do
  

• if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+- ac_cv_prog_ac_ct_AR="ar" ++ ac_cv_prog_ac_ct_AR="$ac_prog"

• $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  

• break 2
  

• fi

+@@ -6321,6 +6579,10 @@ else

• $as_echo "no" >&6; }
• fi

++ ++ test -n "$ac_ct_AR" && break ++done ++

• if test "x$ac_ct_AR" = x; then

• AR="false"
  

• else

+@@ -6332,16 +6594,72 @@ ac_tool_warned=yes ;;

• esac

• AR=$ac_ct_AR
  

• fi

+-else +- AR="$ac_cv_prog_AR"

• fi

+-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru ++: ${AR=ar} ++: ${AR_FLAGS=cru} ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 ++$as_echo_n "checking for archiver @FILE support... " >&6; } ++if test "${lt_cv_ar_at_file+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ar_at_file=no ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{

++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' ++ { { eval echo ""$as_me":${as_lineno-$LINENO}: "$lt_ar_try""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ { { eval echo ""$as_me":${as_lineno-$LINENO}: "$lt_ar_try""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a

++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 ++$as_echo "$lt_cv_ar_at_file" >&6; }

++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi

+@@ -6683,8 +7001,8 @@ esac

• lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* (.*)$/extern int \1();/p' -e 's/^$symcode* .* (.*)$/extern char \1;/p'"
• # Transform an extracted symbol line into symbol name and symbol address

+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: ([^ ]*) $/ {\"\1\", (void *) 0},/p' -e 's/^$symcode* ([^ ]*) ([^ ]*)$/ {"\2", (void *) &\2},/p'" +-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'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: ([^ ]*)[ ]*$/ {\"\1\", (void *) 0},/p' -e 's/^$symcode* ([^ ]*) ([^ ]*)$/ {"\2", (void *) &\2},/p'" ++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'"

• # Handle CRLF in mingw tool chain
• opt_cr=

+@@ -6720,6 +7038,7 @@ for ac_symprfx in "" "_"; do

• else

• lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  

• fi

++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"

• # Check to see that the pipe works correctly.
• pipe_works=no

+@@ -6761,6 +7080,18 @@ _LT_EOF

•   if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  

• if $GREP ' nm_test_func$' "$nlist" >/dev/null; then

•  cat <<_LT_EOF > conftest.$ac_ext
  

++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++

• #ifdef __cplusplus
• extern "C" {
• #endif

+@@ -6772,7 +7103,7 @@ _LT_EOF

•  cat <<_LT_EOF >> conftest.$ac_ext
  

• /* The mapping between symbol names and symbols. */

+-const struct { ++LT_DLSYM_CONST struct {

• const char *name;
• void *address;
• }

+@@ -6798,8 +7129,8 @@ static const void *lt_preloaded_setup() {

• _LT_EOF

•  # Now try linking the two files.
  

•  mv conftest.$ac_objext conftstm.$ac_objext
  

+- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS

•  LIBS="conftstm.$ac_objext"
  

•  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  

•  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  

+@@ -6809,8 +7140,8 @@ _LT_EOF

• test $ac_status = 0; } && test -s conftest${ac_exeext}; then

•    pipe_works=yes
  

•  fi
  

+- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS

• else

•  echo "cannot find nm_test_func in $nlist" >&5
  

• fi

+@@ -6847,6 +7178,16 @@ else

• $as_echo "ok" >&6; }
• fi

++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ ++ ++ ++

+@@ -6868,6 +7209,45 @@ fi

++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 ++$as_echo_n "checking for sysroot... " >&6; } ++ ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; ++else ++ with_libtool_sysroot=no ++fi ++ ++ ++lt_sysroot= ++case ${with_libtool_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } ++ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 ++ ;; ++esac ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 ++$as_echo "${lt_sysroot:-no}" >&6; } ++ ++ ++ ++ ++

• # Check whether --enable-libtool-lock was given.
• if test "${enable_libtool_lock+set}" = set; then :
• enableval=$enable_libtool_lock;

+@@ -7074,6 +7454,123 @@ esac

• need_locks="$enable_libtool_lock"

++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. ++set dummy ${ac_tool_prefix}mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$MANIFEST_TOOL"; then ++ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL ++if test -n "$MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 ++$as_echo "$MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ++ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL ++ # Extract the first word of "mt", so it can be a program name with args. ++set dummy mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_MANIFEST_TOOL"; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL ++if test -n "$ac_ct_MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 ++$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_MANIFEST_TOOL" = x; then ++ MANIFEST_TOOL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL ++ fi ++else ++ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" ++fi ++ ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 ++$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } ++if test "${lt_cv_path_mainfest_tool+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&5 ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 ++$as_echo "$lt_cv_path_mainfest_tool" >&6; } ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++ ++ ++ ++ ++

• case $host_os in

• rhapsody* | darwin*)
  

+@@ -7637,6 +8134,8 @@ _LT_EOF

•   $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  

•   echo "$AR cru libconftest.a conftest.o" >&5
  

•   $AR cru libconftest.a conftest.o 2>&5
  

++ echo "$RANLIB libconftest.a" >&5 ++ $RANLIB libconftest.a 2>&5

•   cat > conftest.c << _LT_EOF
  

• int main() { return 0;}
• _LT_EOF

+@@ -7802,7 +8301,8 @@ fi

• LIBTOOL_DEPS="$ltmain"
• # Always use our own libtool.

+-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL="$LIBTOOL/${host_alias}-libtool"

+@@ -7891,7 +8391,7 @@ aix3*)

• esac
• # Global variables:

+-ofile=libtool ++ofile=${host_alias}-libtool

• can_build_shared=yes
• # All known linkers require a `.a' archive for static linking (except MSVC,

+@@ -8189,8 +8689,6 @@ fi

• lt_prog_compiler_pic=
• lt_prog_compiler_static=

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

• if test "$GCC" = yes; then

• lt_prog_compiler_wl='-Wl,'
  

+@@ -8356,6 +8854,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

• lt_prog_compiler_pic='--shared'
• lt_prog_compiler_static='--static'
• ;;

++ nagfor*) ++ # NAG Fortran compiler ++ lt_prog_compiler_wl='-Wl,-Wl,,' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;;

•   pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  

•     # Portland Group compilers (*not* the Pentium gcc compiler,
  

• # which looks to be a dead project)

+@@ -8418,7 +8922,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

•   lt_prog_compiler_pic='-KPIC'
  

•   lt_prog_compiler_static='-Bstatic'
  

•   case $cc_basename in
  

+- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)

• lt_prog_compiler_wl='-Qoption ld ';;

•   *)
  

• lt_prog_compiler_wl='-Wl,';;

+@@ -8475,13 +8979,17 @@ case $host_os in

• lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  

• ;;
  

• esac

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +-$as_echo "$lt_prog_compiler_pic" >&6; } +- +- +- +-

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++if test "${lt_cv_prog_compiler_pic+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 ++$as_echo "$lt_cv_prog_compiler_pic" >&6; } ++lt_prog_compiler_pic=$lt_cv_prog_compiler_pic

• #
• # Check to make sure the PIC flag actually works.

+@@ -8542,6 +9050,11 @@ fi

++ ++ ++ ++ ++

• #
• # Check to make sure the static flag actually works.
• #

+@@ -8892,7 +9405,8 @@ _LT_EOF

•   allow_undefined_flag=unsupported
  

•   always_export_symbols=no
  

•   enable_shared_with_static_runtimes=yes
  

+- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '''/^[BCDGRS][ ]/s/.*[ ]([^ ]*)/\1 DATA/''' | $SED -e '''/^[AITW][ ]/s/.*[ ]//''' | sort | uniq > $export_symbols' ++ 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' ++ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'

•   if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  

•     archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  

+@@ -8991,12 +9505,12 @@ _LT_EOF

•  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  

•  hardcode_libdir_flag_spec=
  

•  hardcode_libdir_flag_spec_ld='-rpath $libdir'
  

+- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'

•  if test "x$supports_anon_versioning" = xyes; then
  

•    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  

•      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  

•      echo "local: *; };" >> $output_objdir/$libname.ver~
  

+- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'

•  fi
  

•  ;;
  

• esac

+@@ -9010,8 +9524,8 @@ _LT_EOF

• archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
• wlarc=

•   else
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   fi
  

•   ;;
  

+@@ -9029,8 +9543,8 @@ _LT_EOF

• _LT_EOF

•   elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   else
  

• ld_shlibs=no

•   fi
  

+@@ -9076,8 +9590,8 @@ _LT_EOF

• *)
  

•   if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   else
  

• ld_shlibs=no

•   fi
  

+@@ -9207,7 +9721,13 @@ _LT_EOF

• allow_undefined_flag='-berok'

•     # Determine the default libpath from the value encoded in an
  

•     # empty executable.
  

+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */
• int

+@@ -9220,22 +9740,29 @@ main ()

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi

•     hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•     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"
  

+@@ -9247,7 +9774,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• else

• # Determine the default libpath from the value encoded in an
  

• # empty executable.
  

+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */
• int

+@@ -9260,22 +9793,29 @@ main ()

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi

• hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•  # Warning - without using the other run time loading flags,
  

+@@ -9320,20 +9860,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•   # Microsoft Visual C++.
  

•   # hardcode_libdir_flag_spec is actually meaningless, as there is
  

•   # no search path for DLLs.
  

+- hardcode_libdir_flag_spec=' ' +- allow_undefined_flag=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '''s/ -lc$//'''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- old_archive_from_new_cmds='true' +- # FIXME: Should let the user specify the lib program. +- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' +- fix_srcfile_path='`cygpath -w "$srcfile"`' +- enable_shared_with_static_runtimes=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ always_export_symbols=yes ++ file_list_spec='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' -e '1\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' ++ enable_shared_with_static_runtimes=yes ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '''/^[BCDGRS][ ]/s/.*[ ]([^ ]*)/\1,DATA/''' | $SED -e '''/^[AITW][ ]/s/.*[ ]//''' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ old_postinstall_cmds='chmod 644 $oldlib' ++ postlink_cmds='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '''s/ -lc$//'''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ old_archive_from_new_cmds='true' ++ # FIXME: Should let the user specify the lib program. ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ enable_shared_with_static_runtimes=yes ++ ;; ++ esac

•   ;;
  

• darwin* | rhapsody*)
  

+@@ -9394,7 +9977,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  

• freebsd* | dragonfly*)
  

+- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

•   hardcode_libdir_flag_spec='-R$libdir'
  

•   hardcode_direct=yes
  

•   hardcode_shlibpath_var=no
  

+@@ -9402,7 +9985,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• hpux9*)
  

•   if test "$GCC" = yes; then
  

+- 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' ++ 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'

•   else
  

• 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'

•   fi
  

+@@ -9418,7 +10001,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• hpux10*)
  

•   if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

•   else
  

• archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'

•   fi
  

+@@ -9442,10 +10025,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  

•  ;;
  

• ia64*)

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

•  ;;
  

• *)

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

•  ;;
  

• esac

•   else
  

+@@ -9524,23 +10107,36 @@ fi

• irix5* | irix6* | nonstopux*)
  

•   if test "$GCC" = yes; then
  

+- 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' ++ 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'

• # Try to use the -exported_symbol ld option, if it does not
• # work, assume that -exports_file does not work either and
• # implicitly export all symbols.

+- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ # This should be the same for all languages, so no per-tag cache variable. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 ++$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } ++if test "${lt_cv_irix_exported_symbol+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

• /* end confdefs.h. */

+-int foo(void) {} ++int foo (void) { return 0; }

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+- 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' +- ++ lt_cv_irix_exported_symbol=yes ++else ++ lt_cv_irix_exported_symbol=no

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 ++$as_echo "$lt_cv_irix_exported_symbol" >&6; } ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ 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' ++ fi

•   else
  

• 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'
• 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'

+@@ -9625,7 +10221,7 @@ rm -f core conftest.err conftest.$ac_objext \

• osf4* | osf5*)	# as osf3* with the addition of -msym flag
  

•   if test "$GCC" = yes; then
  

• allow_undefined_flag=' ${wl}-expect_unresolved ${wl}*'

+- 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' ++ 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'

• hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'

•   else
  

• allow_undefined_flag=' -expect_unresolved *'

+@@ -9644,9 +10240,9 @@ rm -f core conftest.err conftest.$ac_objext \

•   no_undefined_flag=' -z defs'
  

•   if test "$GCC" = yes; then
  

• wlarc='${wl}'

+- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

• archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/(.*)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~

+- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $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'

•   else
  

• case `$CC -V 2>&1` in
• *"Compilers 5.0"*)

+@@ -10222,8 +10818,9 @@ cygwin* | mingw* | pw32* | cegcc*)

• need_version=no
• need_lib_prefix=no

+- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc

• library_names_spec='$libname.dll.a'
  

• # DLL is installed to $(libdir)/../bin by postinstall_cmds
  

• postinstall_cmds='base_file=`basename \${file}`~
  

+@@ -10256,13 +10853,71 @@ cygwin* | mingw* | pw32* | cegcc*)

•   library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  

•   ;;
  

• esac
  

++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\|/|g' -e 's| \([a-zA-Z]\):| /\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename ${file}`~ ++ dlpath=`$SHELL 2>&1 -c '''. $dir/'''${base_file}'''i; echo $dlname'''`~ ++ dldir=$destdir/`dirname $dlpath`~ ++ test -d $dldir || mkdir -p $dldir~ ++ $install_prog $dir/$dlname $dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '''. $file; echo $dlname'''`~ ++ dlpath=$dir/$dldll~ ++ $RM $dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe'

• ;;
  

• *)

++ # Assume MSVC wrapper

• library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  

++ dynamic_linker='Win32 ld.exe'

• ;;
  

• esac

+- dynamic_linker='Win32 ld.exe'

• # FIXME: first we should search . and the directory the executable is in
• shlibpath_var=PATH
• ;;

+@@ -10354,7 +11009,7 @@ haiku*)

• soname_spec='${libname}${release}${shared_ext}$major'
• shlibpath_var=LIBRARY_PATH
• shlibpath_overrides_runpath=yes

+- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'

• hardcode_into_libs=yes
• ;;

+@@ -11194,10 +11849,10 @@ else

• /* When -fvisbility=hidden is used, assume the code has been annotated
• correspondingly for the symbols needed. */
• #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

+-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default")));

• #endif

+-void fnord () { int i=42; } ++int fnord () { return 42; }

• int main ()
• {
• void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

+@@ -11300,10 +11955,10 @@ else

• /* When -fvisbility=hidden is used, assume the code has been annotated
• correspondingly for the symbols needed. */
• #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

+-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default")));

• #endif

+-void fnord () { int i=42; } ++int fnord () { return 42; }

• int main ()
• {
• void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

+@@ -12499,7 +13154,7 @@ if test "$enable_shared" = "yes"; then

• # since libbfd may not pull in the entirety of libiberty.
• x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
• if test -n "$x"; then

+- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" ++ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"

• fi
• case "${host}" in

+@@ -13473,13 +14128,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'

• lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
• lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
• lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'

++lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' ++lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'

• reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
• reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
• OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
• deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
• file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'

++file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' ++want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' ++DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' ++sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'

• AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
• AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'

++archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'

• STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
• RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
• old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'

+@@ -13494,14 +14156,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de

• lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
• lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
• 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"`'

++nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' ++lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'

• objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
• MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
• lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'

+-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'

• lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'

++lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'

• lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
• lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
• need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'

++MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'

• DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
• NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
• LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'

+@@ -13534,12 +14199,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q

• hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
• inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
• link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'

+-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'

• always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
• export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
• exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
• include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
• prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'

++postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'

• file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
• variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
• need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'

+@@ -13594,8 +14259,13 @@ reload_flag \

• OBJDUMP \
• deplibs_check_method \
• file_magic_cmd \

++file_magic_glob \ ++want_nocaseglob \ ++DLLTOOL \ ++sharedlib_from_linklib_cmd \

• AR \
• AR_FLAGS \

++archiver_list_spec \

• STRIP \
• RANLIB \
• CC \

+@@ -13605,12 +14275,14 @@ lt_cv_sys_global_symbol_pipe \

• lt_cv_sys_global_symbol_to_cdecl \
• lt_cv_sys_global_symbol_to_c_name_address \
• lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \

++nm_file_list_spec \

• lt_prog_compiler_no_builtin_flag \

+-lt_prog_compiler_wl \

• lt_prog_compiler_pic \

++lt_prog_compiler_wl \

• lt_prog_compiler_static \
• lt_cv_prog_compiler_c_o \
• need_locks \

++MANIFEST_TOOL \

• DSYMUTIL \
• NMEDIT \
• LIPO \

+@@ -13626,7 +14298,6 @@ no_undefined_flag \

• hardcode_libdir_flag_spec \
• hardcode_libdir_flag_spec_ld \
• hardcode_libdir_separator \

+-fix_srcfile_path \

• exclude_expsyms \
• include_expsyms \
• file_list_spec \

+@@ -13662,6 +14333,7 @@ module_cmds \

• module_expsym_cmds \
• export_symbols_cmds \
• prelink_cmds \

++postlink_cmds \

• postinstall_cmds \
• postuninstall_cmds \
• finish_cmds \

+@@ -14418,7 +15090,8 @@ $as_echo X"$file" |

• # NOTE: Changes made to this file will be lost: look at ltmain.sh.
• #
• # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,

+-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc.

• # Written by Gordon Matzigkeit, 1996
• #
• # This file is part of GNU Libtool.

+@@ -14521,19 +15194,42 @@ SP2NL=$lt_lt_SP2NL

• # turn newlines into spaces.
• NL2SP=$lt_lt_NL2SP

++# convert $build file names to $host format. ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++ ++# convert $build files to toolchain format. ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++

• # An object symbol dumper.
• OBJDUMP=$lt_OBJDUMP
• # Method to check whether dependent libraries are shared objects.
• deplibs_check_method=$lt_deplibs_check_method

+-# Command to use when deplibs_check_method == "file_magic". ++# Command to use when deplibs_check_method = "file_magic".

• file_magic_cmd=$lt_file_magic_cmd

++# How to find potential files when deplibs_check_method = "file_magic". ++file_magic_glob=$lt_file_magic_glob ++ ++# Find potential files using nocaseglob when deplibs_check_method = "file_magic". ++want_nocaseglob=$lt_want_nocaseglob ++ ++# DLL creation program. ++DLLTOOL=$lt_DLLTOOL ++ ++# Command to associate shared and link libraries. ++sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd ++

• # The archiver.
• AR=$lt_AR

++ ++# Flags to create an archive.

• AR_FLAGS=$lt_AR_FLAGS

++# How to feed a file listing to the archiver. ++archiver_list_spec=$lt_archiver_list_spec ++

• # A symbol stripping program.
• STRIP=$lt_STRIP

+@@ -14563,6 +15259,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address

• # Transform the output of nm in a C name address pair when lib prefix is needed.
• global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix

++# Specify filename containing input files for $NM. ++nm_file_list_spec=$lt_nm_file_list_spec ++ ++# The root where to search for dependent libraries,and in which our libraries should be installed. ++lt_sysroot=$lt_sysroot ++

• # The name of the directory that contains temporary libtool files.
• objdir=$objdir

+@@ -14572,6 +15274,9 @@ MAGIC_CMD=$MAGIC_CMD

• # Must we lock files when doing compilation?
• need_locks=$lt_need_locks

++# Manifest tool. ++MANIFEST_TOOL=$lt_MANIFEST_TOOL ++

• # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
• DSYMUTIL=$lt_DSYMUTIL

+@@ -14686,12 +15391,12 @@ with_gcc=$GCC

• # Compiler flag to turn off builtin functions.
• no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag

+-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl +-

• # Additional compiler flags for building library objects.
• pic_flag=$lt_lt_prog_compiler_pic

++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl ++

• # Compiler flag to prevent dynamic linking.
• link_static_flag=$lt_lt_prog_compiler_static

+@@ -14778,9 +15483,6 @@ inherit_rpath=$inherit_rpath

• # Whether libtool must link a program against all its dependency libraries.
• link_all_deplibs=$link_all_deplibs

+-# Fix the shell variable $srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path +-

• # Set to "yes" if exported symbols are required.
• always_export_symbols=$always_export_symbols

+@@ -14796,6 +15498,9 @@ include_expsyms=$lt_include_expsyms

• # Commands necessary for linking programs (against libraries) with templates.
• prelink_cmds=$lt_prelink_cmds

++# Commands necessary for finishing linking programs. ++postlink_cmds=$lt_postlink_cmds ++

• # Specify filename containing input files.
• file_list_spec=$lt_file_list_spec

+@@ -14828,210 +15533,169 @@ ltmain="$ac_aux_dir/ltmain.sh"

• # if finds mixed CR/LF and LF-only lines. Since sed operates in
• # text mode, it properly converts lines to CR/LF. This bash problem
• # is reportedly fixed, but why not run on old versions too?

+- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- case $xsi_shell in +- yes) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $* )) +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} +- +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << _LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} +- +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\${2}$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}$%%"`;; +- esac +-} +- +-# sed scripts: +-my_sed_long_opt='1s/^(-[^=]*)=.*/\1/;q' +-my_sed_long_arg='1s/^-[^=]*=//' +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/.[^.]*$/.lo/'` +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$@"` +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` +-} +- +-_LT_EOF +-esac +- +-case $lt_shell_append in +- yes) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1+=$2" +-} +-_LT_EOF +- ;; +- *) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1=$$1$2" +-} +- +-_LT_EOF +- ;; +- esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ if test x"$xsi_shell" = xyes; then ++ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ ++func_dirname ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_basename ()$/,/^} # func_basename /c\ ++func_basename ()\ ++{\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ ++func_dirname_and_basename ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ ++func_stripname ()\ ++{\ ++\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ ++\ # positional parameters, so assign one to ordinary parameter first.\ ++\ func_stripname_result=${3}\ ++\ func_stripname_result=${func_stripname_result#"${1}"}\ ++\ func_stripname_result=${func_stripname_result%"${2}"}\ ++} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ ++func_split_long_opt ()\ ++{\ ++\ func_split_long_opt_name=${1%%=*}\ ++\ func_split_long_opt_arg=${1#*=}\ ++} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ ++func_split_short_opt ()\ ++{\ ++\ func_split_short_opt_arg=${1#??}\ ++\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ ++} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ ++func_lo2o ()\ ++{\ ++\ case ${1} in\ ++\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ ++\ *) func_lo2o_result=${1} ;;\ ++\ esac\ ++} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_xform ()$/,/^} # func_xform /c\ ++func_xform ()\ ++{\ ++ func_xform_result=${1%.*}.lo\ ++} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_arith ()$/,/^} # func_arith /c\ ++func_arith ()\ ++{\ ++ func_arith_result=$(( $* ))\ ++} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_len ()$/,/^} # func_len /c\ ++func_len ()\ ++{\ ++ func_len_result=${#1}\ ++} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++fi ++ ++if test x"$lt_shell_append" = xyes; then ++ sed -e '/^func_append ()$/,/^} # func_append /c\ ++func_append ()\ ++{\ ++ eval "${1}+=\${2}"\ ++} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ ++func_append_quoted ()\ ++{\ ++\ func_quote_for_eval "${2}"\ ++\ eval "${1}+=\\ \$func_quote_for_eval_result"\ ++} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append ([a-zA-Z_]{1,}) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append ([a-zA-Z_]{1,}) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi ++ ++if test x"$_lt_function_replace_fail" = x":"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 ++$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} ++fi ++ ++ ++ mv -f "$cfgfile" "$ofile" ||

• (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  

• chmod +x "$ofile"

+diff --git a/opcodes/configure.ac b/opcodes/configure.ac +index c7f4783..f2e002d 100644 +--- a/opcodes/configure.ac ++++ b/opcodes/configure.ac +@@ -167,7 +167,7 @@ changequote(,)dnl

• x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
• changequote([,])dnl
• if test -n "$x"; then

+- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" ++ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"

• fi
• case "${host}" in

+diff --git a/zlib/configure b/zlib/configure +index bba9fd2..25a2dae 100755 +--- a/zlib/configure ++++ b/zlib/configure +@@ -614,8 +614,11 @@ OTOOL

• LIPO
• NMEDIT
• DSYMUTIL

++MANIFEST_TOOL

• RANLIB

++ac_ct_AR

• AR

++DLLTOOL

• OBJDUMP
• LN_S
• NM

+@@ -737,6 +740,7 @@ enable_static

• with_pic
• enable_fast_install
• with_gnu_ld

++with_libtool_sysroot

• enable_libtool_lock
• enable_host_shared
• '

+@@ -1385,6 +1389,8 @@ Optional Packages:

• --with-pic try to use only PIC/non-PIC objects [default=use

•                       both]
  

• --with-gnu-ld assume the C compiler uses GNU ld [default=no]

++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified).

• Some influential environment variables:
• CC C compiler command

+@@ -3910,8 +3916,8 @@ esac

+-macro_version='2.2.7a' +-macro_revision='1.3134' ++macro_version='2.4' ++macro_revision='1.3293'

+@@ -3951,7 +3957,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
• $as_echo_n "checking how to print strings... " >&6; }
• # Test print first, because it will be a builtin if present.

+-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \

• test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
• ECHO='print -r --'
• elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then

+@@ -4767,8 +4773,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;

• # Try some XSI features
• xsi_shell=no
• ( _lt_dummy="a/b/c"

+- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \

• && eval 'test $(( 1 + 1 )) -eq 2 \
  

• && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  

• && xsi_shell=yes

+@@ -4817,6 +4823,80 @@ esac

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 ++$as_echo_n "checking how to convert $build file names to $host format... " >&6; } ++if test "${lt_cv_to_host_file_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac ++ ;; ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac ++ ;; ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++ ++fi ++ ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 ++$as_echo "$lt_cv_to_host_file_cmd" >&6; } ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 ++$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } ++if test "${lt_cv_to_tool_file_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ #assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac ++ ++fi ++ ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 ++$as_echo "$lt_cv_to_tool_file_cmd" >&6; } ++ ++ ++ ++ ++

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
• $as_echo_n "checking for $LD option to reload object files... " >&6; }
• if test "${lt_cv_ld_reload_flag+set}" = set; then :

+@@ -4833,6 +4913,11 @@ case $reload_flag in

• esac
• reload_cmds='$LD$reload_flag -o $output$reload_objs'
• case $host_os in

++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;;

• darwin*)

• if test "$GCC" = yes; then
  

•   reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  

+@@ -5001,7 +5086,8 @@ mingw* | pw32*)

• lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  

• lt_cv_file_magic_cmd='func_win32_libid'
  

• else

+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'

• lt_cv_file_magic_cmd='$OBJDUMP -f'
  

• fi
• ;;

+@@ -5155,6 +5241,21 @@ esac

• fi
• { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
• $as_echo "$lt_cv_deplibs_check_method" >&6; }

++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/(..)/s/[\1]/[\1]/g;/g"` ++ fi ++ ;; ++ esac ++fi ++

• file_magic_cmd=$lt_cv_file_magic_cmd
• deplibs_check_method=$lt_cv_deplibs_check_method
• test -z "$deplibs_check_method" && deplibs_check_method=unknown

+@@ -5170,9 +5271,163 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown

++ ++ ++ ++ ++ ++ ++ ++ ++ ++

• if test -n "$ac_tool_prefix"; then

+- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 ++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DLLTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DLLTOOL"; then ++ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DLLTOOL=$ac_cv_prog_DLLTOOL ++if test -n "$DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 ++$as_echo "$DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DLLTOOL"; then ++ ac_ct_DLLTOOL=$DLLTOOL ++ # Extract the first word of "dlltool", so it can be a program name with args. ++set dummy dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DLLTOOL"; then ++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DLLTOOL="dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL ++if test -n "$ac_ct_DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 ++$as_echo "$ac_ct_DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_DLLTOOL" = x; then ++ DLLTOOL="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DLLTOOL=$ac_ct_DLLTOOL ++ fi ++else ++ DLLTOOL="$ac_cv_prog_DLLTOOL" ++fi ++ ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 ++$as_echo_n "checking how to associate runtime and link libraries... " >&6; } ++if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 ++$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ for ac_prog in ar ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
• $as_echo_n "checking for $ac_word... " >&6; }
• if test "${ac_cv_prog_AR+set}" = set; then :

+@@ -5188,7 +5443,7 @@ do

• test -z "$as_dir" && as_dir=.

• for ac_exec_ext in '' $ac_executable_extensions; do
  

• if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+- ac_cv_prog_AR="${ac_tool_prefix}ar" ++ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"

• $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  

• break 2
  

• fi

+@@ -5208,11 +5463,15 @@ $as_echo "no" >&6; }

• fi

++ test -n "$AR" && break ++ done

• fi

+-if test -z "$ac_cv_prog_AR"; then ++if test -z "$AR"; then

• ac_ct_AR=$AR

+- # Extract the first word of "ar", so it can be a program name with args. +-set dummy ar; ac_word=$2 ++ for ac_prog in ar ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2

• { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
• $as_echo_n "checking for $ac_word... " >&6; }
• if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :

+@@ -5228,7 +5487,7 @@ do

• test -z "$as_dir" && as_dir=.

• for ac_exec_ext in '' $ac_executable_extensions; do
  

• if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+- ac_cv_prog_ac_ct_AR="ar" ++ ac_cv_prog_ac_ct_AR="$ac_prog"

• $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  

• break 2
  

• fi

+@@ -5247,6 +5506,10 @@ else

• $as_echo "no" >&6; }
• fi

++ ++ test -n "$ac_ct_AR" && break ++done ++

• if test "x$ac_ct_AR" = x; then

• AR="false"
  

• else

+@@ -5258,16 +5521,72 @@ ac_tool_warned=yes ;;

• esac

• AR=$ac_ct_AR
  

• fi

+-else +- AR="$ac_cv_prog_AR"

• fi

+-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru ++: ${AR=ar} ++: ${AR_FLAGS=cru} ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 ++$as_echo_n "checking for archiver @FILE support... " >&6; } ++if test "${lt_cv_ar_at_file+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ar_at_file=no ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{

++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' ++ { { eval echo ""$as_me":${as_lineno-$LINENO}: "$lt_ar_try""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ { { eval echo ""$as_me":${as_lineno-$LINENO}: "$lt_ar_try""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a

++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 ++$as_echo "$lt_cv_ar_at_file" >&6; }

++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi

+@@ -5609,8 +5928,8 @@ esac

• lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* (.*)$/extern int \1();/p' -e 's/^$symcode* .* (.*)$/extern char \1;/p'"
• # Transform an extracted symbol line into symbol name and symbol address

+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: ([^ ]*) $/ {\"\1\", (void *) 0},/p' -e 's/^$symcode* ([^ ]*) ([^ ]*)$/ {"\2", (void *) &\2},/p'" +-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'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: ([^ ]*)[ ]*$/ {\"\1\", (void *) 0},/p' -e 's/^$symcode* ([^ ]*) ([^ ]*)$/ {"\2", (void *) &\2},/p'" ++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'"

• # Handle CRLF in mingw tool chain
• opt_cr=

+@@ -5646,6 +5965,7 @@ for ac_symprfx in "" "_"; do

• else

• lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  

• fi

++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"

• # Check to see that the pipe works correctly.
• pipe_works=no

+@@ -5687,6 +6007,18 @@ _LT_EOF

•   if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  

• if $GREP ' nm_test_func$' "$nlist" >/dev/null; then

•  cat <<_LT_EOF > conftest.$ac_ext
  

++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++

• #ifdef __cplusplus
• extern "C" {
• #endif

+@@ -5698,7 +6030,7 @@ _LT_EOF

•  cat <<_LT_EOF >> conftest.$ac_ext
  

• /* The mapping between symbol names and symbols. */

+-const struct { ++LT_DLSYM_CONST struct {

• const char *name;
• void *address;
• }

+@@ -5724,8 +6056,8 @@ static const void *lt_preloaded_setup() {

• _LT_EOF

•  # Now try linking the two files.
  

•  mv conftest.$ac_objext conftstm.$ac_objext
  

+- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS

•  LIBS="conftstm.$ac_objext"
  

•  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  

•  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  

+@@ -5735,8 +6067,8 @@ _LT_EOF

• test $ac_status = 0; } && test -s conftest${ac_exeext}; then

•    pipe_works=yes
  

•  fi
  

+- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS

• else

•  echo "cannot find nm_test_func in $nlist" >&5
  

• fi

+@@ -5773,6 +6105,19 @@ else

• $as_echo "ok" >&6; }
• fi

++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ ++ ++ ++ ++ ++ ++

+@@ -5793,6 +6138,41 @@ fi

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 ++$as_echo_n "checking for sysroot... " >&6; } ++ ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; ++else ++ with_libtool_sysroot=no ++fi ++ ++ ++lt_sysroot= ++case ${with_libtool_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } ++ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 ++ ;; ++esac ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 ++$as_echo "${lt_sysroot:-no}" >&6; } ++ ++ ++

• # Check whether --enable-libtool-lock was given.

+@@ -6004,6 +6384,123 @@ esac

• need_locks="$enable_libtool_lock"

++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. ++set dummy ${ac_tool_prefix}mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$MANIFEST_TOOL"; then ++ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL ++if test -n "$MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 ++$as_echo "$MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ++ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL ++ # Extract the first word of "mt", so it can be a program name with args. ++set dummy mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_MANIFEST_TOOL"; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL ++if test -n "$ac_ct_MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 ++$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_MANIFEST_TOOL" = x; then ++ MANIFEST_TOOL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL ++ fi ++else ++ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" ++fi ++ ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 ++$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } ++if test "${lt_cv_path_mainfest_tool+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&5 ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 ++$as_echo "$lt_cv_path_mainfest_tool" >&6; } ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++ ++ ++ ++ ++

• case $host_os in

• rhapsody* | darwin*)
  

+@@ -6570,6 +7067,8 @@ _LT_EOF

•   $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  

•   echo "$AR cru libconftest.a conftest.o" >&5
  

•   $AR cru libconftest.a conftest.o 2>&5
  

++ echo "$RANLIB libconftest.a" >&5 ++ $RANLIB libconftest.a 2>&5

•   cat > conftest.c << _LT_EOF
  

• int main() { return 0;}
• _LT_EOF

+@@ -7033,7 +7532,8 @@ fi

• LIBTOOL_DEPS="$ltmain"
• # Always use our own libtool.

+-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL="$LIBTOOL/${host_alias}-libtool"

+@@ -7122,7 +7622,7 @@ aix3*)

• esac
• # Global variables:

+-ofile=libtool ++ofile=${host_alias}-libtool

• can_build_shared=yes
• # All known linkers require a `.a' archive for static linking (except MSVC,

+@@ -7420,8 +7920,6 @@ fi

• lt_prog_compiler_pic=
• lt_prog_compiler_static=

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

• if test "$GCC" = yes; then

• lt_prog_compiler_wl='-Wl,'
  

+@@ -7587,6 +8085,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

• lt_prog_compiler_pic='--shared'
• lt_prog_compiler_static='--static'
• ;;

++ nagfor*) ++ # NAG Fortran compiler ++ lt_prog_compiler_wl='-Wl,-Wl,,' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;;

•   pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  

•     # Portland Group compilers (*not* the Pentium gcc compiler,
  

• # which looks to be a dead project)

+@@ -7649,7 +8153,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

•   lt_prog_compiler_pic='-KPIC'
  

•   lt_prog_compiler_static='-Bstatic'
  

•   case $cc_basename in
  

+- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)

• lt_prog_compiler_wl='-Qoption ld ';;

•   *)
  

• lt_prog_compiler_wl='-Wl,';;

+@@ -7706,13 +8210,17 @@ case $host_os in

• lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  

• ;;
  

• esac

+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +-$as_echo "$lt_prog_compiler_pic" >&6; } +- +- +- +-

++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++if test "${lt_cv_prog_compiler_pic+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 ++$as_echo "$lt_cv_prog_compiler_pic" >&6; } ++lt_prog_compiler_pic=$lt_cv_prog_compiler_pic

• #
• # Check to make sure the PIC flag actually works.

+@@ -7773,6 +8281,11 @@ fi

++ ++ ++ ++ ++

• #
• # Check to make sure the static flag actually works.
• #

+@@ -8123,7 +8636,8 @@ _LT_EOF

•   allow_undefined_flag=unsupported
  

•   always_export_symbols=no
  

•   enable_shared_with_static_runtimes=yes
  

+- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '''/^[BCDGRS][ ]/s/.*[ ]([^ ]*)/\1 DATA/''' | $SED -e '''/^[AITW][ ]/s/.*[ ]//''' | sort | uniq > $export_symbols' ++ 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' ++ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'

•   if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  

•     archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  

+@@ -8222,12 +8736,12 @@ _LT_EOF

•  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  

•  hardcode_libdir_flag_spec=
  

•  hardcode_libdir_flag_spec_ld='-rpath $libdir'
  

+- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'

•  if test "x$supports_anon_versioning" = xyes; then
  

•    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  

•      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  

•      echo "local: *; };" >> $output_objdir/$libname.ver~
  

+- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'

•  fi
  

•  ;;
  

• esac

+@@ -8241,8 +8755,8 @@ _LT_EOF

• archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
• wlarc=

•   else
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   fi
  

•   ;;
  

+@@ -8260,8 +8774,8 @@ _LT_EOF

• _LT_EOF

•   elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   else
  

• ld_shlibs=no

•   fi
  

+@@ -8307,8 +8821,8 @@ _LT_EOF

• *)
  

•   if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  

+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

•   else
  

• ld_shlibs=no

•   fi
  

+@@ -8438,7 +8952,13 @@ _LT_EOF

• allow_undefined_flag='-berok'

•     # Determine the default libpath from the value encoded in an
  

•     # empty executable.
  

+- if test x$gcc_no_link = xyes; then ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test x$gcc_no_link = xyes; then

• as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
• fi
• cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+@@ -8454,22 +8974,29 @@ main ()

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi

•     hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•     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"
  

+@@ -8481,7 +9008,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• else

• # Determine the default libpath from the value encoded in an
  

• # empty executable.
  

+- if test x$gcc_no_link = xyes; then ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if test "${lt_cv_aix_libpath_+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test x$gcc_no_link = xyes; then

• as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
• fi
• cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+@@ -8497,22 +9030,29 @@ main ()

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *(.*)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *([^ ]*) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi

• hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  

•  # Warning - without using the other run time loading flags,
  

+@@ -8557,20 +9097,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•   # Microsoft Visual C++.
  

•   # hardcode_libdir_flag_spec is actually meaningless, as there is
  

•   # no search path for DLLs.
  

+- hardcode_libdir_flag_spec=' ' +- allow_undefined_flag=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '''s/ -lc$//'''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- old_archive_from_new_cmds='true' +- # FIXME: Should let the user specify the lib program. +- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' +- fix_srcfile_path='`cygpath -w "$srcfile"`' +- enable_shared_with_static_runtimes=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ always_export_symbols=yes ++ file_list_spec='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' -e '1\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\(.*\\\)/-link\\ -EXPORT:\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' ++ enable_shared_with_static_runtimes=yes ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '''/^[BCDGRS][ ]/s/.*[ ]([^ ]*)/\1,DATA/''' | $SED -e '''/^[AITW][ ]/s/.*[ ]//''' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ old_postinstall_cmds='chmod 644 $oldlib' ++ postlink_cmds='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '''s/ -lc$//'''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ old_archive_from_new_cmds='true' ++ # FIXME: Should let the user specify the lib program. ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ enable_shared_with_static_runtimes=yes ++ ;; ++ esac

•   ;;
  

• darwin* | rhapsody*)
  

+@@ -8631,7 +9214,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  

• freebsd* | dragonfly*)
  

+- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

•   hardcode_libdir_flag_spec='-R$libdir'
  

•   hardcode_direct=yes
  

•   hardcode_shlibpath_var=no
  

+@@ -8639,7 +9222,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• hpux9*)
  

•   if test "$GCC" = yes; then
  

+- 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' ++ 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'

•   else
  

• 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'

•   fi
  

+@@ -8655,7 +9238,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

• hpux10*)
  

•   if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

•   else
  

• archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'

•   fi
  

+@@ -8679,10 +9262,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

•  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  

•  ;;
  

• ia64*)

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

•  ;;
  

• *)

+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

•  ;;
  

• esac

•   else
  

+@@ -8761,26 +9344,39 @@ fi

• irix5* | irix6* | nonstopux*)
  

•   if test "$GCC" = yes; then
  

+- 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' ++ 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'

• # Try to use the -exported_symbol ld option, if it does not
• # work, assume that -exports_file does not work either and
• # implicitly export all symbols.

+- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- if test x$gcc_no_link = xyes; then ++ # This should be the same for all languages, so no per-tag cache variable. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 ++$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } ++if test "${lt_cv_irix_exported_symbol+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ if test x$gcc_no_link = xyes; then

• as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
• fi
• cat confdefs.h - <<_ACEOF >conftest.$ac_ext
• /* end confdefs.h. */

+-int foo(void) {} ++int foo (void) { return 0; }

• _ACEOF
• if ac_fn_c_try_link "$LINENO"; then :

+- 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' +- ++ lt_cv_irix_exported_symbol=yes ++else ++ lt_cv_irix_exported_symbol=no

• fi
• rm -f core conftest.err conftest.$ac_objext \

• conftest$ac_exeext conftest.$ac_ext
  

+- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 ++$as_echo "$lt_cv_irix_exported_symbol" >&6; } ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ 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' ++ fi

•   else
  

• 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'
• 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'

+@@ -8865,7 +9461,7 @@ rm -f core conftest.err conftest.$ac_objext \

• osf4* | osf5*)	# as osf3* with the addition of -msym flag
  

•   if test "$GCC" = yes; then
  

• allow_undefined_flag=' ${wl}-expect_unresolved ${wl}*'

+- 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' ++ 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'

• hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'

•   else
  

• allow_undefined_flag=' -expect_unresolved *'

+@@ -8884,9 +9480,9 @@ rm -f core conftest.err conftest.$ac_objext \

•   no_undefined_flag=' -z defs'
  

•   if test "$GCC" = yes; then
  

• wlarc='${wl}'

+- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

• archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/(.*)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~

+- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $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'

•   else
  

• case `$CC -V 2>&1` in
• *"Compilers 5.0"*)

+@@ -9462,8 +10058,9 @@ cygwin* | mingw* | pw32* | cegcc*)

• need_version=no
• need_lib_prefix=no

+- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc

• library_names_spec='$libname.dll.a'
  

• # DLL is installed to $(libdir)/../bin by postinstall_cmds
  

• postinstall_cmds='base_file=`basename \${file}`~
  

+@@ -9496,13 +10093,71 @@ cygwin* | mingw* | pw32* | cegcc*)

•   library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  

•   ;;
  

• esac
  

++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\|/|g' -e 's| \([a-zA-Z]\):| /\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename ${file}`~ ++ dlpath=`$SHELL 2>&1 -c '''. $dir/'''${base_file}'''i; echo $dlname'''`~ ++ dldir=$destdir/`dirname $dlpath`~ ++ test -d $dldir || mkdir -p $dldir~ ++ $install_prog $dir/$dlname $dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '''. $file; echo $dlname'''`~ ++ dlpath=$dir/$dldll~ ++ $RM $dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe'

• ;;
  

• *)

++ # Assume MSVC wrapper

• library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  

++ dynamic_linker='Win32 ld.exe'

• ;;
  

• esac

+- dynamic_linker='Win32 ld.exe'

• # FIXME: first we should search . and the directory the executable is in
• shlibpath_var=PATH
• ;;

+@@ -9594,7 +10249,7 @@ haiku*)

• soname_spec='${libname}${release}${shared_ext}$major'
• shlibpath_var=LIBRARY_PATH
• shlibpath_overrides_runpath=yes

+- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'

• hardcode_into_libs=yes
• ;;

+@@ -10408,7 +11063,7 @@ else

• lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
• lt_status=$lt_dlunknown
• cat > conftest.$ac_ext <<_LT_EOF

+-#line 10411 "configure" ++#line $LINENO "configure"

• #include "confdefs.h"
• #if HAVE_DLFCN_H

+@@ -10452,10 +11107,10 @@ else

• /* When -fvisbility=hidden is used, assume the code has been annotated
• correspondingly for the symbols needed. */
• #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

+-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default")));

• #endif

+-void fnord () { int i=42; } ++int fnord () { return 42; }

• int main ()
• {
• void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

+@@ -10514,7 +11169,7 @@ else

• lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
• lt_status=$lt_dlunknown
• cat > conftest.$ac_ext <<_LT_EOF

+-#line 10517 "configure" ++#line $LINENO "configure"

• #include "confdefs.h"
• #if HAVE_DLFCN_H

+@@ -10558,10 +11213,10 @@ else

• /* When -fvisbility=hidden is used, assume the code has been annotated
• correspondingly for the symbols needed. */
• #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

+-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default")));

• #endif

+-void fnord () { int i=42; } ++int fnord () { return 42; }

• int main ()
• {
• void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

+@@ -11993,13 +12648,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'

• lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
• lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
• lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'

++lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' ++lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'

• reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
• reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
• OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
• deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
• file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'

++file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' ++want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' ++DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' ++sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'

• AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
• AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'

++archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'

• STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
• RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
• old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'

+@@ -12014,14 +12676,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de

• lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
• lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
• 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"`'

++nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' ++lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'

• objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
• MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
• lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'

+-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'

• lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'

++lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'

• lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
• lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
• need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'

++MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'

• DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
• NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
• LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'

+@@ -12054,12 +12719,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q

• hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
• inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
• link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'

+-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'

• always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
• export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
• exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
• include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
• prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'

++postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'

• file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
• variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
• need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'

+@@ -12114,8 +12779,13 @@ reload_flag \

• OBJDUMP \
• deplibs_check_method \
• file_magic_cmd \

++file_magic_glob \ ++want_nocaseglob \ ++DLLTOOL \ ++sharedlib_from_linklib_cmd \

• AR \
• AR_FLAGS \

++archiver_list_spec \

• STRIP \
• RANLIB \
• CC \

+@@ -12125,12 +12795,14 @@ lt_cv_sys_global_symbol_pipe \

• lt_cv_sys_global_symbol_to_cdecl \
• lt_cv_sys_global_symbol_to_c_name_address \
• lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \

++nm_file_list_spec \

• lt_prog_compiler_no_builtin_flag \

+-lt_prog_compiler_wl \

• lt_prog_compiler_pic \

++lt_prog_compiler_wl \

• lt_prog_compiler_static \
• lt_cv_prog_compiler_c_o \
• need_locks \

++MANIFEST_TOOL \

• DSYMUTIL \
• NMEDIT \
• LIPO \

+@@ -12146,7 +12818,6 @@ no_undefined_flag \

• hardcode_libdir_flag_spec \
• hardcode_libdir_flag_spec_ld \
• hardcode_libdir_separator \

+-fix_srcfile_path \

• exclude_expsyms \
• include_expsyms \
• file_list_spec \

+@@ -12182,6 +12853,7 @@ module_cmds \

• module_expsym_cmds \
• export_symbols_cmds \
• prelink_cmds \

++postlink_cmds \

• postinstall_cmds \
• postuninstall_cmds \
• finish_cmds \

+@@ -12771,7 +13443,8 @@ $as_echo X"$file" |

• # NOTE: Changes made to this file will be lost: look at ltmain.sh.
• #
• # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,

+-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc.

• # Written by Gordon Matzigkeit, 1996
• #
• # This file is part of GNU Libtool.

+@@ -12874,19 +13547,42 @@ SP2NL=$lt_lt_SP2NL

• # turn newlines into spaces.
• NL2SP=$lt_lt_NL2SP

++# convert $build file names to $host format. ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++ ++# convert $build files to toolchain format. ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++

• # An object symbol dumper.
• OBJDUMP=$lt_OBJDUMP
• # Method to check whether dependent libraries are shared objects.
• deplibs_check_method=$lt_deplibs_check_method

+-# Command to use when deplibs_check_method == "file_magic". ++# Command to use when deplibs_check_method = "file_magic".

• file_magic_cmd=$lt_file_magic_cmd

++# How to find potential files when deplibs_check_method = "file_magic". ++file_magic_glob=$lt_file_magic_glob ++ ++# Find potential files using nocaseglob when deplibs_check_method = "file_magic". ++want_nocaseglob=$lt_want_nocaseglob ++ ++# DLL creation program. ++DLLTOOL=$lt_DLLTOOL ++ ++# Command to associate shared and link libraries. ++sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd ++

• # The archiver.
• AR=$lt_AR

++ ++# Flags to create an archive.

• AR_FLAGS=$lt_AR_FLAGS

++# How to feed a file listing to the archiver. ++archiver_list_spec=$lt_archiver_list_spec ++

• # A symbol stripping program.
• STRIP=$lt_STRIP

+@@ -12916,6 +13612,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address

• # Transform the output of nm in a C name address pair when lib prefix is needed.
• global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix

++# Specify filename containing input files for $NM. ++nm_file_list_spec=$lt_nm_file_list_spec ++ ++# The root where to search for dependent libraries,and in which our libraries should be installed. ++lt_sysroot=$lt_sysroot ++

• # The name of the directory that contains temporary libtool files.
• objdir=$objdir

+@@ -12925,6 +13627,9 @@ MAGIC_CMD=$MAGIC_CMD

• # Must we lock files when doing compilation?
• need_locks=$lt_need_locks

++# Manifest tool. ++MANIFEST_TOOL=$lt_MANIFEST_TOOL ++

• # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
• DSYMUTIL=$lt_DSYMUTIL

+@@ -13039,12 +13744,12 @@ with_gcc=$GCC

• # Compiler flag to turn off builtin functions.
• no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag

+-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl +-

• # Additional compiler flags for building library objects.
• pic_flag=$lt_lt_prog_compiler_pic

++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl ++

• # Compiler flag to prevent dynamic linking.
• link_static_flag=$lt_lt_prog_compiler_static

+@@ -13131,9 +13836,6 @@ inherit_rpath=$inherit_rpath

• # Whether libtool must link a program against all its dependency libraries.
• link_all_deplibs=$link_all_deplibs

+-# Fix the shell variable $srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path +-

• # Set to "yes" if exported symbols are required.
• always_export_symbols=$always_export_symbols

+@@ -13149,6 +13851,9 @@ include_expsyms=$lt_include_expsyms

• # Commands necessary for linking programs (against libraries) with templates.
• prelink_cmds=$lt_prelink_cmds

++# Commands necessary for finishing linking programs. ++postlink_cmds=$lt_postlink_cmds ++

• # Specify filename containing input files.
• file_list_spec=$lt_file_list_spec

+@@ -13181,210 +13886,169 @@ ltmain="$ac_aux_dir/ltmain.sh"

• # if finds mixed CR/LF and LF-only lines. Since sed operates in
• # text mode, it properly converts lines to CR/LF. This bash problem
• # is reportedly fixed, but why not run on old versions too?

+- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- case $xsi_shell in +- yes) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $* )) +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} +- +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << _LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} +- +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\${2}$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}$%%"`;; +- esac +-} +- +-# sed scripts: +-my_sed_long_opt='1s/^(-[^=]*)=.*/\1/;q' +-my_sed_long_arg='1s/^-[^=]*=//' +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/.[^.]*$/.lo/'` +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$@"` +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` +-} +- +-_LT_EOF +-esac +- +-case $lt_shell_append in +- yes) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1+=$2" +-} +-_LT_EOF +- ;; +- *) +- cat << _LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1=$$1$2" +-} +- +-_LT_EOF +- ;; +- esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ if test x"$xsi_shell" = xyes; then ++ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ ++func_dirname ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_basename ()$/,/^} # func_basename /c\ ++func_basename ()\ ++{\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ ++func_dirname_and_basename ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ ++func_stripname ()\ ++{\ ++\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ ++\ # positional parameters, so assign one to ordinary parameter first.\ ++\ func_stripname_result=${3}\ ++\ func_stripname_result=${func_stripname_result#"${1}"}\ ++\ func_stripname_result=${func_stripname_result%"${2}"}\ ++} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ ++func_split_long_opt ()\ ++{\ ++\ func_split_long_opt_name=${1%%=*}\ ++\ func_split_long_opt_arg=${1#*=}\ ++} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ ++func_split_short_opt ()\ ++{\ ++\ func_split_short_opt_arg=${1#??}\ ++\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ ++} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ ++func_lo2o ()\ ++{\ ++\ case ${1} in\ ++\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ ++\ *) func_lo2o_result=${1} ;;\ ++\ esac\ ++} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_xform ()$/,/^} # func_xform /c\ ++func_xform ()\ ++{\ ++ func_xform_result=${1%.*}.lo\ ++} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_arith ()$/,/^} # func_arith /c\ ++func_arith ()\ ++{\ ++ func_arith_result=$(( $* ))\ ++} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_len ()$/,/^} # func_len /c\ ++func_len ()\ ++{\ ++ func_len_result=${#1}\ ++} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++fi ++ ++if test x"$lt_shell_append" = xyes; then ++ sed -e '/^func_append ()$/,/^} # func_append /c\ ++func_append ()\ ++{\ ++ eval "${1}+=\${2}"\ ++} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ ++func_append_quoted ()\ ++{\ ++\ func_quote_for_eval "${2}"\ ++\ eval "${1}+=\\ \$func_quote_for_eval_result"\ ++} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append ([a-zA-Z_]{1,}) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append ([a-zA-Z_]{1,}) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi ++ ++if test x"$_lt_function_replace_fail" = x":"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 ++$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} ++fi ++ ++ ++ mv -f "$cfgfile" "$ofile" ||

• (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  

• chmod +x "$ofile"

+-- +2.9.0 diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0007-Add-the-armv5e-architecture-to-binutils.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0007-Add-the-armv5e-architecture-to-binutils.patch new file mode 100644 index 0000000..795abf3 --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0007-Add-the-armv5e-architecture-to-binutils.patch @@ -0,0 +1,35 @@ +From 9475aee8a702aa531737ec12dfd928d52951bc84 Mon Sep 17 00:00:00 2001 +From: Khem Raj raj.khem@gmail.com +Date: Mon, 2 Mar 2015 01:37:10 +0000 +Subject: [PATCH 07/13] Add the armv5e architecture to binutils

+Binutils has a comment that indicates it is supposed to match gcc for +all of the support "-march=" settings, but it was lacking the armv5e setting. +This was a simple way to add it, as thumb instructions shouldn't be generated +by the compiler anyway.

+Upstream-Status: Denied +Upstream maintainer indicated that we should not be using armv5e, even +though it is a legal archicture defined by our gcc.

+Signed-off-by: Mark Hatle mark.hatle@windriver.com +Signed-off-by: Khem Raj raj.khem@gmail.com +---

• gas/config/tc-arm.c | 1 +
• 1 file changed, 1 insertion(+)

+diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c +index 73d0531..4b9e32f 100644 +--- a/gas/config/tc-arm.c ++++ b/gas/config/tc-arm.c +@@ -25421,6 +25421,7 @@ static const struct arm_arch_option_table arm_archs[] =

• ARM_ARCH_OPT ("armv4t", ARM_ARCH_V4T, FPU_ARCH_FPA),
• ARM_ARCH_OPT ("armv4txm", ARM_ARCH_V4TxM, FPU_ARCH_FPA),
• ARM_ARCH_OPT ("armv5", ARM_ARCH_V5, FPU_ARCH_VFP),

++ ARM_ARCH_OPT ("armv5e", ARM_ARCH_V5TE, FPU_ARCH_VFP),

• ARM_ARCH_OPT ("armv5t", ARM_ARCH_V5T, FPU_ARCH_VFP),
• ARM_ARCH_OPT ("armv5txm", ARM_ARCH_V5TxM, FPU_ARCH_VFP),
• ARM_ARCH_OPT ("armv5te", ARM_ARCH_V5TE, FPU_ARCH_VFP),

+-- +2.9.0

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch new file mode 100644 index 0000000..af524ce --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch @@ -0,0 +1,35 @@ +From b2d277937d11f1ce1d581f48ff74a25822a052da Mon Sep 17 00:00:00 2001 +From: Khem Raj raj.khem@gmail.com +Date: Mon, 2 Mar 2015 01:39:01 +0000 +Subject: [PATCH 08/13] don't let the distro compiler point to the wrong

• installation location

+Thanks to RP for helping find the source code causing the issue.

+2010/08/13 +Nitin A Kamble nitin.a.kamble@intel.com

+Upstream-Status: Inappropriate [embedded specific]

+Signed-off-by: Khem Raj raj.khem@gmail.com +---

• libiberty/Makefile.in | 3 ++-
• 1 file changed, 2 insertions(+), 1 deletion(-)

+diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in +index c7a4568..f766b72 100644 +--- a/libiberty/Makefile.in ++++ b/libiberty/Makefile.in +@@ -364,7 +364,8 @@ install-strip: install

• # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
• # default multilib, so we have to take CFLAGS into account as well,
• # since it will be passed the multilib flags.

+-MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory` ++#MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory` ++MULTIOSDIR = ""

• install_to_libdir: all
• if test -n "${target_header_dir}"; then \

• ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
  

+-- +2.9.0

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0009-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0009-warn-for-uses-of-system-directories-when-cross-linki.patch new file mode 100644 index 0000000..3c83e69 --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0009-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -0,0 +1,273 @@ +From 7ab8e318659eb5d9adc758c78d084a95560b93fd Mon Sep 17 00:00:00 2001 +From: Khem Raj raj.khem@gmail.com +Date: Fri, 15 Jan 2016 06:31:09 +0000 +Subject: [PATCH 09/13] warn for uses of system directories when cross linking

+2008-07-02 Joseph Myers joseph@codesourcery.com

• ld/
• • ld.h (args_type): Add error_poison_system_directories.
• • ld.texinfo (--error-poison-system-directories): Document.
• • ldfile.c (ldfile_add_library_path): Check
• command_line.error_poison_system_directories.
• • ldmain.c (main): Initialize
• command_line.error_poison_system_directories.
• • lexsup.c (enum option_values): Add
• OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
• (ld_options): Add --error-poison-system-directories.
• (parse_args): Handle new option.

+2007-06-13 Joseph Myers joseph@codesourcery.com

• ld/
• • config.in: Regenerate.
• • ld.h (args_type): Add poison_system_directories.
• • ld.texinfo (--no-poison-system-directories): Document.
• • ldfile.c (ldfile_add_library_path): Check
• command_line.poison_system_directories.
• • ldmain.c (main): Initialize
• command_line.poison_system_directories.
• • lexsup.c (enum option_values): Add
• OPTION_NO_POISON_SYSTEM_DIRECTORIES.
• (ld_options): Add --no-poison-system-directories.
• (parse_args): Handle new option.

+2007-04-20 Joseph Myers joseph@codesourcery.com

• Merge from Sourcery G++ binutils 2.17:
• 2007-03-20 Joseph Myers joseph@codesourcery.com
• Based on patch by Mark Hatle mark.hatle@windriver.com.
• ld/
• • configure.in (--enable-poison-system-directories): New option.
• • configure, config.in: Regenerate.
• • ldfile.c (ldfile_add_library_path): If
• ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
• /usr/lib, /usr/local/lib or /usr/X11R6/lib.

+Signed-off-by: Mark Hatle mark.hatle@windriver.com +Signed-off-by: Scott Garman scott.a.garman@intel.com +Signed-off-by: Khem Raj raj.khem@gmail.com +--- +Upstream-Status: Pending

• ld/config.in | 3 +++
• ld/configure | 16 ++++++++++++++++
• ld/configure.ac | 10 ++++++++++
• ld/ld.h | 8 ++++++++
• ld/ld.texinfo | 12 ++++++++++++
• ld/ldfile.c | 17 +++++++++++++++++
• ld/ldlex.h | 2 ++
• ld/ldmain.c | 2 ++
• ld/lexsup.c | 16 ++++++++++++++++
• 9 files changed, 86 insertions(+)

+diff --git a/ld/config.in b/ld/config.in +index 2c6d698..d3cb7e8 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -17,6 +17,9 @@

• language is requested. */
• #undef ENABLE_NLS

++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++

• /* Additional extension a shared object might have. */
• #undef EXTRA_SHLIB_EXTENSION

+diff --git a/ld/configure b/ld/configure +index 3df1149..0601c98 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -792,6 +792,7 @@ with_lib_path

• enable_targets
• enable_64_bit_bfd
• with_sysroot

++enable_poison_system_directories

• enable_gold
• enable_got
• enable_compressed_debug_sections

+@@ -1449,6 +1450,8 @@ Optional Features:

• --disable-largefile omit support for large files
• --enable-targets alternative target configurations
• --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)

++ --enable-poison-system-directories ++ warn for use of native system library directories

• --enable-gold[=ARG] build gold [ARG={default,yes,no}]
• --enable-got=<type> GOT handling scheme (target, single, negative,

•                       multigot)
  

+@@ -16313,6 +16316,19 @@ fi

++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi ++

• # Check whether --enable-gold was given.
• if test "${enable_gold+set}" = set; then :
• enableval=$enable_gold; case "${enableval}" in

+diff --git a/ld/configure.ac b/ld/configure.ac +index d17281f..9fb3db9 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)

• AC_SUBST(TARGET_SYSTEM_ROOT)
• AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)

++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++

• dnl Use --enable-gold to decide if this linker should be the default.
• dnl "install_as_default" is set to false if gold is the default linker.
• dnl "installed_linker" is the installed BFD linker name.

+diff --git a/ld/ld.h b/ld/ld.h +index 85a48ad..a8fdddf 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -169,6 +169,14 @@ typedef struct

• /* If set, display the target memory usage (per memory region). */
• bfd_boolean print_memory_usage;

++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bfd_boolean poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bfd_boolean error_poison_system_directories; ++

• /* Big or little endian as set on command line. */
• enum endian_enum endian;

+diff --git a/ld/ld.texinfo b/ld/ld.texinfo +index bc16764..838c75d 100644 +--- a/ld/ld.texinfo ++++ b/ld/ld.texinfo +@@ -2357,6 +2357,18 @@ string identifying the original linked file does not change.

• Passing @code{none} for @var{style} disables the setting from any
• @code{--build-id} options earlier on the command line.

++ ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking.

• @end table
• @c man end

+diff --git a/ld/ldfile.c b/ld/ldfile.c +index e397737..013727b 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)

• new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
  

• else

• new_dirs->name = xstrdup (name);
  

++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path "%s" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path "%s" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++

• }
• /* Try to open a BFD for a lang_input_statement. */

+diff --git a/ld/ldlex.h b/ld/ldlex.h +index cf943e4..12cfcaa 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -144,6 +144,8 @@ enum option_values

• OPTION_PRINT_MEMORY_USAGE,
• OPTION_REQUIRE_DEFINED_SYMBOL,
• OPTION_ORPHAN_HANDLING,

++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,

• };
• /* The initial parser states. */

+diff --git a/ld/ldmain.c b/ld/ldmain.c +index e7a8dff..3ccf2af 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -257,6 +257,8 @@ main (int argc, char **argv)

• command_line.warn_mismatch = TRUE;
• command_line.warn_search_mismatch = TRUE;
• command_line.check_section_addresses = -1;

++ command_line.poison_system_directories = TRUE; ++ command_line.error_poison_system_directories = FALSE;

• /* We initialize DEMANGLING based on the environment variable

•  COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
  

+diff --git a/ld/lexsup.c b/ld/lexsup.c +index 6d28e91..5c9da57 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] =

• { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},

• '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
  

• TWO_DASHES },
  

++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES },

• };
• #define OPTION_COUNT ARRAY_SIZE (ld_options)

+@@ -1550,6 +1558,14 @@ parse_args (unsigned argc, char **argv)

•    einfo (_("%P%F: invalid argument to option"
  

•      " \"--orphan-handling\"\n"));
  

•  break;
  

++ ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = FALSE; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = TRUE; ++ break;

• }

• }
  

+-- +2.9.0

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch new file mode 100644 index 0000000..e2f6a51 --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch @@ -0,0 +1,52 @@ +From 27fc7a4927ab92925a5be84217959d9f1c808ccc Mon Sep 17 00:00:00 2001 +From: Khem Raj raj.khem@gmail.com +Date: Mon, 2 Mar 2015 01:42:38 +0000 +Subject: [PATCH 10/13] Fix rpath in libtool when sysroot is enabled

+Enabling sysroot support in libtool exposed a bug where the final +library had an RPATH encoded into it which still pointed to the +sysroot. This works around the issue until it gets sorted out +upstream.

+Fix suggested by Richard Purdie richard.purdie@linuxfoundation.org

+Upstream-Status: Inappropriate [embedded specific]

+Signed-off-by: Scott Garman scott.a.garman@intel.com +Signed-off-by: Khem Raj raj.khem@gmail.com +---

• ltmain.sh | 10 ++++++++--
• 1 file changed, 8 insertions(+), 2 deletions(-)

+diff --git a/ltmain.sh b/ltmain.sh +index 70e856e..11ee684 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -8035,9 +8035,11 @@ EOF

•  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
  

•  for libdir in $rpath; do
  

•    if test -n "$hardcode_libdir_flag_spec"; then
  

++ func_replace_sysroot "$libdir" ++ libdir=$func_replace_sysroot_result ++ func_stripname '=' '' "$libdir" ++ libdir=$func_stripname_result

•      if test -n "$hardcode_libdir_separator"; then
  

+- func_replace_sysroot "$libdir" +- libdir=$func_replace_sysroot_result

• if test -z "$hardcode_libdirs"; then
  

•   hardcode_libdirs="$libdir"
  

• else
  

+@@ -8770,6 +8772,10 @@ EOF

•   hardcode_libdirs=
  

•   for libdir in $compile_rpath $finalize_rpath; do
  

• if test -n "$hardcode_libdir_flag_spec"; then

++ func_replace_sysroot "$libdir" ++ libdir=$func_replace_sysroot_result ++ func_stripname '=' '' "$libdir" ++ libdir=$func_stripname_result

•  if test -n "$hardcode_libdir_separator"; then
  

•    if test -z "$hardcode_libdirs"; then
  

•      hardcode_libdirs="$libdir"
  

+-- +2.9.0

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0011-Change-default-emulation-for-mips64-linux.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0011-Change-default-emulation-for-mips64-linux.patch new file mode 100644 index 0000000..3fdb5eb --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0011-Change-default-emulation-for-mips64-linux.patch @@ -0,0 +1,59 @@ +From 6b018e8129298dbd5b714e459ef0b3aef5bbce13 Mon Sep 17 00:00:00 2001 +From: Khem Raj raj.khem@gmail.com +Date: Mon, 2 Mar 2015 01:44:14 +0000 +Subject: [PATCH 11/13] Change default emulation for mips64*-*-linux

+we change the default emulations to be N64 instead of N32

+Upstream-Status: Inappropriate [ OE configuration Specific]

+Signed-off-by: Khem Raj raj.khem@gmail.com +---

• bfd/config.bfd | 8 ++++----
• ld/configure.tgt | 8 ++++----
• 2 files changed, 8 insertions(+), 8 deletions(-)

+diff --git a/bfd/config.bfd b/bfd/config.bfd +index b998830..ab17e72 100644 +--- a/bfd/config.bfd ++++ b/bfd/config.bfd +@@ -1101,12 +1101,12 @@ case "${targ}" in

• targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
  

• ;;
  

• mips64*el-*-linux*)

+- targ_defvec=mips_elf32_ntrad_le_vec +- 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" ++ targ_defvec=mips_elf64_trad_le_vec ++ 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"

• ;;
  

• mips64*-*-linux*)

+- targ_defvec=mips_elf32_ntrad_be_vec +- 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" ++ targ_defvec=mips_elf64_trad_be_vec ++ 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"

• ;;
  

• mips*el-*-linux*)

• targ_defvec=mips_elf32_trad_le_vec
  

+diff --git a/ld/configure.tgt b/ld/configure.tgt +index a3db909..212327c 100644 +--- a/ld/configure.tgt ++++ b/ld/configure.tgt +@@ -513,11 +513,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmipvxworks

• mips*-*-vxworks*) targ_emul=elf32ebmipvxworks

•         targ_extra_emuls="elf32elmipvxworks" ;;
  

• mips*-*-windiss) targ_emul=elf32mipswindiss ;;

+-mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 +- targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" ++mips64*el-*-linux-*) targ_emul=elf64ltsmip ++ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip"

• 	targ_extra_libpath=$targ_extra_emuls ;;
  

+-mips64*-*-linux-*) targ_emul=elf32btsmipn32 +- targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" ++mips64*-*-linux-*) targ_emul=elf64btsmip ++ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"

• 	targ_extra_libpath=$targ_extra_emuls ;;
  

• mips*el-*-linux-*) targ_emul=elf32ltsmip

• 	targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
  

+-- +2.9.0

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0012-Add-support-for-Netlogic-XLP.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0012-Add-support-for-Netlogic-XLP.patch new file mode 100644 index 0000000..8103347 --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0012-Add-support-for-Netlogic-XLP.patch @@ -0,0 +1,413 @@ +From c2e138f4ccdf8af81c18c8511c901d3deee696b5 Mon Sep 17 00:00:00 2001 +From: Khem Raj raj.khem@gmail.com +Date: Sun, 14 Feb 2016 17:06:19 +0000 +Subject: [PATCH 12/13] Add support for Netlogic XLP

+Patch From: Nebu Philips nphilips@netlogicmicro.com

+Using the mipsisa64r2nlm target, add support for XLP from +Netlogic. Also, update vendor name to NLM wherever applicable.

+Use 0x00000080 for INSN_XLP, the value 0x00000040 has already been +assigned to INSN_OCTEON3

+Signed-off-by: Khem Raj raj.khem@gmail.com +Signed-off-by: Baoshan Pang baoshan.pang@windriver.com +Signed-off-by: Mark Hatle mark.hatle@windriver.com +--- +Upstream-Status: Pending

• bfd/aoutx.h | 1 +
• bfd/archures.c | 1 +
• bfd/bfd-in2.h | 1 +
• bfd/config.bfd | 5 +++++
• bfd/cpu-mips.c | 6 ++++--
• bfd/elfxx-mips.c | 8 ++++++++
• binutils/readelf.c | 1 +
• gas/config/tc-mips.c | 4 +++-
• gas/configure | 3 +++
• gas/configure.tgt | 2 +-
• include/elf/mips.h | 1 +
• include/opcode/mips.h | 10 ++++++++--
• ld/configure.tgt | 2 ++
• opcodes/mips-dis.c | 12 +++++-------
• opcodes/mips-opc.c | 33 +++++++++++++++++++++------------
• 15 files changed, 65 insertions(+), 25 deletions(-)

+diff --git a/bfd/aoutx.h b/bfd/aoutx.h +index be0126a..4ca7e24 100644 +--- a/bfd/aoutx.h ++++ b/bfd/aoutx.h +@@ -812,6 +812,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch,

• case bfd_mach_mipsisa64r6:
• case bfd_mach_mips_sb1:
• case bfd_mach_mips_xlr:

++ case bfd_mach_mips_xlp:

•  /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc.  */
  

•  arch_flags = M_MIPS2;
  

•  break;
  

+diff --git a/bfd/archures.c b/bfd/archures.c +index 96c9109..5a30d02 100644 +--- a/bfd/archures.c ++++ b/bfd/archures.c +@@ -197,6 +197,7 @@ DESCRIPTION

• .#define bfd_mach_mips_octeon2 6502
• .#define bfd_mach_mips_octeon3 6503
• .#define bfd_mach_mips_xlr 887682 {* decimal 'XLR' *}

++.#define bfd_mach_mips_xlp 887680 {* decimal 'XLP' *}

• .#define bfd_mach_mipsisa32 32
• .#define bfd_mach_mipsisa32r2 33
• .#define bfd_mach_mipsisa32r3 34

+diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 30513c4..5e8ed4c 100644 +--- a/bfd/bfd-in2.h ++++ b/bfd/bfd-in2.h +@@ -2008,6 +2008,7 @@ enum bfd_architecture

• #define bfd_mach_mips_octeon2 6502
• #define bfd_mach_mips_octeon3 6503
• #define bfd_mach_mips_xlr 887682 /* decimal 'XLR' */

++#define bfd_mach_mips_xlp 887680 /* decimal 'XLP' */

• #define bfd_mach_mipsisa32 32
• #define bfd_mach_mipsisa32r2 33
• #define bfd_mach_mipsisa32r3 34

+diff --git a/bfd/config.bfd b/bfd/config.bfd +index ab17e72..863be89 100644 +--- a/bfd/config.bfd ++++ b/bfd/config.bfd +@@ -1084,6 +1084,11 @@ case "${targ}" in

• targ_defvec=mips_elf32_le_vec
  

• targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec"
  

• ;;
  

++ mipsisa64*-*-elf*) ++ targ_defvec=mips_elf32_trad_be_vec ++ targ_selvecs="mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec" ++ want64=true ++ ;;

• mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none)

• targ_defvec=mips_elf32_be_vec
  

• targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec"
  

+diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c +index d209fb6..b6a86ae 100644 +--- a/bfd/cpu-mips.c ++++ b/bfd/cpu-mips.c +@@ -104,7 +104,8 @@ enum

• I_mipsocteon2,
• I_mipsocteon3,
• I_xlr,

+- I_micromips ++ I_micromips, ++ I_xlp

• };
• #define NN(index) (&arch_info_struct[(index) + 1])

+@@ -155,7 +156,8 @@ static const bfd_arch_info_type arch_info_struct[] =

• N (64, 64, bfd_mach_mips_octeon2,"mips:octeon2", FALSE, NN(I_mipsocteon2)),
• N (64, 64, bfd_mach_mips_octeon3, "mips:octeon3", FALSE, NN(I_mipsocteon3)),
• N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)),

+- N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0) ++ N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,NN(I_micromips)), ++ N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, 0)

• };
• /* The default architecture is mips:3000, but with a machine number of

+diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c +index e47276b..71c30a0 100644 +--- a/bfd/elfxx-mips.c ++++ b/bfd/elfxx-mips.c +@@ -6646,6 +6646,9 @@ _bfd_elf_mips_mach (flagword flags)

• case E_MIPS_MACH_XLR:
  

•   return bfd_mach_mips_xlr;
  

++ case E_MIPS_MACH_XLP: ++ return bfd_mach_mips_xlp; ++

• default:
  

•   switch (flags & EF_MIPS_ARCH)
  

• {

+@@ -11949,6 +11952,10 @@ mips_set_isa_flags (bfd *abfd)

•   val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2;
  

•   break;
  

++ case bfd_mach_mips_xlp: ++ val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_XLP; ++ break; ++

• case bfd_mach_mipsisa32:
  

•   val = E_MIPS_ARCH_32;
  

•   break;
  

+@@ -13975,6 +13982,7 @@ static const struct mips_mach_extension mips_mach_extensions[] =

• { bfd_mach_mips_octeonp, bfd_mach_mips_octeon },
• { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 },
• { bfd_mach_mips_loongson_3a, bfd_mach_mipsisa64r2 },

++ { bfd_mach_mips_xlp, bfd_mach_mipsisa64r2 },

• /* MIPS64 extensions. */
• { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 },

+diff --git a/binutils/readelf.c b/binutils/readelf.c +index 274ddd1..d31558c 100644 +--- a/binutils/readelf.c ++++ b/binutils/readelf.c +@@ -3230,6 +3230,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)

•    case E_MIPS_MACH_OCTEON2: strcat (buf, ", octeon2"); break;
  

•    case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break;
  

•    case E_MIPS_MACH_XLR:  strcat (buf, ", xlr"); break;
  

++ case E_MIPS_MACH_XLP: strcat (buf, ", xlp"); break;

•    case 0:
  

•    /* We simply ignore the field in this case to avoid confusion:
  

•       MIPS ELF does not specify EF_MIPS_MACH, it is a GNU
  

+diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c +index eb8b26b..e59dce6 100644 +--- a/gas/config/tc-mips.c ++++ b/gas/config/tc-mips.c +@@ -552,6 +552,7 @@ static int mips_32bitmode = 0;

• || mips_opts.arch == CPU_RM7000 \
• || mips_opts.arch == CPU_VR5500 \
• || mips_opts.micromips \

++ || mips_opts.arch == CPU_XLP \

• )
• /* Whether the processor uses hardware interlocks to protect reads

+@@ -581,6 +582,7 @@ static int mips_32bitmode = 0;

• && mips_opts.isa != ISA_MIPS3)                    \
  

• || mips_opts.arch == CPU_R4300 \
• || mips_opts.micromips \

++ || mips_opts.arch == CPU_XLP \

• )
• /* Whether the processor uses hardware interlocks to protect reads

+@@ -18858,7 +18860,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] =

• /* Broadcom XLP.

•  XLP is mostly like XLR, with the prominent exception that it is
  

•  MIPS64R2 rather than MIPS64.  */
  

+- { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLR }, ++ { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLP },

• /* MIPS 64 Release 6 */
• { "i6400", 0, ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6},

+diff --git a/gas/configure b/gas/configure +index 45da030..aba89f7 100755 +--- a/gas/configure ++++ b/gas/configure +@@ -12914,6 +12914,9 @@ _ACEOF

•  mipsisa64r6 | mipsisa64r6el)
  

•    mips_cpu=mips64r6
  

•    ;;
  

++ mipsisa64r2nlm | mipsisa64r2nlmel) ++ mips_cpu=xlp ++ ;;

•  mipstx39 | mipstx39el)
  

•    mips_cpu=r3900
  

•    ;;
  

+diff --git a/gas/configure.tgt b/gas/configure.tgt +index 1b9fd99..a9f1977 100644 +--- a/gas/configure.tgt ++++ b/gas/configure.tgt +@@ -339,7 +339,7 @@ case ${generic_target} in

• mips-*-sysv4*MP* | mips-*-gnu*) fmt=elf em=tmips ;;
• mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*)

• 			fmt=elf em=tmips ;;
  

+- mips-*-elf* | mips-*-rtems*) fmt=elf ;; ++ mips-*-elf* | mips-*-rtems*) fmt=elf em=tmips ;;

• mips-*-netbsd*) fmt=elf em=tmips ;;
• mips-*-openbsd*) fmt=elf em=tmips ;;

+diff --git a/include/elf/mips.h b/include/elf/mips.h +index 7e813de..d7d72c1 100644 +--- a/include/elf/mips.h ++++ b/include/elf/mips.h +@@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext)

• #define E_MIPS_MACH_SB1 0x008a0000
• #define E_MIPS_MACH_OCTEON 0x008b0000
• #define E_MIPS_MACH_XLR 0x008c0000

++#define E_MIPS_MACH_XLP 0x008f0000

• #define E_MIPS_MACH_OCTEON2 0x008d0000
• #define E_MIPS_MACH_OCTEON3 0x008e0000
• #define E_MIPS_MACH_5400 0x00910000

+diff --git a/include/opcode/mips.h b/include/opcode/mips.h +index b1d4ef6..f2c8e88 100644 +--- a/include/opcode/mips.h ++++ b/include/opcode/mips.h +@@ -1232,8 +1232,10 @@ static const unsigned int mips_isa_table[] = {

• #define INSN_LOONGSON_2F 0x80000000
• /* Loongson 3A. */
• #define INSN_LOONGSON_3A 0x00000400

+-/* RMI Xlr instruction */ +-#define INSN_XLR 0x00000020 ++/* Netlogic Xlr instruction */ ++#define INSN_XLR 0x00000020 ++/* Netlogic XlP instruction */ ++#define INSN_XLP 0x00000080

• /* DSP ASE */
• #define ASE_DSP 0x00000001

+@@ -1331,6 +1333,7 @@ static const unsigned int mips_isa_table[] = {

• #define CPU_OCTEON2 6502
• #define CPU_OCTEON3 6503
• #define CPU_XLR 887682 /* decimal 'XLR' */

++#define CPU_XLP 887680 /* decimal 'XLP' */

• /* Return true if the given CPU is included in INSN_* mask MASK. */

+@@ -1408,6 +1411,9 @@ cpu_is_member (int cpu, unsigned int mask)

•   return ((mask & INSN_ISA_MASK) == INSN_ISA32R6)
  

•     || ((mask & INSN_ISA_MASK) == INSN_ISA64R6);
  

++ case CPU_XLP: ++ return (mask & INSN_XLP) != 0; ++

• default:
  

•   return FALSE;
  

• }
  

+diff --git a/ld/configure.tgt b/ld/configure.tgt +index 212327c..212e09c 100644 +--- a/ld/configure.tgt ++++ b/ld/configure.tgt +@@ -499,6 +499,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mips*el-img-elf*)

• mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*)

• 	targ_emul=elf32btsmip
  

• 	targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;;
  

++mipsisa64*-*-elf*) targ_emul=elf32btsmip ++ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ;;

• mips64*el-ps2-elf*) targ_emul=elf32lr5900n32

• 	targ_extra_emuls="elf32lr5900"
  

• 	targ_extra_libpath=$targ_extra_emuls ;;
  

+diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c +index 3f874e7..9813d0e 100644 +--- a/opcodes/mips-dis.c ++++ b/opcodes/mips-dis.c +@@ -648,13 +648,11 @@ const struct mips_arch_choice mips_arch_choices[] =

• mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr),
  

• mips_cp1_names_mips3264, mips_hwr_names_numeric },
  

+- /* XLP is mostly like XLR, with the prominent exception it is being +- MIPS64R2. */ +- { "xlp", 1, bfd_mach_mips_xlr, CPU_XLR, +- ISA_MIPS64R2 | INSN_XLR, 0, +- mips_cp0_names_xlr, +- mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), +- mips_cp1_names_mips3264, mips_hwr_names_numeric }, ++ { "xlp", 1, bfd_mach_mips_xlp, CPU_XLP, ++ ISA_MIPS64R2 | INSN_XLP, 0, ++ mips_cp0_names_mips3264r2, ++ mips_cp0sel_names_mips3264r2, ARRAY_SIZE (mips_cp0sel_names_mips3264r2), ++ mips_cp1_names_mips3264, mips_hwr_names_mips3264r2 },

• /* This entry, mips16, is here only for ISA/processor selection; do

•  not print its name.  */
  

+diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c +index a95eff1..99fb7bb 100644 +--- a/opcodes/mips-opc.c ++++ b/opcodes/mips-opc.c +@@ -320,7 +320,8 @@ decode_mips_operand (const char *p)

• #define IOCTP (INSN_OCTEONP | INSN_OCTEON2 | INSN_OCTEON3)
• #define IOCT2 (INSN_OCTEON2 | INSN_OCTEON3)
• #define IOCT3 INSN_OCTEON3

+-#define XLR INSN_XLR ++#define XLR INSN_XLR ++#define XLP INSN_XLP

• #define IVIRT ASE_VIRT
• #define IVIRT64 ASE_VIRT64

+@@ -958,6 +959,7 @@ const struct mips_opcode mips_builtin_opcodes[] =

• {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 },
• {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 },
• {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 },

++{"crc", "d,s,t", 0x7000001c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 },

• /* ctc0 is at the bottom of the table. */
• {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 },
• {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 },

+@@ -990,12 +992,13 @@ const struct mips_opcode mips_builtin_opcodes[] =

• {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 },
• {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 },
• {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 },

+-{"daddwc", "d,s,t", 0x70000038, 0xfc0007ff, WR_1|RD_2|RD_3|WR_C0|RD_C0, 0, XLR, 0, 0 }, ++{"daddwc", "d,s,t", 0x70000038, 0xfc0007ff, WR_1|RD_2|RD_3|WR_C0|RD_C0, 0, XLR|XLP, 0, 0 },

• {"dbreak", "", 0x7000003f, 0xffffffff, 0, 0, N5, 0, 0 },
• {"dclo", "d,s", 0x00000053, 0xfc1f07ff, WR_1|RD_2, 0, I69, 0, 0 },
• {"dclo", "U,s", 0x70000025, 0xfc0007ff, WR_1|RD_2, 0, I64|N55, 0, I69 },
• {"dclz", "d,s", 0x00000052, 0xfc1f07ff, WR_1|RD_2, 0, I69, 0, 0 },
• {"dclz", "U,s", 0x70000024, 0xfc0007ff, WR_1|RD_2, 0, I64|N55, 0, I69 },

++{"dcrc", "d,s,t", 0x7000001d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 },

• /* dctr and dctw are used on the r5000. */
• {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 },
• {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 },

+@@ -1067,6 +1070,7 @@ const struct mips_opcode mips_builtin_opcodes[] =

• {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 },
• {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 },
• {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 },

++{"dmfur", "t,d", 0x7000001e, 0xffe007ff, WR_1, 0, XLP, 0, 0 },

• {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 },
• {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 },
• {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE },

+@@ -1082,6 +1086,8 @@ const struct mips_opcode mips_builtin_opcodes[] =

• /* dmfc3 is at the bottom of the table. */
• /* dmtc3 is at the bottom of the table. */
• {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },

++{"dmtur", "t,d", 0x7000001f, 0xffe007ff, RD_1, 0, XLP, 0, 0 }, ++{"dmul", "d,s,t", 0x70000006, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 },

• {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
• {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 },
• {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 },

+@@ -1235,9 +1241,9 @@ const struct mips_opcode mips_builtin_opcodes[] =

• {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 },
• {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 },
• {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 },

+-{"ldaddw", "t,b", 0x70000010, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, +-{"ldaddwu", "t,b", 0x70000011, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, +-{"ldaddd", "t,b", 0x70000012, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, ++{"ldaddw", "t,b", 0x70000010, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, ++{"ldaddwu", "t,b", 0x70000011, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, ++{"ldaddd", "t,b", 0x70000012, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 },

• {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF },
• {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF },
• {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF },

+@@ -1402,7 +1408,7 @@ const struct mips_opcode mips_builtin_opcodes[] =

• {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 },
• {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 },
• {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 },

+-{"mfcr", "t,s", 0x70000018, 0xfc00ffff, WR_1|RD_2, 0, XLR, 0, 0 }, ++{"mfcr", "t,s", 0x70000018, 0xfc00ffff, WR_1, 0, XLR|XLP, 0, 0 },

• {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 },
• {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 },
• {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 },

+@@ -1447,10 +1453,13 @@ const struct mips_opcode mips_builtin_opcodes[] =

• /* move is at the top of the table. */
• {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 },
• {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 },

++{"msgsnds", "d,t", 0x4a000001, 0xffe007ff, WR_1|RD_2|RD_C0|WR_C0, 0, XLP, 0, 0 },

• {"msgld", "", 0, (int) M_MSGLD, INSN_MACRO, 0, XLR, 0, 0 },
• {"msgld", "t", 0, (int) M_MSGLD_T, INSN_MACRO, 0, XLR, 0, 0 },

+-{"msgwait", "", 0, (int) M_MSGWAIT, INSN_MACRO, 0, XLR, 0, 0 }, +-{"msgwait", "t", 0, (int) M_MSGWAIT_T,INSN_MACRO, 0, XLR, 0, 0 }, ++{"msglds", "d,t", 0x4a000002, 0xffe007ff, WR_1|RD_2|RD_C0|WR_C0, 0, XLP, 0, 0 }, ++{"msgwait", "", 0, (int) M_MSGWAIT, INSN_MACRO, 0, XLR|XLP, 0, 0 }, ++{"msgwait", "t", 0, (int) M_MSGWAIT_T,INSN_MACRO, 0, XLR|XLP, 0, 0 }, ++{"msgsync", "", 0x4a000004, 0xffffffff,0, 0, XLP, 0, 0 },

• {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 },
• {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 },
• {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 },

+@@ -1500,7 +1509,7 @@ const struct mips_opcode mips_builtin_opcodes[] =

• {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 },
• {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 },
• {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 },

+-{"mtcr", "t,s", 0x70000019, 0xfc00ffff, RD_1|RD_2, 0, XLR, 0, 0 }, ++{"mtcr", "t,s", 0x70000019, 0xfc00ffff, RD_1, 0, XLR|XLP, 0, 0 },

• {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
• {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 },
• {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },

+@@ -1937,9 +1946,9 @@ const struct mips_opcode mips_builtin_opcodes[] =

• {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37},
• {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 },
• {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 },

+-{"swapw", "t,b", 0x70000014, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, +-{"swapwu", "t,b", 0x70000015, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, +-{"swapd", "t,b", 0x70000016, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 }, ++{"swapw", "t,b", 0x70000014, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, ++{"swapwu", "t,b", 0x70000015, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, ++{"swapd", "t,b", 0x70000016, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 },

• {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 },
• {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 },
• {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 },

+-- +2.9.0

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch new file mode 100644 index 0000000..f314d64 --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch @@ -0,0 +1,36 @@ +From 0c04c3b626998c8e7b595381b35456428581f52a Mon Sep 17 00:00:00 2001 +From: Zhenhua Luo zhenhua.luo@nxp.com +Date: Sat, 11 Jun 2016 22:08:29 -0500 +Subject: [PATCH 13/13] fix the incorrect assembling for ppc wait mnemonic

+Signed-off-by: Zhenhua Luo zhenhua.luo@nxp.com

+Upstream-Status: Pending +---

• opcodes/ppc-opc.c | 3 +--
• 1 file changed, 1 insertion(+), 2 deletions(-)

+diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c +index 8106ab7..ca4b0f3 100644 +--- a/opcodes/ppc-opc.c ++++ b/opcodes/ppc-opc.c +@@ -4811,7 +4811,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {

• {"ldepx", X(31,29), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}},
• {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}},

+-{"wait", X(31,30), XWC_MASK, POWER9, 0, {WC}},

• {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}},

+@@ -4865,7 +4864,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {

• {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}},
• {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}},

+-{"wait", X(31,62), XWC_MASK, E500MC|PPCA2, 0, {WC}}, ++{"wait", X(31,62), XWC_MASK, E500MC|PPCA2|POWER9, 0, {WC}},

• {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}},

+-- +2.9.0

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0014-libtool-remove-rpath.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0014-libtool-remove-rpath.patch new file mode 100644 index 0000000..d56948f --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0014-libtool-remove-rpath.patch @@ -0,0 +1,100 @@ +Apply these patches from our libtool patches as not only are redundant RPATHs a +waste of space but they can cause incorrect linking when native packages are +restored from sstate.

+fix-rpath.patch: +We don't want to add RPATHS which match default linker +search paths, they're a waste of space. This patch +filters libtools list and removes the ones we don't need.

+norm-rpath.patch: +Libtool may be passed link paths of the form "/usr/lib/../lib", which +fool its detection code into thinking it should be included as an +RPATH in the generated binary. Normalize before comparision.

+Upstream-Status: Inappropriate +Signed-off-by: Ross Burton ross.burton@intel.com

+diff --git a/ltmain.sh b/ltmain.sh +index 683317c..860a16a 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -8053,8 +8053,14 @@ EOF

•   esac
  

• fi
  

•      else
  

+- eval flag="$hardcode_libdir_flag_spec" +- func_append dep_rpath " $flag" ++ # We only want to hardcode in an rpath if it isn't in the ++ # default dlsearch path. ++ case " $sys_lib_dlsearch_path " in ++ *" $libdir "*) ;; ++ *) eval flag="$hardcode_libdir_flag_spec" ++ func_append dep_rpath " $flag" ++ ;; ++ esac

•      fi
  

•    elif test -n "$runpath_var"; then
  

•      case "$perm_rpath " in
  

+@@ -8790,8 +8796,14 @@ EOF

•      esac
  

•    fi
  

•  else
  

+- eval flag="$hardcode_libdir_flag_spec" +- func_append rpath " $flag" ++ # We only want to hardcode in an rpath if it isn't in the ++ # default dlsearch path. ++ case " $sys_lib_dlsearch_path " in ++ *" $libdir "*) ;; ++ *) eval flag="$hardcode_libdir_flag_spec" ++ rpath+=" $flag" ++ ;; ++ esac

•  fi
  

• elif test -n "$runpath_var"; then

•  case "$perm_rpath " in
  

+@@ -8841,8 +8853,14 @@ EOF

•      esac
  

•    fi
  

•  else
  

+- eval flag="$hardcode_libdir_flag_spec" +- func_append rpath " $flag" ++ # We only want to hardcode in an rpath if it isn't in the ++ # default dlsearch path. ++ case " $sys_lib_dlsearch_path " in ++ *" $libdir "*) ;; ++ *) eval flag="$hardcode_libdir_flag_spec" ++ func_append rpath " $flag" ++ ;; ++ esac

•  fi
  

• elif test -n "$runpath_var"; then

•  case "$finalize_perm_rpath " in
  

+diff --git a/ltmain.sh b/ltmain.sh +index 683317c..860a16a 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -8055,8 +8055,10 @@ EOF

•      else
  

•             # We only want to hardcode in an rpath if it isn't in the
  

•             # default dlsearch path.
  

++ func_normal_abspath "$libdir" ++ libdir_norm=$func_normal_abspath_result

•        case " $sys_lib_dlsearch_path " in
  

+- *" $libdir "*) ;; ++ *" $libdir_norm "*) ;;

•        *) eval flag=\"$hardcode_libdir_flag_spec\"
  

•                func_append dep_rpath " $flag"
  

•                ;;
  

+@@ -8798,8 +8800,10 @@ EOF

•  else
  

•         # We only want to hardcode in an rpath if it isn't in the
  

•         # default dlsearch path.
  

++ func_normal_abspath "$libdir" ++ libdir_norm=$func_normal_abspath_result

•    case " $sys_lib_dlsearch_path " in
  

+- *" $libdir "*) ;; ++ *" $libdir_norm "*) ;;

•    *) eval flag=\"$hardcode_libdir_flag_spec\"
  

•            rpath+=" $flag"
  

•            ;;
  

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0015-Refine-.cfi_sections-check-to-only-consider-compact-.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0015-Refine-.cfi_sections-check-to-only-consider-compact-.patch new file mode 100644 index 0000000..f3e3a11 --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0015-Refine-.cfi_sections-check-to-only-consider-compact-.patch @@ -0,0 +1,97 @@ +From 3d3424e9a8d6ad56160b98bf6e223c0346164468 Mon Sep 17 00:00:00 2001 +From: Matthew Fortune matthew.fortune@imgtec.com +Date: Thu, 29 Sep 2016 11:13:46 +0100 +Subject: [PATCH] Refine .cfi_sections check to only consider compact eh_frame

+The .cfi_sections directive can be safely used multiple times +with different sections named at any time unless the compact form +of exception handling is requested after CFI information has +been emitted. Only the compact form of CFI information changes +the way in which CFI is generated and therefore cannot be +retrospectively requested after generating CFI information.

+gas/

• PR gas/20648
• • dw2gencfi.c (dot_cfi_sections): Refine the check for
• inconsistent .cfi_sections to only consider compact vs non
• compact forms.
• • testsuite/gas/cfi/cfi-common-9.d: New file.
• • testsuite/gas/cfi/cfi-common-9.s: New file.
• • testsuite/gas/cfi/cfi.exp: Run new test.

+--- +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com

• gas/ChangeLog | 10 ++++++++++
• gas/dw2gencfi.c | 5 ++++-
• gas/testsuite/gas/cfi/cfi-common-9.d | 23 +++++++++++++++++++++++
• gas/testsuite/gas/cfi/cfi-common-9.s | 4 ++++
• gas/testsuite/gas/cfi/cfi.exp | 1 +
• 5 files changed, 42 insertions(+), 1 deletion(-)
• create mode 100644 gas/testsuite/gas/cfi/cfi-common-9.d
• create mode 100644 gas/testsuite/gas/cfi/cfi-common-9.s

+Index: git/gas/dw2gencfi.c +=================================================================== +--- git.orig/gas/dw2gencfi.c ++++ git/gas/dw2gencfi.c +@@ -1244,7 +1244,10 @@ dot_cfi_sections (int ignored ATTRIBUTE_

•   }
  

• demand_empty_rest_of_line ();

+- if (cfi_sections_set && cfi_sections != sections) ++ if (cfi_sections_set ++ && (sections & (CFI_EMIT_eh_frame | CFI_EMIT_eh_frame_compact)) ++ && (cfi_sections & (CFI_EMIT_eh_frame | CFI_EMIT_eh_frame_compact)) ++ != (sections & (CFI_EMIT_eh_frame | CFI_EMIT_eh_frame_compact)))

• as_bad (_("inconsistent uses of .cfi_sections"));
  

• cfi_sections = sections;
• }

+Index: git/gas/testsuite/gas/cfi/cfi-common-9.d +=================================================================== +--- /dev/null ++++ git/gas/testsuite/gas/cfi/cfi-common-9.d +@@ -0,0 +1,23 @@ ++#objdump: -Wf ++#name: CFI common 9 ++#... ++Contents of the .eh_frame section: ++ ++00000000 0+0010 0+0000 CIE ++ Version: 1 ++ Augmentation: "zR" ++ Code alignment factor: .* ++ Data alignment factor: .* ++ Return address column: .* ++ Augmentation data: [01]b ++ ++ DW_CFA_nop ++ DW_CFA_nop ++ DW_CFA_nop ++ ++00000014 0+00(10|18|1c|20) 0+0018 FDE cie=0+0000 pc=.* ++ ++ DW_CFA_nop ++ DW_CFA_nop ++ DW_CFA_nop ++#... +Index: git/gas/testsuite/gas/cfi/cfi-common-9.s +=================================================================== +--- /dev/null ++++ git/gas/testsuite/gas/cfi/cfi-common-9.s +@@ -0,0 +1,4 @@ ++ .cfi_sections .eh_frame ++ .cfi_startproc simple ++ .cfi_sections .debug_frame ++ .cfi_endproc +Index: git/gas/testsuite/gas/cfi/cfi.exp +=================================================================== +--- git.orig/gas/testsuite/gas/cfi/cfi.exp ++++ git/gas/testsuite/gas/cfi/cfi.exp +@@ -135,4 +135,5 @@ if { ![istarget "hppa64*-*"] } then {

• run_dump_test "cfi-common-6"
  

• }
• run_dump_test "cfi-common-7"

++ run_dump_test "cfi-common-9"

• }

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0015-binutils-mips-gas-pic-relax-linkonce.diff b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0015-binutils-mips-gas-pic-relax-linkonce.diff new file mode 100644 index 0000000..78b971a --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.27/0015-binutils-mips-gas-pic-relax-linkonce.diff @@ -0,0 +1,65 @@ +Patch taken from Binutils Bugzilla:

• https://sourceware.org/bugzilla/show_bug.cgi?id=20649

+Upstream-Status: Pending

+Signed-off-by: Andre McCurdy armccurdy@gmail.com

+Index: binutils/gas/config/tc-mips.c +=================================================================== +--- binutils.orig/gas/config/tc-mips.c 2016-09-29 05:12:31.000000000 +0100 ++++ binutils/gas/config/tc-mips.c 2016-09-29 20:05:13.257411084 +0100 +@@ -1353,7 +1353,7 @@ static void s_mips_stab (int);

• static void s_mips_weakext (int);
• static void s_mips_file (int);
• static void s_mips_loc (int);

+-static bfd_boolean pic_need_relax (symbolS *, asection *); ++static bfd_boolean pic_need_relax (symbolS *);

• static int relaxed_branch_length (fragS *, asection *, int);
• static int relaxed_micromips_16bit_branch_length (fragS *, asection *, int);
• static int relaxed_micromips_32bit_branch_length (fragS *, asection *, int);

+@@ -4258,6 +4258,8 @@ mips_move_text_labels (void)

• mips_move_labels (seg_info (now_seg)->label_list, TRUE);
• }

++/* Duplicate the test for LINK_ONCE sections as in `adjust_reloc_syms'. */ ++

• static bfd_boolean
• s_is_linkonce (symbolS *sym, segT from_seg)
• {

+@@ -14823,7 +14825,7 @@ mips_frob_file (void)

• constants; we'll report an error for those later.  */
  

•   if (got16_reloc_p (l->fixp->fx_r_type)
  

•  && !(l->fixp->fx_addsy
  

+- && pic_need_relax (l->fixp->fx_addsy, l->seg))) ++ && pic_need_relax (l->fixp->fx_addsy)))

• continue;

•   /* Check quickly whether the next fixup happens to be a matching %lo.  */
  

+@@ -17043,7 +17045,7 @@ nopic_need_relax (symbolS *sym, int befo

• /* Return true if the given symbol should be considered local for SVR4 PIC. */
• static bfd_boolean

+-pic_need_relax (symbolS *sym, asection *segtype) ++pic_need_relax (symbolS *sym)

• {
• asection *symsec;

+@@ -17068,7 +17070,6 @@ pic_need_relax (symbolS *sym, asection *

• return (!bfd_is_und_section (symsec)

•  && !bfd_is_abs_section (symsec)
  

•  && !bfd_is_com_section (symsec)
  

+- && !s_is_linkonce (sym, segtype)

•  /* A global or weak symbol is treated as external.  */
  

•  && (!S_IS_WEAK (sym) && !S_IS_EXTERNAL (sym)));
  

• }

+@@ -17507,7 +17508,7 @@ md_estimate_size_before_relax (fragS *fr

• if (mips_pic == NO_PIC)

• change = nopic_need_relax (fragp->fr_symbol, 0);
  

• else if (mips_pic == SVR4_PIC)

+- change = pic_need_relax (fragp->fr_symbol, segtype); ++ change = pic_need_relax (fragp->fr_symbol);

• else if (mips_pic == VXWORKS_PIC)

• /* For vxworks, GOT16 relocations never have a corresponding LO16.  */
  

• change = 0;
  

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils_linaro-2.27.bb b/meta-linaro-toolchain/recipes-devtools/binutils/binutils_linaro-2.27.bb new file mode 100644 index 0000000..8d3f6fe --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils_linaro-2.27.bb @@ -0,0 +1,45 @@ +require recipes-devtools/binutils/binutils.inc +require recipes-devtools/binutils/binutils-${PV}.inc

+DEPENDS += "flex bison zlib"

+EXTRA_OECONF += "--with-sysroot=/ \

•            --enable-install-libbfd \
  

•            --enable-install-libiberty \
  

•            --enable-shared \
  

•            --with-system-zlib \
  

•            "
  

+EXTRA_OEMAKE_append_libc-musl = "\

•                             gt_cv_func_gnugettext1_libc=yes \
  

•                             gt_cv_func_gnugettext2_libc=yes \
  

•                            "
  

+EXTRA_OECONF_class-native = "--enable-targets=all \

•                         --enable-64-bit-bfd \
  

•                         --enable-install-libiberty \
  

•                         --enable-install-libbfd \
  

•                         --disable-werror"
  

+do_install_class-native () {

• autotools_do_install
• # Install the libiberty header
• install -d ${D}${includedir}
• install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
• install -m 644 ${S}/include/libiberty.h ${D}${includedir}
• # We only want libiberty, libbfd and libopcodes
• rm -rf ${D}${bindir}
• rm -rf ${D}${prefix}/${TARGET_SYS}
• rm -rf ${D}${prefix}/lib/ldscripts
• rm -rf ${D}${prefix}/share/info
• rm -rf ${D}${prefix}/share/locale
• rm -rf ${D}${prefix}/share/man
• rmdir ${D}${prefix}/share || :
• rmdir ${D}/${libdir}/gcc-lib || :
• rmdir ${D}/${libdir}64/gcc-lib || :
• rmdir ${D}/${libdir} || :
• rmdir ${D}/${libdir}64 || :

+}

+BBCLASSEXTEND = "native nativesdk"

2.7.4