From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B367AC61DA4 for ; Sat, 18 Feb 2023 21:56:24 +0000 (UTC) Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by mx.groups.io with SMTP id smtpd.web10.21624.1676757374536894364 for ; Sat, 18 Feb 2023 13:56:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=BZ5UTxqq; spf=pass (domain: bootlin.com, ip: 217.70.178.231, mailfrom: alexandre.belloni@bootlin.com) Received: (Authenticated sender: alexandre.belloni@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id EC8E6100002; Sat, 18 Feb 2023 21:56:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1676757372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=bNnT5Fvg+8dPWGnf8KQrrofqDSQAKnYUfIQTZhUA+2k=; b=BZ5UTxqqYXYDywlck1ZGytzjiUmbNUcPfQ+IC+dgXH466CbdlOvHSrQ2aXjlRsV+i+j0pW VjAx32u6ebI7QfknTOp5F9yED3QxeyD8SOE/RdDApXquIwjRBSrUWec8R9lqXmcWuHKckZ EKAdXd6BJSnyiyj5icLv/vFz3czk8VHQAJ8VuO2BI9wSple7mG46rL1NZaNnF7fgRRaadq CK+or8XaWXHy+YLNM20hX5cHHXVKHrGjMTH/zzDlMLoG7kS5SnYMuPZ50dWwKOUlCz8qzG Svj5ZNC82tZMwe9TdyHsjHOCS8IscbcSU2ZgxFcX8rMIxq/TkLD5kBqQhy3GMQ== Date: Sat, 18 Feb 2023 22:56:10 +0100 From: Alexandre Belloni To: Khem Raj Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH v3 1/3] binutils: Upgrade to 2.40 release Message-ID: References: <20230119235141.1603399-1-raj.khem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230119235141.1603399-1-raj.khem@gmail.com> List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 18 Feb 2023 21:56:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177319 Hello Khem, binutils 2.40 fails to build with -D_TIME_BITS=64: https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/6722/steps/11/logs/stdio | {standard input}: Assembler messages: | {standard input}:12377: Error: symbol `creat64' is already defined | {standard input}:12919: Error: symbol `creat64.cold' is already defined On 19/01/2023 15:51:39-0800, Khem Raj wrote: > Signed-off-by: Khem Raj > --- > v1 -> v2: > - Fix build on mingw > - Backport fix to build with --disable-gdb > > v2 -> v3: > - Adjust mingw build fix to not mess with normal x86_64 > > meta/conf/distro/include/tcmode-default.inc | 2 +- > .../{binutils-2.39.inc => binutils-2.40.inc} | 22 +- > ....39.bb => binutils-cross-canadian_2.40.bb} | 0 > ...39.bb => binutils-cross-testsuite_2.40.bb} | 0 > ...s-cross_2.39.bb => binutils-cross_2.40.bb} | 0 > ...ssdk_2.39.bb => binutils-crosssdk_2.40.bb} | 0 > ...s-crosssdk-Generate-relocatable-SDKs.patch | 10 +- > ...o-not-generate-linker-script-directo.patch | 4 +- > ...dk-Search-for-alternative-ld.so.conf.patch | 18 +- > ...004-Point-scripts-location-to-libdir.patch | 10 +- > ...stro-compiler-point-to-the-wrong-ins.patch | 4 +- > ...-system-directories-when-cross-linki.patch | 44 +- > ...ect-assembling-for-ppc-wait-mnemonic.patch | 8 +- > .../binutils/0008-Use-libtool-2.4.patch | 19254 ++++++++++------ > ...h-in-libtool-when-sysroot-is-enabled.patch | 2 +- > .../0010-sync-with-OE-libtool-changes.patch | 2 +- > ...or-clang-before-checking-gcc-version.patch | 10 +- > ...-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 4 +- > .../binutils/0013-CVE-2022-38533.patch | 36 - > ...sing-_Alignof-when-using-C11-or-newe.patch | 48 + > .../binutils/0014-CVE-2022-38128-1.patch | 350 - > .../binutils/0014-CVE-2022-38128-2.patch | 536 - > .../binutils/0014-CVE-2022-38128-3.patch | 95 - > ...-dependencies-on-gmp-and-mpfr-when-g.patch | 56 + > .../binutils/0015-CVE-2022-4285.patch | 37 - > ...-pe-dll.o-entry-deom-targ_extra_ofil.patch | 32 + > .../{binutils_2.39.bb => binutils_2.40.bb} | 0 > 27 files changed, 11811 insertions(+), 8773 deletions(-) > rename meta/recipes-devtools/binutils/{binutils-2.39.inc => binutils-2.40.inc} (71%) > rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.39.bb => binutils-cross-canadian_2.40.bb} (100%) > rename meta/recipes-devtools/binutils/{binutils-cross-testsuite_2.39.bb => binutils-cross-testsuite_2.40.bb} (100%) > rename meta/recipes-devtools/binutils/{binutils-cross_2.39.bb => binutils-cross_2.40.bb} (100%) > rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.39.bb => binutils-crosssdk_2.40.bb} (100%) > delete mode 100644 meta/recipes-devtools/binutils/binutils/0013-CVE-2022-38533.patch > create mode 100644 meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch > delete mode 100644 meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-1.patch > delete mode 100644 meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-2.patch > delete mode 100644 meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-3.patch > create mode 100644 meta/recipes-devtools/binutils/binutils/0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch > delete mode 100644 meta/recipes-devtools/binutils/binutils/0015-CVE-2022-4285.patch > create mode 100644 meta/recipes-devtools/binutils/binutils/0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch > rename meta/recipes-devtools/binutils/{binutils_2.39.bb => binutils_2.40.bb} (100%) > > diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc > index 4d4929529a..bcc5f7ce1f 100644 > --- a/meta/conf/distro/include/tcmode-default.inc > +++ b/meta/conf/distro/include/tcmode-default.inc > @@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" > > GCCVERSION ?= "12.%" > SDKGCCVERSION ?= "${GCCVERSION}" > -BINUVERSION ?= "2.39%" > +BINUVERSION ?= "2.40%" > GDBVERSION ?= "12.%" > GLIBCVERSION ?= "2.37" > LINUXLIBCVERSION ?= "6.1%" > diff --git a/meta/recipes-devtools/binutils/binutils-2.39.inc b/meta/recipes-devtools/binutils/binutils-2.40.inc > similarity index 71% > rename from meta/recipes-devtools/binutils/binutils-2.39.inc > rename to meta/recipes-devtools/binutils/binutils-2.40.inc > index 419571d56c..c2b926bb32 100644 > --- a/meta/recipes-devtools/binutils/binutils-2.39.inc > +++ b/meta/recipes-devtools/binutils/binutils-2.40.inc > @@ -10,15 +10,15 @@ LIC_FILES_CHKSUM="\ > file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\ > " > > -# When upgrading to 2.39, please make sure there is no trailing .0, so > +# When upgrading to 2.41, please make sure there is no trailing .0, so > # that upstream version check can work correctly. > -PV = "2.39" > -CVE_VERSION = "2.39" > -SRCBRANCH ?= "binutils-2_39-branch" > +PV = "2.40" > +CVE_VERSION = "2.40" > +SRCBRANCH ?= "binutils-2_40-branch" > > UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)" > > -SRCREV ?= "f89058434f13382c85b8729464192bc7763d88a4" > +SRCREV ?= "ffb83e32fc11f36b7b82b876c14888f82cd983b3" > BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git" > SRC_URI = "\ > ${BINUTILS_GIT_URI} \ > @@ -31,14 +31,8 @@ SRC_URI = "\ > file://0010-sync-with-OE-libtool-changes.patch \ > file://0011-Check-for-clang-before-checking-gcc-version.patch \ > file://0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ > - file://0013-CVE-2022-38533.patch \ > - file://0014-CVE-2022-38128-1.patch \ > - file://0014-CVE-2022-38128-2.patch \ > - file://0014-CVE-2022-38128-3.patch \ > - file://0015-CVE-2022-4285.patch \ > + file://0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ > + file://0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch \ > + file://0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch \ > " > S = "${WORKDIR}/git" > -# Already in 2.39 branch > -# - https://sourceware.org/bugzilla/show_bug.cgi?id=29289 > -# - https://sourceware.org/bugzilla/show_bug.cgi?id=29290 > -CVE_CHECK_IGNORE += "CVE-2022-38126 CVE-2022-38127" > diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.39.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.40.bb > similarity index 100% > rename from meta/recipes-devtools/binutils/binutils-cross-canadian_2.39.bb > rename to meta/recipes-devtools/binutils/binutils-cross-canadian_2.40.bb > diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.39.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb > similarity index 100% > rename from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.39.bb > rename to meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb > diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.39.bb b/meta/recipes-devtools/binutils/binutils-cross_2.40.bb > similarity index 100% > rename from meta/recipes-devtools/binutils/binutils-cross_2.39.bb > rename to meta/recipes-devtools/binutils/binutils-cross_2.40.bb > diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.39.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.40.bb > similarity index 100% > rename from meta/recipes-devtools/binutils/binutils-crosssdk_2.39.bb > rename to meta/recipes-devtools/binutils/binutils-crosssdk_2.40.bb > diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch > index 9a7ee494c8..7fffa81724 100644 > --- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch > +++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch > @@ -1,4 +1,4 @@ > -From a0ac147aec127c66c9e38292faa50bb56d3c2a19 Mon Sep 17 00:00:00 2001 > +From 25e715730ddcca37021fa4876aed4fa91d5dea25 Mon Sep 17 00:00:00 2001 > From: Khem Raj > Date: Mon, 2 Mar 2015 01:58:54 +0000 > Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs > @@ -21,10 +21,10 @@ Signed-off-by: Khem Raj > 3 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/gold/layout.cc b/gold/layout.cc > -index 3efe8d98ae9..9cc389664a6 100644 > +index 899d4af0707..7c31b1bef6e 100644 > --- a/gold/layout.cc > +++ b/gold/layout.cc > -@@ -5033,7 +5033,7 @@ Layout::create_interp(const Target* target) > +@@ -5083,7 +5083,7 @@ Layout::create_interp(const Target* target) > gold_assert(interp != NULL); > } > > @@ -34,7 +34,7 @@ index 3efe8d98ae9..9cc389664a6 100644 > Output_section_data* odata = new Output_data_const(interp, len, 1); > > diff --git a/ld/genscripts.sh b/ld/genscripts.sh > -index 278f212bdad..0c52ebee4d0 100755 > +index 382bd07ffe2..9fbd0c4cb8a 100755 > --- a/ld/genscripts.sh > +++ b/ld/genscripts.sh > @@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" > @@ -59,7 +59,7 @@ index 278f212bdad..0c52ebee4d0 100755 > DATA_ALIGNMENT=${DATA_ALIGNMENT_} > RELOCATING=" " > diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc > -index bf2268bb0ad..b1811ef130f 100644 > +index 5d3b0d31b1b..2163909cd56 100644 > --- a/ld/scripttempl/elf.sc > +++ b/ld/scripttempl/elf.sc > @@ -148,8 +148,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then > diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch > index cab9c0ed89..87a19c9ec3 100644 > --- a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch > +++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch > @@ -1,4 +1,4 @@ > -From fd7065bfd20364679e3c3f329b19059bbc51ab02 Mon Sep 17 00:00:00 2001 > +From 080a8eafc5961f78222d84aaa816d0933441b7ab Mon Sep 17 00:00:00 2001 > From: Khem Raj > Date: Mon, 6 Mar 2017 23:37:05 -0800 > Subject: [PATCH] binutils-cross: Do not generate linker script directories > @@ -22,7 +22,7 @@ Signed-off-by: Khem Raj > 1 file changed, 25 deletions(-) > > diff --git a/ld/genscripts.sh b/ld/genscripts.sh > -index 0c52ebee4d0..1acbe66bd2e 100755 > +index 9fbd0c4cb8a..6be07038c9b 100755 > --- a/ld/genscripts.sh > +++ b/ld/genscripts.sh > @@ -235,31 +235,6 @@ append_to_lib_path() > diff --git a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch > index 4fe5520010..8e5e2be81d 100644 > --- a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch > +++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch > @@ -1,4 +1,4 @@ > -From 67735b3647f98ce0f010ff8b4f9b5c5da576cb17 Mon Sep 17 00:00:00 2001 > +From 90d1bb804033a74b54f64cd5d3127c004c266af8 Mon Sep 17 00:00:00 2001 > From: Richard Purdie > Date: Wed, 19 Feb 2020 09:51:16 -0800 > Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK > @@ -29,7 +29,7 @@ Signed-off-by: Khem Raj > 5 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/ld/Makefile.am b/ld/Makefile.am > -index d31021c13e2..29782385ca4 100644 > +index 12b2c3c453f..0590b7055d0 100644 > --- a/ld/Makefile.am > +++ b/ld/Makefile.am > @@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ > @@ -41,12 +41,12 @@ index d31021c13e2..29782385ca4 100644 > + -DSYSCONFDIR="\"$(sysconfdir)\"" > WARN_CFLAGS = @WARN_CFLAGS@ > NO_WERROR = @NO_WERROR@ > - AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) > + AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) > diff --git a/ld/Makefile.in b/ld/Makefile.in > -index ee0c98f65b0..04ee68a2c67 100644 > +index 3d5685d6bae..70643b1ce46 100644 > --- a/ld/Makefile.in > +++ b/ld/Makefile.in > -@@ -562,7 +562,8 @@ ZLIB = @zlibdir@ -lz > +@@ -566,7 +566,8 @@ ZLIB = @zlibdir@ -lz > ZLIBINC = @zlibinc@ > ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ > -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ > @@ -54,10 +54,10 @@ index ee0c98f65b0..04ee68a2c67 100644 > + -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \ > + -DSYSCONFDIR="\"$(sysconfdir)\"" > > - AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) > + AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) > > diff --git a/ld/ldelf.c b/ld/ldelf.c > -index bfa0d54753a..0d61a3209ec 100644 > +index eff6693e052..95787012b89 100644 > --- a/ld/ldelf.c > +++ b/ld/ldelf.c > @@ -936,7 +936,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, > @@ -70,7 +70,7 @@ index bfa0d54753a..0d61a3209ec 100644 > if (!ldelf_parse_ld_so_conf (&info, tmppath)) > { > diff --git a/ld/ldmain.c b/ld/ldmain.c > -index ea72b14a301..1ae90a77749 100644 > +index 9290a189b0d..ceaca2d85d0 100644 > --- a/ld/ldmain.c > +++ b/ld/ldmain.c > @@ -70,6 +70,7 @@ char *program_name; > @@ -82,7 +82,7 @@ index ea72b14a301..1ae90a77749 100644 > /* The canonical representation of ld_sysroot. */ > char *ld_canon_sysroot; > diff --git a/ld/ldmain.h b/ld/ldmain.h > -index f6d05a02f59..e60292cd522 100644 > +index dda124b96e8..ba06a7d7be2 100644 > --- a/ld/ldmain.h > +++ b/ld/ldmain.h > @@ -23,6 +23,7 @@ > diff --git a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch > index 5b0f2ee308..90abd50498 100644 > --- a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch > +++ b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch > @@ -1,4 +1,4 @@ > -From 2158e5bd4c6ea4db89e33d46ef25428e37bfc3a6 Mon Sep 17 00:00:00 2001 > +From a7c988d60f11c8279453c2d9edeede001cce7c9e Mon Sep 17 00:00:00 2001 > From: Khem Raj > Date: Mon, 2 Mar 2015 01:09:58 +0000 > Subject: [PATCH] Point scripts location to libdir > @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/ld/Makefile.am b/ld/Makefile.am > -index 29782385ca4..062e6b6814b 100644 > +index 0590b7055d0..c30db94ee3c 100644 > --- a/ld/Makefile.am > +++ b/ld/Makefile.am > -@@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) > +@@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) > # 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. > @@ -25,10 +25,10 @@ index 29782385ca4..062e6b6814b 100644 > EMUL = @EMUL@ > EMULATION_OFILES = @EMULATION_OFILES@ > diff --git a/ld/Makefile.in b/ld/Makefile.in > -index 04ee68a2c67..782d4017a60 100644 > +index 70643b1ce46..0405028e02f 100644 > --- a/ld/Makefile.in > +++ b/ld/Makefile.in > -@@ -570,7 +570,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) > +@@ -574,7 +574,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS) > # 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. > diff --git a/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch > index 2495079508..9557e871db 100644 > --- a/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch > +++ b/meta/recipes-devtools/binutils/binutils/0005-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch > @@ -1,4 +1,4 @@ > -From e74d765a1a95253c9247228bd7ccbcabecdd8f7e Mon Sep 17 00:00:00 2001 > +From fc39b9c332a346910695817274d55d0c20dc717a Mon Sep 17 00:00:00 2001 > From: Khem Raj > Date: Mon, 2 Mar 2015 01:39:01 +0000 > Subject: [PATCH] don't let the distro compiler point to the wrong installation > @@ -17,7 +17,7 @@ Signed-off-by: Khem Raj > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in > -index abef3c4601b..880c8826482 100644 > +index f9fbba23e2c..93495e45d6f 100644 > --- a/libiberty/Makefile.in > +++ b/libiberty/Makefile.in > @@ -385,7 +385,8 @@ install-strip: install > diff --git a/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch > index 00fb5aad1b..0ca55d4095 100644 > --- a/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch > +++ b/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch > @@ -1,4 +1,4 @@ > -From 2c43b1357db6b09d1645704afd3f45be6de0cf4d Mon Sep 17 00:00:00 2001 > +From b9af05e87ac8eb4fa18a75939edb661056246c30 Mon Sep 17 00:00:00 2001 > From: Khem Raj > Date: Fri, 15 Jan 2016 06:31:09 +0000 > Subject: [PATCH] warn for uses of system directories when cross linking > @@ -63,10 +63,10 @@ Signed-off-by: Khem Raj > 9 files changed, 88 insertions(+), 2 deletions(-) > > diff --git a/ld/config.in b/ld/config.in > -index d4c1fc420b5..1aece0b2c29 100644 > +index ad0dc6a106c..d21edaddce7 100644 > --- a/ld/config.in > +++ b/ld/config.in > -@@ -55,6 +55,9 @@ > +@@ -58,6 +58,9 @@ > language is requested. */ > #undef ENABLE_NLS > > @@ -77,10 +77,10 @@ index d4c1fc420b5..1aece0b2c29 100644 > #undef EXTRA_SHLIB_EXTENSION > > diff --git a/ld/configure b/ld/configure > -index e58fb7f3a35..d0a467ac101 100755 > +index 49936a0cb2a..5f5dad6d67c 100755 > --- a/ld/configure > +++ b/ld/configure > -@@ -836,6 +836,7 @@ with_lib_path > +@@ -839,6 +839,7 @@ with_lib_path > enable_targets > enable_64_bit_bfd > with_sysroot > @@ -88,7 +88,7 @@ index e58fb7f3a35..d0a467ac101 100755 > enable_gold > enable_got > enable_compressed_debug_sections > -@@ -1514,6 +1515,8 @@ Optional Features: > +@@ -1521,6 +1522,8 @@ Optional Features: > --enable-checking enable run-time checks > --enable-targets alternative target configurations > --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) > @@ -97,7 +97,7 @@ index e58fb7f3a35..d0a467ac101 100755 > --enable-gold[=ARG] build gold [ARG={default,yes,no}] > --enable-got= GOT handling scheme (target, single, negative, > multigot) > -@@ -15349,6 +15352,19 @@ fi > +@@ -15483,6 +15486,19 @@ fi > > > > @@ -118,10 +118,10 @@ index e58fb7f3a35..d0a467ac101 100755 > if test "${enable_gold+set}" = set; then : > enableval=$enable_gold; case "${enableval}" in > diff --git a/ld/configure.ac b/ld/configure.ac > -index 4331d6b1302..e2976bc2926 100644 > +index 77edac3258c..a74dac63038 100644 > --- a/ld/configure.ac > +++ b/ld/configure.ac > -@@ -102,6 +102,16 @@ AC_SUBST(use_sysroot) > +@@ -103,6 +103,16 @@ AC_SUBST(use_sysroot) > AC_SUBST(TARGET_SYSTEM_ROOT) > AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) > > @@ -139,10 +139,10 @@ index 4331d6b1302..e2976bc2926 100644 > 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 f3086bf30de..db5064243c7 100644 > +index 05649ff61b8..1818c227473 100644 > --- a/ld/ld.h > +++ b/ld/ld.h > -@@ -162,6 +162,14 @@ typedef struct > +@@ -163,6 +163,14 @@ typedef struct > in the linker script. */ > bool force_group_allocation; > > @@ -158,10 +158,10 @@ index f3086bf30de..db5064243c7 100644 > enum endian_enum endian; > > diff --git a/ld/ld.texi b/ld/ld.texi > -index eabbec8faa9..c4680e4947e 100644 > +index db3a9f09b45..77037399cb9 100644 > --- a/ld/ld.texi > +++ b/ld/ld.texi > -@@ -2947,6 +2947,18 @@ creation of the metadata note, if one had been enabled by an earlier > +@@ -2960,6 +2960,18 @@ creation of the metadata note, if one had been enabled by an earlier > occurrence of the --package-metdata option. > If the linker has been built with libjansson, then the JSON string > will be validated. > @@ -181,7 +181,7 @@ index eabbec8faa9..c4680e4947e 100644 > > @c man end > diff --git a/ld/ldfile.c b/ld/ldfile.c > -index 731ae5f7aed..dd8f03fd960 100644 > +index b8fd4e5d8e0..1f1d8e23bc9 100644 > --- a/ld/ldfile.c > +++ b/ld/ldfile.c > @@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bool cmdline) > @@ -209,10 +209,10 @@ index 731ae5f7aed..dd8f03fd960 100644 > > /* Try to open a BFD for a lang_input_statement. */ > diff --git a/ld/ldlex.h b/ld/ldlex.h > -index 57ade1f754b..64007ff8684 100644 > +index 0538f0a06a1..f94a71875d8 100644 > --- a/ld/ldlex.h > +++ b/ld/ldlex.h > -@@ -168,6 +168,8 @@ enum option_values > +@@ -170,6 +170,8 @@ enum option_values > OPTION_NO_WARN_EXECSTACK, > OPTION_WARN_RWX_SEGMENTS, > OPTION_NO_WARN_RWX_SEGMENTS, > @@ -222,7 +222,7 @@ index 57ade1f754b..64007ff8684 100644 > > /* The initial parser states. */ > diff --git a/ld/ldmain.c b/ld/ldmain.c > -index 1ae90a77749..f40750fd816 100644 > +index ceaca2d85d0..62e7b4e5341 100644 > --- a/ld/ldmain.c > +++ b/ld/ldmain.c > @@ -322,6 +322,8 @@ main (int argc, char **argv) > @@ -234,7 +234,7 @@ index 1ae90a77749..f40750fd816 100644 > > /* We initialize DEMANGLING based on the environment variable > COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the > -@@ -1447,7 +1449,7 @@ undefined_symbol (struct bfd_link_info *info, > +@@ -1454,7 +1456,7 @@ undefined_symbol (struct bfd_link_info *info, > argv[1] = "undefined-symbol"; > argv[2] = (char *) name; > argv[3] = NULL; > @@ -243,7 +243,7 @@ index 1ae90a77749..f40750fd816 100644 > if (verbose) > einfo (_("%P: About to run error handling script '%s' with arguments: '%s' '%s'\n"), > argv[0], argv[1], argv[2]); > -@@ -1468,7 +1470,7 @@ undefined_symbol (struct bfd_link_info *info, > +@@ -1475,7 +1477,7 @@ undefined_symbol (struct bfd_link_info *info, > carry on to issue the normal error message. */ > } > #endif /* SUPPORT_ERROR_HANDLING_SCRIPT */ > @@ -253,10 +253,10 @@ index 1ae90a77749..f40750fd816 100644 > { > if (error_count < MAX_ERRORS_IN_A_ROW) > diff --git a/ld/lexsup.c b/ld/lexsup.c > -index 9225f71b3ce..92fb66f1fa2 100644 > +index c5960385572..eb54627fb71 100644 > --- a/ld/lexsup.c > +++ b/ld/lexsup.c > -@@ -608,6 +608,14 @@ static const struct ld_option ld_options[] = > +@@ -613,6 +613,14 @@ static const struct ld_option ld_options[] = > " is: share-unconflicted (default),\n" > " share-duplicated"), > TWO_DASHES }, > @@ -271,7 +271,7 @@ index 9225f71b3ce..92fb66f1fa2 100644 > }; > > #define OPTION_COUNT ARRAY_SIZE (ld_options) > -@@ -1722,6 +1730,14 @@ parse_args (unsigned argc, char **argv) > +@@ -1735,6 +1743,14 @@ parse_args (unsigned argc, char **argv) > config.print_map_discarded = true; > break; > > diff --git a/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch > index 4ae1580102..502ce82928 100644 > --- a/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch > +++ b/meta/recipes-devtools/binutils/binutils/0007-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch > @@ -1,4 +1,4 @@ > -From 883b6c0930410f8553b3bce0dd98131bc1694fa6 Mon Sep 17 00:00:00 2001 > +From ef9aa69324a209e546956a2f674462717ec5af0f Mon Sep 17 00:00:00 2001 > From: Zhenhua Luo > Date: Sat, 11 Jun 2016 22:08:29 -0500 > Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic > @@ -14,10 +14,10 @@ Signed-off-by: Zhenhua Luo > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c > -index 7637d3e349e..8e074e13208 100644 > +index 37f1aeb780c..45774c7cf79 100644 > --- a/opcodes/ppc-opc.c > +++ b/opcodes/ppc-opc.c > -@@ -6947,8 +6947,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { > +@@ -7138,8 +7138,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { > {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, > {"waitrsv", XWCPL(31,30,1,0),0xffffffff, POWER10, EXT, {0}}, > {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, EXT, {0}}, > @@ -26,7 +26,7 @@ index 7637d3e349e..8e074e13208 100644 > > {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, > > -@@ -7002,7 +7000,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { > +@@ -7193,7 +7191,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { > > {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}}, > {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}}, > diff --git a/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch > index 21e2c4fd70..7e7c2579b3 100644 > --- a/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch > +++ b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch > @@ -1,4 +1,4 @@ > -From 0f45262ef0d656c576adbb0b0f42b8f417895008 Mon Sep 17 00:00:00 2001 > +From 0ad92af822bb6f58de3f3889d0adc0b2ef9d477f Mon Sep 17 00:00:00 2001 > From: Khem Raj > Date: Sun, 14 Feb 2016 17:04:07 +0000 > Subject: [PATCH] Use libtool 2.4 > @@ -16,7 +16,6 @@ Signed-off-by: Khem Raj > binutils/configure | 1331 +++++++++--- > gas/Makefile.in | 3 + > gas/configure | 1331 +++++++++--- > - gdbsupport/Makefile.in | 1 + > gprof/Makefile.in | 3 + > gprof/configure | 1331 +++++++++--- > gprofng/Makefile.in | 2 + > @@ -32,6 +31,9 @@ Signed-off-by: Khem Raj > libbacktrace/configure | 1331 +++++++++--- > libctf/Makefile.in | 2 + > libctf/configure | 1330 +++++++++--- > + libsframe/Makefile.in | 249 ++- > + libsframe/aclocal.m4 | 220 +- > + libsframe/configure | 1553 ++++++++++---- > libtool.m4 | 1093 ++++++---- > ltmain.sh | 2925 ++++++++++++++++++--------- > ltoptions.m4 | 2 +- > @@ -40,16 +42,16 @@ Signed-off-by: Khem Raj > opcodes/Makefile.in | 3 + > opcodes/configure | 1331 +++++++++--- > sim/Makefile.in | 3 + > - zlib/Makefile.in | 204 +- > - zlib/aclocal.m4 | 218 +- > - zlib/configure | 1554 +++++++++----- > - 34 files changed, 14804 insertions(+), 5671 deletions(-) > + sim/configure | 1331 +++++++++--- > + zlib/Makefile.in | 3 + > + zlib/configure | 1331 +++++++++--- > + 36 files changed, 16896 insertions(+), 6289 deletions(-) > > diff --git a/bfd/Makefile.in b/bfd/Makefile.in > -index a26f74d7199..6edacdfeb0e 100644 > +index 80aed657643..106ec256a79 100644 > --- a/bfd/Makefile.in > +++ b/bfd/Makefile.in > -@@ -346,6 +346,7 @@ DATADIRNAME = @DATADIRNAME@ > +@@ -347,6 +347,7 @@ DATADIRNAME = @DATADIRNAME@ > DEBUGDIR = @DEBUGDIR@ > DEFS = @DEFS@ > DEPDIR = @DEPDIR@ > @@ -57,7 +59,7 @@ index a26f74d7199..6edacdfeb0e 100644 > DSYMUTIL = @DSYMUTIL@ > DUMPBIN = @DUMPBIN@ > ECHO_C = @ECHO_C@ > -@@ -380,6 +381,7 @@ LN_S = @LN_S@ > +@@ -381,6 +382,7 @@ LN_S = @LN_S@ > LTLIBOBJS = @LTLIBOBJS@ > MAINT = @MAINT@ > MAKEINFO = @MAKEINFO@ > @@ -65,7 +67,7 @@ index a26f74d7199..6edacdfeb0e 100644 > MKDIR_P = @MKDIR_P@ > MKINSTALLDIRS = @MKINSTALLDIRS@ > MSGFMT = @MSGFMT@ > -@@ -421,6 +423,7 @@ abs_builddir = @abs_builddir@ > +@@ -427,6 +429,7 @@ abs_builddir = @abs_builddir@ > abs_srcdir = @abs_srcdir@ > abs_top_builddir = @abs_top_builddir@ > abs_top_srcdir = @abs_top_srcdir@ > @@ -74,10 +76,10 @@ index a26f74d7199..6edacdfeb0e 100644 > ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ > all_backends = @all_backends@ > diff --git a/bfd/configure b/bfd/configure > -index 4f591b750d8..d90db11744b 100755 > +index e5d464378f8..ee8ea251479 100755 > --- a/bfd/configure > +++ b/bfd/configure > -@@ -702,6 +702,9 @@ OTOOL > +@@ -706,6 +706,9 @@ OTOOL > LIPO > NMEDIT > DSYMUTIL > @@ -87,7 +89,7 @@ index 4f591b750d8..d90db11744b 100755 > OBJDUMP > LN_S > NM > -@@ -820,6 +823,7 @@ enable_static > +@@ -824,6 +827,7 @@ enable_static > with_pic > enable_fast_install > with_gnu_ld > @@ -95,7 +97,7 @@ index 4f591b750d8..d90db11744b 100755 > enable_libtool_lock > enable_plugins > enable_largefile > -@@ -1504,6 +1508,8 @@ Optional Packages: > +@@ -1514,6 +1518,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] > @@ -104,7 +106,7 @@ index 4f591b750d8..d90db11744b 100755 > --with-mmap try using mmap for BFD input files if available > --with-separate-debug-dir=DIR > Look for global separate debug info in DIR > -@@ -5024,8 +5030,8 @@ esac > +@@ -5043,8 +5049,8 @@ esac > > > > @@ -115,7 +117,7 @@ index 4f591b750d8..d90db11744b 100755 > > > > -@@ -5065,7 +5071,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO > +@@ -5084,7 +5090,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. > @@ -124,7 +126,7 @@ index 4f591b750d8..d90db11744b 100755 > 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 > -@@ -5758,8 +5764,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; > +@@ -5777,8 +5783,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" > @@ -135,7 +137,7 @@ index 4f591b750d8..d90db11744b 100755 > && eval 'test $(( 1 + 1 )) -eq 2 \ > && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ > && xsi_shell=yes > -@@ -5808,6 +5814,80 @@ esac > +@@ -5827,6 +5833,80 @@ esac > > > > @@ -216,7 +218,7 @@ index 4f591b750d8..d90db11744b 100755 > { $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 ${lt_cv_ld_reload_flag+:} false; then : > -@@ -5824,6 +5904,11 @@ case $reload_flag in > +@@ -5843,6 +5923,11 @@ case $reload_flag in > esac > reload_cmds='$LD$reload_flag -o $output$reload_objs' > case $host_os in > @@ -228,7 +230,7 @@ index 4f591b750d8..d90db11744b 100755 > darwin*) > if test "$GCC" = yes; then > reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' > -@@ -5992,7 +6077,8 @@ mingw* | pw32*) > +@@ -6011,7 +6096,8 @@ mingw* | pw32*) > lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' > lt_cv_file_magic_cmd='func_win32_libid' > else > @@ -238,7 +240,7 @@ index 4f591b750d8..d90db11744b 100755 > lt_cv_file_magic_cmd='$OBJDUMP -f' > fi > ;; > -@@ -6146,6 +6232,21 @@ esac > +@@ -6165,6 +6251,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; } > @@ -260,7 +262,7 @@ index 4f591b750d8..d90db11744b 100755 > 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 > -@@ -6161,6 +6262,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown > +@@ -6180,6 +6281,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown > > > > @@ -418,7 +420,7 @@ index 4f591b750d8..d90db11744b 100755 > plugin_option= > plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" > for plugin in $plugin_names; do > -@@ -6175,8 +6427,10 @@ for plugin in $plugin_names; do > +@@ -6194,8 +6446,10 @@ for plugin in $plugin_names; do > done > > if test -n "$ac_tool_prefix"; then > @@ -431,7 +433,7 @@ index 4f591b750d8..d90db11744b 100755 > { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 > $as_echo_n "checking for $ac_word... " >&6; } > if ${ac_cv_prog_AR+:} false; then : > -@@ -6192,7 +6446,7 @@ do > +@@ -6211,7 +6465,7 @@ do > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > @@ -440,7 +442,7 @@ index 4f591b750d8..d90db11744b 100755 > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > fi > -@@ -6212,11 +6466,15 @@ $as_echo "no" >&6; } > +@@ -6231,11 +6485,15 @@ $as_echo "no" >&6; } > fi > > > @@ -459,7 +461,7 @@ index 4f591b750d8..d90db11744b 100755 > { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 > $as_echo_n "checking for $ac_word... " >&6; } > if ${ac_cv_prog_ac_ct_AR+:} false; then : > -@@ -6232,7 +6490,7 @@ do > +@@ -6251,7 +6509,7 @@ do > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > @@ -468,7 +470,7 @@ index 4f591b750d8..d90db11744b 100755 > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > fi > -@@ -6251,6 +6509,10 @@ else > +@@ -6270,6 +6528,10 @@ else > $as_echo "no" >&6; } > fi > > @@ -479,7 +481,7 @@ index 4f591b750d8..d90db11744b 100755 > if test "x$ac_ct_AR" = x; then > AR="false" > else > -@@ -6262,25 +6524,20 @@ ac_tool_warned=yes ;; > +@@ -6281,25 +6543,20 @@ ac_tool_warned=yes ;; > esac > AR=$ac_ct_AR > fi > @@ -515,7 +517,7 @@ index 4f591b750d8..d90db11744b 100755 > > > > -@@ -6291,6 +6548,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru > +@@ -6310,6 +6567,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru > > > > @@ -579,7 +581,7 @@ index 4f591b750d8..d90db11744b 100755 > > 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. > -@@ -6631,8 +6945,8 @@ esac > +@@ -6650,8 +6964,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 > @@ -590,7 +592,7 @@ index 4f591b750d8..d90db11744b 100755 > > # Handle CRLF in mingw tool chain > opt_cr= > -@@ -6668,6 +6982,7 @@ for ac_symprfx in "" "_"; do > +@@ -6687,6 +7001,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 > @@ -598,7 +600,7 @@ index 4f591b750d8..d90db11744b 100755 > > # Check to see that the pipe works correctly. > pipe_works=no > -@@ -6709,6 +7024,18 @@ _LT_EOF > +@@ -6728,6 +7043,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 > @@ -617,7 +619,7 @@ index 4f591b750d8..d90db11744b 100755 > #ifdef __cplusplus > extern "C" { > #endif > -@@ -6720,7 +7047,7 @@ _LT_EOF > +@@ -6739,7 +7066,7 @@ _LT_EOF > cat <<_LT_EOF >> conftest.$ac_ext > > /* The mapping between symbol names and symbols. */ > @@ -626,7 +628,7 @@ index 4f591b750d8..d90db11744b 100755 > const char *name; > void *address; > } > -@@ -6746,8 +7073,8 @@ static const void *lt_preloaded_setup() { > +@@ -6765,8 +7092,8 @@ static const void *lt_preloaded_setup() { > _LT_EOF > # Now try linking the two files. > mv conftest.$ac_objext conftstm.$ac_objext > @@ -637,7 +639,7 @@ index 4f591b750d8..d90db11744b 100755 > LIBS="conftstm.$ac_objext" > CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" > if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 > -@@ -6757,8 +7084,8 @@ _LT_EOF > +@@ -6776,8 +7103,8 @@ _LT_EOF > test $ac_status = 0; } && test -s conftest${ac_exeext}; then > pipe_works=yes > fi > @@ -648,7 +650,7 @@ index 4f591b750d8..d90db11744b 100755 > else > echo "cannot find nm_test_func in $nlist" >&5 > fi > -@@ -6795,6 +7122,14 @@ else > +@@ -6814,6 +7141,14 @@ else > $as_echo "ok" >&6; } > fi > > @@ -663,7 +665,7 @@ index 4f591b750d8..d90db11744b 100755 > > > > -@@ -6813,6 +7148,47 @@ fi > +@@ -6832,6 +7167,47 @@ fi > > > > @@ -711,7 +713,7 @@ index 4f591b750d8..d90db11744b 100755 > > > > -@@ -7022,6 +7398,123 @@ esac > +@@ -7041,6 +7417,123 @@ esac > > need_locks="$enable_libtool_lock" > > @@ -835,7 +837,7 @@ index 4f591b750d8..d90db11744b 100755 > > case $host_os in > rhapsody* | darwin*) > -@@ -7585,6 +8078,8 @@ _LT_EOF > +@@ -7604,6 +8097,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 > @@ -844,7 +846,7 @@ index 4f591b750d8..d90db11744b 100755 > cat > conftest.c << _LT_EOF > int main() { return 0;} > _LT_EOF > -@@ -8136,8 +8631,6 @@ fi > +@@ -8155,8 +8650,6 @@ fi > lt_prog_compiler_pic= > lt_prog_compiler_static= > > @@ -853,7 +855,7 @@ index 4f591b750d8..d90db11744b 100755 > > if test "$GCC" = yes; then > lt_prog_compiler_wl='-Wl,' > -@@ -8303,6 +8796,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > +@@ -8322,6 +8815,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > lt_prog_compiler_pic='--shared' > lt_prog_compiler_static='--static' > ;; > @@ -866,7 +868,7 @@ index 4f591b750d8..d90db11744b 100755 > pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) > # Portland Group compilers (*not* the Pentium gcc compiler, > # which looks to be a dead project) > -@@ -8365,7 +8864,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > +@@ -8384,7 +8883,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 > @@ -875,7 +877,7 @@ index 4f591b750d8..d90db11744b 100755 > lt_prog_compiler_wl='-Qoption ld ';; > *) > lt_prog_compiler_wl='-Wl,';; > -@@ -8422,13 +8921,17 @@ case $host_os in > +@@ -8441,13 +8940,17 @@ case $host_os in > lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" > ;; > esac > @@ -899,7 +901,7 @@ index 4f591b750d8..d90db11744b 100755 > > # > # Check to make sure the PIC flag actually works. > -@@ -8489,6 +8992,11 @@ fi > +@@ -8508,6 +9011,11 @@ fi > > > > @@ -911,7 +913,7 @@ index 4f591b750d8..d90db11744b 100755 > # > # Check to make sure the static flag actually works. > # > -@@ -8839,7 +9347,8 @@ _LT_EOF > +@@ -8858,7 +9366,8 @@ _LT_EOF > allow_undefined_flag=unsupported > always_export_symbols=no > enable_shared_with_static_runtimes=yes > @@ -921,7 +923,7 @@ index 4f591b750d8..d90db11744b 100755 > > 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' > -@@ -8938,12 +9447,12 @@ _LT_EOF > +@@ -8957,12 +9466,12 @@ _LT_EOF > whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' > hardcode_libdir_flag_spec= > hardcode_libdir_flag_spec_ld='-rpath $libdir' > @@ -936,7 +938,7 @@ index 4f591b750d8..d90db11744b 100755 > fi > ;; > esac > -@@ -8957,8 +9466,8 @@ _LT_EOF > +@@ -8976,8 +9485,8 @@ _LT_EOF > archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' > wlarc= > else > @@ -947,7 +949,7 @@ index 4f591b750d8..d90db11744b 100755 > fi > ;; > > -@@ -8976,8 +9485,8 @@ _LT_EOF > +@@ -8995,8 +9504,8 @@ _LT_EOF > > _LT_EOF > elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then > @@ -958,7 +960,7 @@ index 4f591b750d8..d90db11744b 100755 > else > ld_shlibs=no > fi > -@@ -9023,8 +9532,8 @@ _LT_EOF > +@@ -9042,8 +9551,8 @@ _LT_EOF > > *) > if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then > @@ -969,7 +971,7 @@ index 4f591b750d8..d90db11744b 100755 > else > ld_shlibs=no > fi > -@@ -9154,7 +9663,13 @@ _LT_EOF > +@@ -9173,7 +9682,13 @@ _LT_EOF > allow_undefined_flag='-berok' > # Determine the default libpath from the value encoded in an > # empty executable. > @@ -984,7 +986,7 @@ index 4f591b750d8..d90db11744b 100755 > /* end confdefs.h. */ > > int > -@@ -9167,22 +9682,29 @@ main () > +@@ -9186,22 +9701,29 @@ main () > _ACEOF > if ac_fn_c_try_link "$LINENO"; then : > > @@ -1027,7 +1029,7 @@ index 4f591b750d8..d90db11744b 100755 > > 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" > -@@ -9194,7 +9716,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9213,7 +9735,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. > @@ -1042,7 +1044,7 @@ index 4f591b750d8..d90db11744b 100755 > /* end confdefs.h. */ > > int > -@@ -9207,22 +9735,29 @@ main () > +@@ -9226,22 +9754,29 @@ main () > _ACEOF > if ac_fn_c_try_link "$LINENO"; then : > > @@ -1085,7 +1087,7 @@ index 4f591b750d8..d90db11744b 100755 > > hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" > # Warning - without using the other run time loading flags, > -@@ -9267,20 +9802,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9286,20 +9821,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. > @@ -1163,7 +1165,7 @@ index 4f591b750d8..d90db11744b 100755 > ;; > > darwin* | rhapsody*) > -@@ -9341,7 +9919,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9360,7 +9938,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*) > @@ -1172,7 +1174,7 @@ index 4f591b750d8..d90db11744b 100755 > hardcode_libdir_flag_spec='-R$libdir' > hardcode_direct=yes > hardcode_shlibpath_var=no > -@@ -9349,7 +9927,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9368,7 +9946,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > hpux9*) > if test "$GCC" = yes; then > @@ -1181,7 +1183,7 @@ index 4f591b750d8..d90db11744b 100755 > 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 > -@@ -9365,7 +9943,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9384,7 +9962,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > hpux10*) > if test "$GCC" = yes && test "$with_gnu_ld" = no; then > @@ -1190,7 +1192,7 @@ index 4f591b750d8..d90db11744b 100755 > else > archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' > fi > -@@ -9389,10 +9967,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9408,10 +9986,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*) > @@ -1203,7 +1205,7 @@ index 4f591b750d8..d90db11744b 100755 > ;; > esac > else > -@@ -9471,23 +10049,36 @@ fi > +@@ -9490,23 +10068,36 @@ fi > > irix5* | irix6* | nonstopux*) > if test "$GCC" = yes; then > @@ -1248,7 +1250,7 @@ index 4f591b750d8..d90db11744b 100755 > 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' > -@@ -9572,7 +10163,7 @@ rm -f core conftest.err conftest.$ac_objext \ > +@@ -9591,7 +10182,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}\*' > @@ -1257,7 +1259,7 @@ index 4f591b750d8..d90db11744b 100755 > hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' > else > allow_undefined_flag=' -expect_unresolved \*' > -@@ -9591,9 +10182,9 @@ rm -f core conftest.err conftest.$ac_objext \ > +@@ -9610,9 +10201,9 @@ rm -f core conftest.err conftest.$ac_objext \ > no_undefined_flag=' -z defs' > if test "$GCC" = yes; then > wlarc='${wl}' > @@ -1269,7 +1271,7 @@ index 4f591b750d8..d90db11744b 100755 > else > case `$CC -V 2>&1` in > *"Compilers 5.0"*) > -@@ -10169,8 +10760,9 @@ cygwin* | mingw* | pw32* | cegcc*) > +@@ -10188,8 +10779,9 @@ cygwin* | mingw* | pw32* | cegcc*) > need_version=no > need_lib_prefix=no > > @@ -1281,7 +1283,7 @@ index 4f591b750d8..d90db11744b 100755 > library_names_spec='$libname.dll.a' > # DLL is installed to $(libdir)/../bin by postinstall_cmds > postinstall_cmds='base_file=`basename \${file}`~ > -@@ -10203,13 +10795,71 @@ cygwin* | mingw* | pw32* | cegcc*) > +@@ -10222,13 +10814,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 > @@ -1354,16 +1356,16 @@ index 4f591b750d8..d90db11744b 100755 > # FIXME: first we should search . and the directory the executable is in > shlibpath_var=PATH > ;; > -@@ -11087,7 +11737,7 @@ else > +@@ -11106,7 +11756,7 @@ else > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF > --#line 11090 "configure" > +-#line 11109 "configure" > +#line $LINENO "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > -@@ -11131,10 +11781,10 @@ else > +@@ -11150,10 +11800,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)) > @@ -1376,16 +1378,16 @@ index 4f591b750d8..d90db11744b 100755 > int main () > { > void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > -@@ -11193,7 +11843,7 @@ else > +@@ -11212,7 +11862,7 @@ else > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF > --#line 11196 "configure" > +-#line 11215 "configure" > +#line $LINENO "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > -@@ -11237,10 +11887,10 @@ else > +@@ -11256,10 +11906,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)) > @@ -1398,7 +1400,7 @@ index 4f591b750d8..d90db11744b 100755 > int main () > { > void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > -@@ -13225,7 +13875,7 @@ SHARED_LDFLAGS= > +@@ -13482,7 +14132,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 > @@ -1407,7 +1409,7 @@ index 4f591b750d8..d90db11744b 100755 > fi > fi > > -@@ -15869,13 +16519,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' > +@@ -16129,13 +16779,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"`' > @@ -1428,7 +1430,7 @@ index 4f591b750d8..d90db11744b 100755 > 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"`' > -@@ -15890,14 +16547,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de > +@@ -16150,14 +16807,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"`' > @@ -1447,7 +1449,7 @@ index 4f591b750d8..d90db11744b 100755 > DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' > NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' > LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' > -@@ -15930,12 +16590,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q > +@@ -16190,12 +16850,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"`' > @@ -1461,7 +1463,7 @@ index 4f591b750d8..d90db11744b 100755 > 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"`' > -@@ -15990,8 +16650,13 @@ reload_flag \ > +@@ -16250,8 +16910,13 @@ reload_flag \ > OBJDUMP \ > deplibs_check_method \ > file_magic_cmd \ > @@ -1475,7 +1477,7 @@ index 4f591b750d8..d90db11744b 100755 > STRIP \ > RANLIB \ > CC \ > -@@ -16001,12 +16666,14 @@ lt_cv_sys_global_symbol_pipe \ > +@@ -16261,12 +16926,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 \ > @@ -1491,7 +1493,7 @@ index 4f591b750d8..d90db11744b 100755 > DSYMUTIL \ > NMEDIT \ > LIPO \ > -@@ -16022,7 +16689,6 @@ no_undefined_flag \ > +@@ -16282,7 +16949,6 @@ no_undefined_flag \ > hardcode_libdir_flag_spec \ > hardcode_libdir_flag_spec_ld \ > hardcode_libdir_separator \ > @@ -1499,7 +1501,7 @@ index 4f591b750d8..d90db11744b 100755 > exclude_expsyms \ > include_expsyms \ > file_list_spec \ > -@@ -16058,6 +16724,7 @@ module_cmds \ > +@@ -16318,6 +16984,7 @@ module_cmds \ > module_expsym_cmds \ > export_symbols_cmds \ > prelink_cmds \ > @@ -1507,7 +1509,7 @@ index 4f591b750d8..d90db11744b 100755 > postinstall_cmds \ > postuninstall_cmds \ > finish_cmds \ > -@@ -16826,7 +17493,8 @@ $as_echo X"$file" | > +@@ -17086,7 +17753,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, > @@ -1517,7 +1519,7 @@ index 4f591b750d8..d90db11744b 100755 > # Written by Gordon Matzigkeit, 1996 > # > # This file is part of GNU Libtool. > -@@ -16929,19 +17597,42 @@ SP2NL=$lt_lt_SP2NL > +@@ -17189,19 +17857,42 @@ SP2NL=$lt_lt_SP2NL > # turn newlines into spaces. > NL2SP=$lt_lt_NL2SP > > @@ -1561,7 +1563,7 @@ index 4f591b750d8..d90db11744b 100755 > # A symbol stripping program. > STRIP=$lt_STRIP > > -@@ -16971,6 +17662,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address > +@@ -17231,6 +17922,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 > > @@ -1574,7 +1576,7 @@ index 4f591b750d8..d90db11744b 100755 > # The name of the directory that contains temporary libtool files. > objdir=$objdir > > -@@ -16980,6 +17677,9 @@ MAGIC_CMD=$MAGIC_CMD > +@@ -17240,6 +17937,9 @@ MAGIC_CMD=$MAGIC_CMD > # Must we lock files when doing compilation? > need_locks=$lt_need_locks > > @@ -1584,7 +1586,7 @@ index 4f591b750d8..d90db11744b 100755 > # Tool to manipulate archived DWARF debug symbol files on Mac OS X. > DSYMUTIL=$lt_DSYMUTIL > > -@@ -17094,12 +17794,12 @@ with_gcc=$GCC > +@@ -17354,12 +18054,12 @@ with_gcc=$GCC > # Compiler flag to turn off builtin functions. > no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag > > @@ -1600,7 +1602,7 @@ index 4f591b750d8..d90db11744b 100755 > # Compiler flag to prevent dynamic linking. > link_static_flag=$lt_lt_prog_compiler_static > > -@@ -17186,9 +17886,6 @@ inherit_rpath=$inherit_rpath > +@@ -17446,9 +18146,6 @@ inherit_rpath=$inherit_rpath > # Whether libtool must link a program against all its dependency libraries. > link_all_deplibs=$link_all_deplibs > > @@ -1610,7 +1612,7 @@ index 4f591b750d8..d90db11744b 100755 > # Set to "yes" if exported symbols are required. > always_export_symbols=$always_export_symbols > > -@@ -17204,6 +17901,9 @@ include_expsyms=$lt_include_expsyms > +@@ -17464,6 +18161,9 @@ include_expsyms=$lt_include_expsyms > # Commands necessary for linking programs (against libraries) with templates. > prelink_cmds=$lt_prelink_cmds > > @@ -1620,7 +1622,7 @@ index 4f591b750d8..d90db11744b 100755 > # Specify filename containing input files. > file_list_spec=$lt_file_list_spec > > -@@ -17236,210 +17936,169 @@ ltmain="$ac_aux_dir/ltmain.sh" > +@@ -17496,210 +18196,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? > @@ -1995,10 +1997,10 @@ index 4f591b750d8..d90db11744b 100755 > chmod +x "$ofile" > > diff --git a/bfd/configure.ac b/bfd/configure.ac > -index 6146efb5ae3..73e5e03d016 100644 > +index 015fd011893..58f73ec709c 100644 > --- a/bfd/configure.ac > +++ b/bfd/configure.ac > -@@ -282,7 +282,7 @@ changequote(,)dnl > +@@ -272,7 +272,7 @@ changequote(,)dnl > x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` > changequote([,])dnl > if test -n "$x"; then > @@ -2008,10 +2010,10 @@ index 6146efb5ae3..73e5e03d016 100644 > fi > > diff --git a/binutils/Makefile.in b/binutils/Makefile.in > -index 78d32b350e3..ad4f2de7358 100644 > +index 27315addc0f..5ddd5a42a7d 100644 > --- a/binutils/Makefile.in > +++ b/binutils/Makefile.in > -@@ -492,6 +492,7 @@ DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@ > +@@ -493,6 +493,7 @@ DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@ > DEFS = @DEFS@ > DEMANGLER_NAME = @DEMANGLER_NAME@ > DEPDIR = @DEPDIR@ > @@ -2019,7 +2021,7 @@ index 78d32b350e3..ad4f2de7358 100644 > DLLTOOL_DEFS = @DLLTOOL_DEFS@ > DSYMUTIL = @DSYMUTIL@ > DUMPBIN = @DUMPBIN@ > -@@ -533,6 +534,7 @@ LTLIBICONV = @LTLIBICONV@ > +@@ -534,6 +535,7 @@ LTLIBICONV = @LTLIBICONV@ > LTLIBOBJS = @LTLIBOBJS@ > MAINT = @MAINT@ > MAKEINFO = @MAKEINFO@ > @@ -2027,7 +2029,7 @@ index 78d32b350e3..ad4f2de7358 100644 > MKDIR_P = @MKDIR_P@ > MKINSTALLDIRS = @MKINSTALLDIRS@ > MSGFMT = @MSGFMT@ > -@@ -579,6 +581,7 @@ abs_builddir = @abs_builddir@ > +@@ -582,6 +584,7 @@ abs_builddir = @abs_builddir@ > abs_srcdir = @abs_srcdir@ > abs_top_builddir = @abs_top_builddir@ > abs_top_srcdir = @abs_top_srcdir@ > @@ -2036,10 +2038,10 @@ index 78d32b350e3..ad4f2de7358 100644 > ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ > am__include = @am__include@ > diff --git a/binutils/configure b/binutils/configure > -index 149815542f9..43952bde405 100755 > +index 3cb797c2b8d..5578150c1d9 100755 > --- a/binutils/configure > +++ b/binutils/configure > -@@ -698,8 +698,11 @@ OTOOL > +@@ -700,8 +700,11 @@ OTOOL > LIPO > NMEDIT > DSYMUTIL > @@ -2051,7 +2053,7 @@ index 149815542f9..43952bde405 100755 > OBJDUMP > LN_S > NM > -@@ -816,6 +819,7 @@ enable_static > +@@ -818,6 +821,7 @@ enable_static > with_pic > enable_fast_install > with_gnu_ld > @@ -2059,7 +2061,7 @@ index 149815542f9..43952bde405 100755 > enable_libtool_lock > enable_plugins > enable_largefile > -@@ -1514,6 +1518,8 @@ Optional Packages: > +@@ -1523,6 +1527,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] > @@ -2068,7 +2070,7 @@ index 149815542f9..43952bde405 100755 > --with-debuginfod Enable debuginfo lookups with debuginfod > (auto/yes/no) > --with-system-zlib use installed libz > -@@ -4893,8 +4899,8 @@ esac > +@@ -4723,8 +4729,8 @@ esac > > > > @@ -2079,7 +2081,7 @@ index 149815542f9..43952bde405 100755 > > > > -@@ -4934,7 +4940,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO > +@@ -4764,7 +4770,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. > @@ -2088,7 +2090,7 @@ index 149815542f9..43952bde405 100755 > 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 > -@@ -5627,8 +5633,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; > +@@ -5457,8 +5463,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" > @@ -2099,7 +2101,7 @@ index 149815542f9..43952bde405 100755 > && eval 'test $(( 1 + 1 )) -eq 2 \ > && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ > && xsi_shell=yes > -@@ -5677,6 +5683,80 @@ esac > +@@ -5507,6 +5513,80 @@ esac > > > > @@ -2180,7 +2182,7 @@ index 149815542f9..43952bde405 100755 > { $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 ${lt_cv_ld_reload_flag+:} false; then : > -@@ -5693,6 +5773,11 @@ case $reload_flag in > +@@ -5523,6 +5603,11 @@ case $reload_flag in > esac > reload_cmds='$LD$reload_flag -o $output$reload_objs' > case $host_os in > @@ -2192,7 +2194,7 @@ index 149815542f9..43952bde405 100755 > darwin*) > if test "$GCC" = yes; then > reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' > -@@ -5861,7 +5946,8 @@ mingw* | pw32*) > +@@ -5691,7 +5776,8 @@ mingw* | pw32*) > lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' > lt_cv_file_magic_cmd='func_win32_libid' > else > @@ -2202,7 +2204,7 @@ index 149815542f9..43952bde405 100755 > lt_cv_file_magic_cmd='$OBJDUMP -f' > fi > ;; > -@@ -6015,6 +6101,21 @@ esac > +@@ -5845,6 +5931,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; } > @@ -2224,7 +2226,7 @@ index 149815542f9..43952bde405 100755 > 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 > -@@ -6030,6 +6131,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown > +@@ -5860,6 +5961,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown > > > > @@ -2382,7 +2384,7 @@ index 149815542f9..43952bde405 100755 > plugin_option= > plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" > for plugin in $plugin_names; do > -@@ -6044,8 +6296,10 @@ for plugin in $plugin_names; do > +@@ -5874,8 +6126,10 @@ for plugin in $plugin_names; do > done > > if test -n "$ac_tool_prefix"; then > @@ -2395,7 +2397,7 @@ index 149815542f9..43952bde405 100755 > { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 > $as_echo_n "checking for $ac_word... " >&6; } > if ${ac_cv_prog_AR+:} false; then : > -@@ -6061,7 +6315,7 @@ do > +@@ -5891,7 +6145,7 @@ do > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > @@ -2404,7 +2406,7 @@ index 149815542f9..43952bde405 100755 > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > fi > -@@ -6081,11 +6335,15 @@ $as_echo "no" >&6; } > +@@ -5911,11 +6165,15 @@ $as_echo "no" >&6; } > fi > > > @@ -2423,7 +2425,7 @@ index 149815542f9..43952bde405 100755 > { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 > $as_echo_n "checking for $ac_word... " >&6; } > if ${ac_cv_prog_ac_ct_AR+:} false; then : > -@@ -6101,7 +6359,7 @@ do > +@@ -5931,7 +6189,7 @@ do > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > @@ -2432,7 +2434,7 @@ index 149815542f9..43952bde405 100755 > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > fi > -@@ -6120,6 +6378,10 @@ else > +@@ -5950,6 +6208,10 @@ else > $as_echo "no" >&6; } > fi > > @@ -2443,7 +2445,7 @@ index 149815542f9..43952bde405 100755 > if test "x$ac_ct_AR" = x; then > AR="false" > else > -@@ -6131,29 +6393,81 @@ ac_tool_warned=yes ;; > +@@ -5961,29 +6223,81 @@ ac_tool_warned=yes ;; > esac > AR=$ac_ct_AR > fi > @@ -2540,7 +2542,7 @@ index 149815542f9..43952bde405 100755 > > > > -@@ -6500,8 +6814,8 @@ esac > +@@ -6330,8 +6644,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 > @@ -2551,7 +2553,7 @@ index 149815542f9..43952bde405 100755 > > # Handle CRLF in mingw tool chain > opt_cr= > -@@ -6537,6 +6851,7 @@ for ac_symprfx in "" "_"; do > +@@ -6367,6 +6681,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 > @@ -2559,7 +2561,7 @@ index 149815542f9..43952bde405 100755 > > # Check to see that the pipe works correctly. > pipe_works=no > -@@ -6578,6 +6893,18 @@ _LT_EOF > +@@ -6408,6 +6723,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 > @@ -2578,7 +2580,7 @@ index 149815542f9..43952bde405 100755 > #ifdef __cplusplus > extern "C" { > #endif > -@@ -6589,7 +6916,7 @@ _LT_EOF > +@@ -6419,7 +6746,7 @@ _LT_EOF > cat <<_LT_EOF >> conftest.$ac_ext > > /* The mapping between symbol names and symbols. */ > @@ -2587,7 +2589,7 @@ index 149815542f9..43952bde405 100755 > const char *name; > void *address; > } > -@@ -6615,8 +6942,8 @@ static const void *lt_preloaded_setup() { > +@@ -6445,8 +6772,8 @@ static const void *lt_preloaded_setup() { > _LT_EOF > # Now try linking the two files. > mv conftest.$ac_objext conftstm.$ac_objext > @@ -2598,7 +2600,7 @@ index 149815542f9..43952bde405 100755 > LIBS="conftstm.$ac_objext" > CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" > if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 > -@@ -6626,8 +6953,8 @@ _LT_EOF > +@@ -6456,8 +6783,8 @@ _LT_EOF > test $ac_status = 0; } && test -s conftest${ac_exeext}; then > pipe_works=yes > fi > @@ -2609,7 +2611,7 @@ index 149815542f9..43952bde405 100755 > else > echo "cannot find nm_test_func in $nlist" >&5 > fi > -@@ -6664,6 +6991,19 @@ else > +@@ -6494,6 +6821,19 @@ else > $as_echo "ok" >&6; } > fi > > @@ -2629,7 +2631,7 @@ index 149815542f9..43952bde405 100755 > > > > -@@ -6680,6 +7020,42 @@ fi > +@@ -6510,6 +6850,42 @@ fi > > > > @@ -2672,7 +2674,7 @@ index 149815542f9..43952bde405 100755 > > > > -@@ -6891,6 +7267,123 @@ esac > +@@ -6721,6 +7097,123 @@ esac > > need_locks="$enable_libtool_lock" > > @@ -2796,7 +2798,7 @@ index 149815542f9..43952bde405 100755 > > case $host_os in > rhapsody* | darwin*) > -@@ -7454,6 +7947,8 @@ _LT_EOF > +@@ -7284,6 +7777,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 > @@ -2805,7 +2807,7 @@ index 149815542f9..43952bde405 100755 > cat > conftest.c << _LT_EOF > int main() { return 0;} > _LT_EOF > -@@ -8036,8 +8531,6 @@ fi > +@@ -7866,8 +8361,6 @@ fi > lt_prog_compiler_pic= > lt_prog_compiler_static= > > @@ -2814,7 +2816,7 @@ index 149815542f9..43952bde405 100755 > > if test "$GCC" = yes; then > lt_prog_compiler_wl='-Wl,' > -@@ -8203,6 +8696,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > +@@ -8033,6 +8526,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > lt_prog_compiler_pic='--shared' > lt_prog_compiler_static='--static' > ;; > @@ -2827,7 +2829,7 @@ index 149815542f9..43952bde405 100755 > pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) > # Portland Group compilers (*not* the Pentium gcc compiler, > # which looks to be a dead project) > -@@ -8265,7 +8764,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > +@@ -8095,7 +8594,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 > @@ -2836,7 +2838,7 @@ index 149815542f9..43952bde405 100755 > lt_prog_compiler_wl='-Qoption ld ';; > *) > lt_prog_compiler_wl='-Wl,';; > -@@ -8322,13 +8821,17 @@ case $host_os in > +@@ -8152,13 +8651,17 @@ case $host_os in > lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" > ;; > esac > @@ -2860,7 +2862,7 @@ index 149815542f9..43952bde405 100755 > > # > # Check to make sure the PIC flag actually works. > -@@ -8389,6 +8892,11 @@ fi > +@@ -8219,6 +8722,11 @@ fi > > > > @@ -2872,7 +2874,7 @@ index 149815542f9..43952bde405 100755 > # > # Check to make sure the static flag actually works. > # > -@@ -8739,7 +9247,8 @@ _LT_EOF > +@@ -8569,7 +9077,8 @@ _LT_EOF > allow_undefined_flag=unsupported > always_export_symbols=no > enable_shared_with_static_runtimes=yes > @@ -2882,7 +2884,7 @@ index 149815542f9..43952bde405 100755 > > 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' > -@@ -8838,12 +9347,12 @@ _LT_EOF > +@@ -8668,12 +9177,12 @@ _LT_EOF > whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' > hardcode_libdir_flag_spec= > hardcode_libdir_flag_spec_ld='-rpath $libdir' > @@ -2897,7 +2899,7 @@ index 149815542f9..43952bde405 100755 > fi > ;; > esac > -@@ -8857,8 +9366,8 @@ _LT_EOF > +@@ -8687,8 +9196,8 @@ _LT_EOF > archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' > wlarc= > else > @@ -2908,7 +2910,7 @@ index 149815542f9..43952bde405 100755 > fi > ;; > > -@@ -8876,8 +9385,8 @@ _LT_EOF > +@@ -8706,8 +9215,8 @@ _LT_EOF > > _LT_EOF > elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then > @@ -2919,7 +2921,7 @@ index 149815542f9..43952bde405 100755 > else > ld_shlibs=no > fi > -@@ -8923,8 +9432,8 @@ _LT_EOF > +@@ -8753,8 +9262,8 @@ _LT_EOF > > *) > if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then > @@ -2930,7 +2932,7 @@ index 149815542f9..43952bde405 100755 > else > ld_shlibs=no > fi > -@@ -9054,7 +9563,13 @@ _LT_EOF > +@@ -8884,7 +9393,13 @@ _LT_EOF > allow_undefined_flag='-berok' > # Determine the default libpath from the value encoded in an > # empty executable. > @@ -2945,7 +2947,7 @@ index 149815542f9..43952bde405 100755 > /* end confdefs.h. */ > > int > -@@ -9067,22 +9582,29 @@ main () > +@@ -8897,22 +9412,29 @@ main () > _ACEOF > if ac_fn_c_try_link "$LINENO"; then : > > @@ -2988,7 +2990,7 @@ index 149815542f9..43952bde405 100755 > > 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" > -@@ -9094,7 +9616,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -8924,7 +9446,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. > @@ -3003,7 +3005,7 @@ index 149815542f9..43952bde405 100755 > /* end confdefs.h. */ > > int > -@@ -9107,22 +9635,29 @@ main () > +@@ -8937,22 +9465,29 @@ main () > _ACEOF > if ac_fn_c_try_link "$LINENO"; then : > > @@ -3046,7 +3048,7 @@ index 149815542f9..43952bde405 100755 > > hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" > # Warning - without using the other run time loading flags, > -@@ -9167,20 +9702,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -8997,20 +9532,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. > @@ -3124,7 +3126,7 @@ index 149815542f9..43952bde405 100755 > ;; > > darwin* | rhapsody*) > -@@ -9241,7 +9819,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9071,7 +9649,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*) > @@ -3133,7 +3135,7 @@ index 149815542f9..43952bde405 100755 > hardcode_libdir_flag_spec='-R$libdir' > hardcode_direct=yes > hardcode_shlibpath_var=no > -@@ -9249,7 +9827,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9079,7 +9657,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > hpux9*) > if test "$GCC" = yes; then > @@ -3142,7 +3144,7 @@ index 149815542f9..43952bde405 100755 > 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 > -@@ -9265,7 +9843,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9095,7 +9673,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > hpux10*) > if test "$GCC" = yes && test "$with_gnu_ld" = no; then > @@ -3151,7 +3153,7 @@ index 149815542f9..43952bde405 100755 > else > archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' > fi > -@@ -9289,10 +9867,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9119,10 +9697,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*) > @@ -3164,7 +3166,7 @@ index 149815542f9..43952bde405 100755 > ;; > esac > else > -@@ -9371,23 +9949,36 @@ fi > +@@ -9201,23 +9779,36 @@ fi > > irix5* | irix6* | nonstopux*) > if test "$GCC" = yes; then > @@ -3209,7 +3211,7 @@ index 149815542f9..43952bde405 100755 > 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' > -@@ -9472,7 +10063,7 @@ rm -f core conftest.err conftest.$ac_objext \ > +@@ -9302,7 +9893,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}\*' > @@ -3218,7 +3220,7 @@ index 149815542f9..43952bde405 100755 > hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' > else > allow_undefined_flag=' -expect_unresolved \*' > -@@ -9491,9 +10082,9 @@ rm -f core conftest.err conftest.$ac_objext \ > +@@ -9321,9 +9912,9 @@ rm -f core conftest.err conftest.$ac_objext \ > no_undefined_flag=' -z defs' > if test "$GCC" = yes; then > wlarc='${wl}' > @@ -3230,7 +3232,7 @@ index 149815542f9..43952bde405 100755 > else > case `$CC -V 2>&1` in > *"Compilers 5.0"*) > -@@ -10069,8 +10660,9 @@ cygwin* | mingw* | pw32* | cegcc*) > +@@ -9899,8 +10490,9 @@ cygwin* | mingw* | pw32* | cegcc*) > need_version=no > need_lib_prefix=no > > @@ -3242,7 +3244,7 @@ index 149815542f9..43952bde405 100755 > library_names_spec='$libname.dll.a' > # DLL is installed to $(libdir)/../bin by postinstall_cmds > postinstall_cmds='base_file=`basename \${file}`~ > -@@ -10103,13 +10695,71 @@ cygwin* | mingw* | pw32* | cegcc*) > +@@ -9933,13 +10525,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 > @@ -3315,16 +3317,16 @@ index 149815542f9..43952bde405 100755 > # FIXME: first we should search . and the directory the executable is in > shlibpath_var=PATH > ;; > -@@ -10987,7 +11637,7 @@ else > +@@ -10817,7 +11467,7 @@ else > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF > --#line 10990 "configure" > +-#line 10820 "configure" > +#line $LINENO "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > -@@ -11031,10 +11681,10 @@ else > +@@ -10861,10 +11511,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)) > @@ -3337,16 +3339,16 @@ index 149815542f9..43952bde405 100755 > int main () > { > void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > -@@ -11093,7 +11743,7 @@ else > +@@ -10923,7 +11573,7 @@ else > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF > --#line 11096 "configure" > +-#line 10926 "configure" > +#line $LINENO "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > -@@ -11137,10 +11787,10 @@ else > +@@ -10967,10 +11617,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)) > @@ -3359,7 +3361,7 @@ index 149815542f9..43952bde405 100755 > int main () > { > void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > -@@ -15642,13 +16292,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' > +@@ -15549,13 +16199,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"`' > @@ -3380,7 +3382,7 @@ index 149815542f9..43952bde405 100755 > 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"`' > -@@ -15663,14 +16320,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de > +@@ -15570,14 +16227,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"`' > @@ -3399,7 +3401,7 @@ index 149815542f9..43952bde405 100755 > DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' > NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' > LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' > -@@ -15703,12 +16363,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q > +@@ -15610,12 +16270,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"`' > @@ -3413,7 +3415,7 @@ index 149815542f9..43952bde405 100755 > 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"`' > -@@ -15763,8 +16423,13 @@ reload_flag \ > +@@ -15670,8 +16330,13 @@ reload_flag \ > OBJDUMP \ > deplibs_check_method \ > file_magic_cmd \ > @@ -3427,7 +3429,7 @@ index 149815542f9..43952bde405 100755 > STRIP \ > RANLIB \ > CC \ > -@@ -15774,12 +16439,14 @@ lt_cv_sys_global_symbol_pipe \ > +@@ -15681,12 +16346,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 \ > @@ -3443,7 +3445,7 @@ index 149815542f9..43952bde405 100755 > DSYMUTIL \ > NMEDIT \ > LIPO \ > -@@ -15795,7 +16462,6 @@ no_undefined_flag \ > +@@ -15702,7 +16369,6 @@ no_undefined_flag \ > hardcode_libdir_flag_spec \ > hardcode_libdir_flag_spec_ld \ > hardcode_libdir_separator \ > @@ -3451,7 +3453,7 @@ index 149815542f9..43952bde405 100755 > exclude_expsyms \ > include_expsyms \ > file_list_spec \ > -@@ -15831,6 +16497,7 @@ module_cmds \ > +@@ -15738,6 +16404,7 @@ module_cmds \ > module_expsym_cmds \ > export_symbols_cmds \ > prelink_cmds \ > @@ -3459,7 +3461,7 @@ index 149815542f9..43952bde405 100755 > postinstall_cmds \ > postuninstall_cmds \ > finish_cmds \ > -@@ -16596,7 +17263,8 @@ $as_echo X"$file" | > +@@ -16503,7 +17170,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, > @@ -3469,7 +3471,7 @@ index 149815542f9..43952bde405 100755 > # Written by Gordon Matzigkeit, 1996 > # > # This file is part of GNU Libtool. > -@@ -16699,19 +17367,42 @@ SP2NL=$lt_lt_SP2NL > +@@ -16606,19 +17274,42 @@ SP2NL=$lt_lt_SP2NL > # turn newlines into spaces. > NL2SP=$lt_lt_NL2SP > > @@ -3513,7 +3515,7 @@ index 149815542f9..43952bde405 100755 > # A symbol stripping program. > STRIP=$lt_STRIP > > -@@ -16741,6 +17432,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address > +@@ -16648,6 +17339,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 > > @@ -3526,7 +3528,7 @@ index 149815542f9..43952bde405 100755 > # The name of the directory that contains temporary libtool files. > objdir=$objdir > > -@@ -16750,6 +17447,9 @@ MAGIC_CMD=$MAGIC_CMD > +@@ -16657,6 +17354,9 @@ MAGIC_CMD=$MAGIC_CMD > # Must we lock files when doing compilation? > need_locks=$lt_need_locks > > @@ -3536,7 +3538,7 @@ index 149815542f9..43952bde405 100755 > # Tool to manipulate archived DWARF debug symbol files on Mac OS X. > DSYMUTIL=$lt_DSYMUTIL > > -@@ -16864,12 +17564,12 @@ with_gcc=$GCC > +@@ -16771,12 +17471,12 @@ with_gcc=$GCC > # Compiler flag to turn off builtin functions. > no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag > > @@ -3552,7 +3554,7 @@ index 149815542f9..43952bde405 100755 > # Compiler flag to prevent dynamic linking. > link_static_flag=$lt_lt_prog_compiler_static > > -@@ -16956,9 +17656,6 @@ inherit_rpath=$inherit_rpath > +@@ -16863,9 +17563,6 @@ inherit_rpath=$inherit_rpath > # Whether libtool must link a program against all its dependency libraries. > link_all_deplibs=$link_all_deplibs > > @@ -3562,7 +3564,7 @@ index 149815542f9..43952bde405 100755 > # Set to "yes" if exported symbols are required. > always_export_symbols=$always_export_symbols > > -@@ -16974,6 +17671,9 @@ include_expsyms=$lt_include_expsyms > +@@ -16881,6 +17578,9 @@ include_expsyms=$lt_include_expsyms > # Commands necessary for linking programs (against libraries) with templates. > prelink_cmds=$lt_prelink_cmds > > @@ -3572,7 +3574,7 @@ index 149815542f9..43952bde405 100755 > # Specify filename containing input files. > file_list_spec=$lt_file_list_spec > > -@@ -17006,210 +17706,169 @@ ltmain="$ac_aux_dir/ltmain.sh" > +@@ -16913,210 +17613,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? > @@ -3947,10 +3949,10 @@ index 149815542f9..43952bde405 100755 > chmod +x "$ofile" > > diff --git a/gas/Makefile.in b/gas/Makefile.in > -index c57d78f82c4..da370b21855 100644 > +index 8319181b472..3425e414c1c 100644 > --- a/gas/Makefile.in > +++ b/gas/Makefile.in > -@@ -373,6 +373,7 @@ CYGPATH_W = @CYGPATH_W@ > +@@ -377,6 +377,7 @@ CYGPATH_W = @CYGPATH_W@ > DATADIRNAME = @DATADIRNAME@ > DEFS = @DEFS@ > DEPDIR = @DEPDIR@ > @@ -3958,7 +3960,7 @@ index c57d78f82c4..da370b21855 100644 > DSYMUTIL = @DSYMUTIL@ > DUMPBIN = @DUMPBIN@ > ECHO_C = @ECHO_C@ > -@@ -409,6 +410,7 @@ LN_S = @LN_S@ > +@@ -413,6 +414,7 @@ LN_S = @LN_S@ > LTLIBOBJS = @LTLIBOBJS@ > MAINT = @MAINT@ > MAKEINFO = @MAKEINFO@ > @@ -3966,7 +3968,7 @@ index c57d78f82c4..da370b21855 100644 > MKDIR_P = @MKDIR_P@ > MKINSTALLDIRS = @MKINSTALLDIRS@ > MSGFMT = @MSGFMT@ > -@@ -447,6 +449,7 @@ abs_builddir = @abs_builddir@ > +@@ -456,6 +458,7 @@ abs_builddir = @abs_builddir@ > abs_srcdir = @abs_srcdir@ > abs_top_builddir = @abs_top_builddir@ > abs_top_srcdir = @abs_top_srcdir@ > @@ -3975,10 +3977,10 @@ index c57d78f82c4..da370b21855 100644 > ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ > am__include = @am__include@ > diff --git a/gas/configure b/gas/configure > -index 12c16faefd9..11b5127bf3a 100755 > +index 684e68e0ea2..ba35172965e 100755 > --- a/gas/configure > +++ b/gas/configure > -@@ -681,8 +681,11 @@ OTOOL > +@@ -686,8 +686,11 @@ OTOOL > LIPO > NMEDIT > DSYMUTIL > @@ -3990,7 +3992,7 @@ index 12c16faefd9..11b5127bf3a 100755 > OBJDUMP > LN_S > NM > -@@ -799,6 +802,7 @@ enable_static > +@@ -804,6 +807,7 @@ enable_static > with_pic > enable_fast_install > with_gnu_ld > @@ -3998,7 +4000,7 @@ index 12c16faefd9..11b5127bf3a 100755 > enable_libtool_lock > enable_plugins > enable_largefile > -@@ -1490,6 +1494,8 @@ Optional Packages: > +@@ -1505,6 +1509,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] > @@ -4007,7 +4009,7 @@ index 12c16faefd9..11b5127bf3a 100755 > --with-cpu=CPU default cpu variant is CPU (currently only supported > on ARC) > --with-system-zlib use installed libz > -@@ -4608,8 +4614,8 @@ esac > +@@ -4632,8 +4638,8 @@ esac > > > > @@ -4018,7 +4020,7 @@ index 12c16faefd9..11b5127bf3a 100755 > > > > -@@ -4649,7 +4655,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO > +@@ -4673,7 +4679,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. > @@ -4027,7 +4029,7 @@ index 12c16faefd9..11b5127bf3a 100755 > 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 > -@@ -5342,8 +5348,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; > +@@ -5366,8 +5372,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" > @@ -4038,7 +4040,7 @@ index 12c16faefd9..11b5127bf3a 100755 > && eval 'test $(( 1 + 1 )) -eq 2 \ > && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ > && xsi_shell=yes > -@@ -5392,6 +5398,80 @@ esac > +@@ -5416,6 +5422,80 @@ esac > > > > @@ -4119,7 +4121,7 @@ index 12c16faefd9..11b5127bf3a 100755 > { $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 ${lt_cv_ld_reload_flag+:} false; then : > -@@ -5408,6 +5488,11 @@ case $reload_flag in > +@@ -5432,6 +5512,11 @@ case $reload_flag in > esac > reload_cmds='$LD$reload_flag -o $output$reload_objs' > case $host_os in > @@ -4131,7 +4133,7 @@ index 12c16faefd9..11b5127bf3a 100755 > darwin*) > if test "$GCC" = yes; then > reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' > -@@ -5576,7 +5661,8 @@ mingw* | pw32*) > +@@ -5600,7 +5685,8 @@ mingw* | pw32*) > lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' > lt_cv_file_magic_cmd='func_win32_libid' > else > @@ -4141,7 +4143,7 @@ index 12c16faefd9..11b5127bf3a 100755 > lt_cv_file_magic_cmd='$OBJDUMP -f' > fi > ;; > -@@ -5730,6 +5816,21 @@ esac > +@@ -5754,6 +5840,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; } > @@ -4163,7 +4165,7 @@ index 12c16faefd9..11b5127bf3a 100755 > 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 > -@@ -5745,6 +5846,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown > +@@ -5769,6 +5870,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown > > > > @@ -4321,7 +4323,7 @@ index 12c16faefd9..11b5127bf3a 100755 > plugin_option= > plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" > for plugin in $plugin_names; do > -@@ -5759,8 +6011,10 @@ for plugin in $plugin_names; do > +@@ -5783,8 +6035,10 @@ for plugin in $plugin_names; do > done > > if test -n "$ac_tool_prefix"; then > @@ -4334,7 +4336,7 @@ index 12c16faefd9..11b5127bf3a 100755 > { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 > $as_echo_n "checking for $ac_word... " >&6; } > if ${ac_cv_prog_AR+:} false; then : > -@@ -5776,7 +6030,7 @@ do > +@@ -5800,7 +6054,7 @@ do > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > @@ -4343,7 +4345,7 @@ index 12c16faefd9..11b5127bf3a 100755 > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > fi > -@@ -5796,11 +6050,15 @@ $as_echo "no" >&6; } > +@@ -5820,11 +6074,15 @@ $as_echo "no" >&6; } > fi > > > @@ -4362,7 +4364,7 @@ index 12c16faefd9..11b5127bf3a 100755 > { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 > $as_echo_n "checking for $ac_word... " >&6; } > if ${ac_cv_prog_ac_ct_AR+:} false; then : > -@@ -5816,7 +6074,7 @@ do > +@@ -5840,7 +6098,7 @@ do > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > @@ -4371,7 +4373,7 @@ index 12c16faefd9..11b5127bf3a 100755 > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > fi > -@@ -5835,6 +6093,10 @@ else > +@@ -5859,6 +6117,10 @@ else > $as_echo "no" >&6; } > fi > > @@ -4382,7 +4384,7 @@ index 12c16faefd9..11b5127bf3a 100755 > if test "x$ac_ct_AR" = x; then > AR="false" > else > -@@ -5846,29 +6108,81 @@ ac_tool_warned=yes ;; > +@@ -5870,29 +6132,81 @@ ac_tool_warned=yes ;; > esac > AR=$ac_ct_AR > fi > @@ -4479,7 +4481,7 @@ index 12c16faefd9..11b5127bf3a 100755 > > > > -@@ -6215,8 +6529,8 @@ esac > +@@ -6239,8 +6553,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 > @@ -4490,7 +4492,7 @@ index 12c16faefd9..11b5127bf3a 100755 > > # Handle CRLF in mingw tool chain > opt_cr= > -@@ -6252,6 +6566,7 @@ for ac_symprfx in "" "_"; do > +@@ -6276,6 +6590,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 > @@ -4498,7 +4500,7 @@ index 12c16faefd9..11b5127bf3a 100755 > > # Check to see that the pipe works correctly. > pipe_works=no > -@@ -6293,6 +6608,18 @@ _LT_EOF > +@@ -6317,6 +6632,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 > @@ -4517,7 +4519,7 @@ index 12c16faefd9..11b5127bf3a 100755 > #ifdef __cplusplus > extern "C" { > #endif > -@@ -6304,7 +6631,7 @@ _LT_EOF > +@@ -6328,7 +6655,7 @@ _LT_EOF > cat <<_LT_EOF >> conftest.$ac_ext > > /* The mapping between symbol names and symbols. */ > @@ -4526,7 +4528,7 @@ index 12c16faefd9..11b5127bf3a 100755 > const char *name; > void *address; > } > -@@ -6330,8 +6657,8 @@ static const void *lt_preloaded_setup() { > +@@ -6354,8 +6681,8 @@ static const void *lt_preloaded_setup() { > _LT_EOF > # Now try linking the two files. > mv conftest.$ac_objext conftstm.$ac_objext > @@ -4537,7 +4539,7 @@ index 12c16faefd9..11b5127bf3a 100755 > LIBS="conftstm.$ac_objext" > CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" > if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 > -@@ -6341,8 +6668,8 @@ _LT_EOF > +@@ -6365,8 +6692,8 @@ _LT_EOF > test $ac_status = 0; } && test -s conftest${ac_exeext}; then > pipe_works=yes > fi > @@ -4548,7 +4550,7 @@ index 12c16faefd9..11b5127bf3a 100755 > else > echo "cannot find nm_test_func in $nlist" >&5 > fi > -@@ -6379,6 +6706,19 @@ else > +@@ -6403,6 +6730,19 @@ else > $as_echo "ok" >&6; } > fi > > @@ -4568,7 +4570,7 @@ index 12c16faefd9..11b5127bf3a 100755 > > > > -@@ -6395,6 +6735,42 @@ fi > +@@ -6419,6 +6759,42 @@ fi > > > > @@ -4611,7 +4613,7 @@ index 12c16faefd9..11b5127bf3a 100755 > > > > -@@ -6606,6 +6982,123 @@ esac > +@@ -6630,6 +7006,123 @@ esac > > need_locks="$enable_libtool_lock" > > @@ -4735,7 +4737,7 @@ index 12c16faefd9..11b5127bf3a 100755 > > case $host_os in > rhapsody* | darwin*) > -@@ -7169,6 +7662,8 @@ _LT_EOF > +@@ -7193,6 +7686,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 > @@ -4744,7 +4746,7 @@ index 12c16faefd9..11b5127bf3a 100755 > cat > conftest.c << _LT_EOF > int main() { return 0;} > _LT_EOF > -@@ -7751,8 +8246,6 @@ fi > +@@ -7775,8 +8270,6 @@ fi > lt_prog_compiler_pic= > lt_prog_compiler_static= > > @@ -4753,7 +4755,7 @@ index 12c16faefd9..11b5127bf3a 100755 > > if test "$GCC" = yes; then > lt_prog_compiler_wl='-Wl,' > -@@ -7918,6 +8411,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > +@@ -7942,6 +8435,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > lt_prog_compiler_pic='--shared' > lt_prog_compiler_static='--static' > ;; > @@ -4766,7 +4768,7 @@ index 12c16faefd9..11b5127bf3a 100755 > pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) > # Portland Group compilers (*not* the Pentium gcc compiler, > # which looks to be a dead project) > -@@ -7980,7 +8479,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > +@@ -8004,7 +8503,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 > @@ -4775,7 +4777,7 @@ index 12c16faefd9..11b5127bf3a 100755 > lt_prog_compiler_wl='-Qoption ld ';; > *) > lt_prog_compiler_wl='-Wl,';; > -@@ -8037,13 +8536,17 @@ case $host_os in > +@@ -8061,13 +8560,17 @@ case $host_os in > lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" > ;; > esac > @@ -4799,7 +4801,7 @@ index 12c16faefd9..11b5127bf3a 100755 > > # > # Check to make sure the PIC flag actually works. > -@@ -8104,6 +8607,11 @@ fi > +@@ -8128,6 +8631,11 @@ fi > > > > @@ -4811,7 +4813,7 @@ index 12c16faefd9..11b5127bf3a 100755 > # > # Check to make sure the static flag actually works. > # > -@@ -8454,7 +8962,8 @@ _LT_EOF > +@@ -8478,7 +8986,8 @@ _LT_EOF > allow_undefined_flag=unsupported > always_export_symbols=no > enable_shared_with_static_runtimes=yes > @@ -4821,7 +4823,7 @@ index 12c16faefd9..11b5127bf3a 100755 > > 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' > -@@ -8553,12 +9062,12 @@ _LT_EOF > +@@ -8577,12 +9086,12 @@ _LT_EOF > whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' > hardcode_libdir_flag_spec= > hardcode_libdir_flag_spec_ld='-rpath $libdir' > @@ -4836,7 +4838,7 @@ index 12c16faefd9..11b5127bf3a 100755 > fi > ;; > esac > -@@ -8572,8 +9081,8 @@ _LT_EOF > +@@ -8596,8 +9105,8 @@ _LT_EOF > archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' > wlarc= > else > @@ -4847,7 +4849,7 @@ index 12c16faefd9..11b5127bf3a 100755 > fi > ;; > > -@@ -8591,8 +9100,8 @@ _LT_EOF > +@@ -8615,8 +9124,8 @@ _LT_EOF > > _LT_EOF > elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then > @@ -4858,7 +4860,7 @@ index 12c16faefd9..11b5127bf3a 100755 > else > ld_shlibs=no > fi > -@@ -8638,8 +9147,8 @@ _LT_EOF > +@@ -8662,8 +9171,8 @@ _LT_EOF > > *) > if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then > @@ -4869,7 +4871,7 @@ index 12c16faefd9..11b5127bf3a 100755 > else > ld_shlibs=no > fi > -@@ -8769,7 +9278,13 @@ _LT_EOF > +@@ -8793,7 +9302,13 @@ _LT_EOF > allow_undefined_flag='-berok' > # Determine the default libpath from the value encoded in an > # empty executable. > @@ -4884,7 +4886,7 @@ index 12c16faefd9..11b5127bf3a 100755 > /* end confdefs.h. */ > > int > -@@ -8782,22 +9297,29 @@ main () > +@@ -8806,22 +9321,29 @@ main () > _ACEOF > if ac_fn_c_try_link "$LINENO"; then : > > @@ -4927,7 +4929,7 @@ index 12c16faefd9..11b5127bf3a 100755 > > 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" > -@@ -8809,7 +9331,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -8833,7 +9355,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. > @@ -4942,7 +4944,7 @@ index 12c16faefd9..11b5127bf3a 100755 > /* end confdefs.h. */ > > int > -@@ -8822,22 +9350,29 @@ main () > +@@ -8846,22 +9374,29 @@ main () > _ACEOF > if ac_fn_c_try_link "$LINENO"; then : > > @@ -4985,7 +4987,7 @@ index 12c16faefd9..11b5127bf3a 100755 > > hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" > # Warning - without using the other run time loading flags, > -@@ -8882,20 +9417,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -8906,20 +9441,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. > @@ -5063,7 +5065,7 @@ index 12c16faefd9..11b5127bf3a 100755 > ;; > > darwin* | rhapsody*) > -@@ -8956,7 +9534,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -8980,7 +9558,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*) > @@ -5072,7 +5074,7 @@ index 12c16faefd9..11b5127bf3a 100755 > hardcode_libdir_flag_spec='-R$libdir' > hardcode_direct=yes > hardcode_shlibpath_var=no > -@@ -8964,7 +9542,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -8988,7 +9566,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > hpux9*) > if test "$GCC" = yes; then > @@ -5081,7 +5083,7 @@ index 12c16faefd9..11b5127bf3a 100755 > 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 > -@@ -8980,7 +9558,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9004,7 +9582,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > hpux10*) > if test "$GCC" = yes && test "$with_gnu_ld" = no; then > @@ -5090,7 +5092,7 @@ index 12c16faefd9..11b5127bf3a 100755 > else > archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' > fi > -@@ -9004,10 +9582,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9028,10 +9606,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*) > @@ -5103,7 +5105,7 @@ index 12c16faefd9..11b5127bf3a 100755 > ;; > esac > else > -@@ -9086,23 +9664,36 @@ fi > +@@ -9110,23 +9688,36 @@ fi > > irix5* | irix6* | nonstopux*) > if test "$GCC" = yes; then > @@ -5148,7 +5150,7 @@ index 12c16faefd9..11b5127bf3a 100755 > 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' > -@@ -9187,7 +9778,7 @@ rm -f core conftest.err conftest.$ac_objext \ > +@@ -9211,7 +9802,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}\*' > @@ -5157,7 +5159,7 @@ index 12c16faefd9..11b5127bf3a 100755 > hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' > else > allow_undefined_flag=' -expect_unresolved \*' > -@@ -9206,9 +9797,9 @@ rm -f core conftest.err conftest.$ac_objext \ > +@@ -9230,9 +9821,9 @@ rm -f core conftest.err conftest.$ac_objext \ > no_undefined_flag=' -z defs' > if test "$GCC" = yes; then > wlarc='${wl}' > @@ -5169,7 +5171,7 @@ index 12c16faefd9..11b5127bf3a 100755 > else > case `$CC -V 2>&1` in > *"Compilers 5.0"*) > -@@ -9784,8 +10375,9 @@ cygwin* | mingw* | pw32* | cegcc*) > +@@ -9808,8 +10399,9 @@ cygwin* | mingw* | pw32* | cegcc*) > need_version=no > need_lib_prefix=no > > @@ -5181,7 +5183,7 @@ index 12c16faefd9..11b5127bf3a 100755 > library_names_spec='$libname.dll.a' > # DLL is installed to $(libdir)/../bin by postinstall_cmds > postinstall_cmds='base_file=`basename \${file}`~ > -@@ -9818,13 +10410,71 @@ cygwin* | mingw* | pw32* | cegcc*) > +@@ -9842,13 +10434,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 > @@ -5254,16 +5256,16 @@ index 12c16faefd9..11b5127bf3a 100755 > # FIXME: first we should search . and the directory the executable is in > shlibpath_var=PATH > ;; > -@@ -10702,7 +11352,7 @@ else > +@@ -10726,7 +11376,7 @@ else > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF > --#line 10705 "configure" > +-#line 10729 "configure" > +#line $LINENO "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > -@@ -10746,10 +11396,10 @@ else > +@@ -10770,10 +11420,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)) > @@ -5276,16 +5278,16 @@ index 12c16faefd9..11b5127bf3a 100755 > int main () > { > void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > -@@ -10808,7 +11458,7 @@ else > +@@ -10832,7 +11482,7 @@ else > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF > --#line 10811 "configure" > +-#line 10835 "configure" > +#line $LINENO "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > -@@ -10852,10 +11502,10 @@ else > +@@ -10876,10 +11526,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)) > @@ -5298,7 +5300,7 @@ index 12c16faefd9..11b5127bf3a 100755 > int main () > { > void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > -@@ -14834,13 +15484,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' > +@@ -15133,13 +15783,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"`' > @@ -5319,7 +5321,7 @@ index 12c16faefd9..11b5127bf3a 100755 > 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"`' > -@@ -14855,14 +15512,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de > +@@ -15154,14 +15811,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"`' > @@ -5338,7 +5340,7 @@ index 12c16faefd9..11b5127bf3a 100755 > DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' > NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' > LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' > -@@ -14895,12 +15555,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q > +@@ -15194,12 +15854,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"`' > @@ -5352,7 +5354,7 @@ index 12c16faefd9..11b5127bf3a 100755 > 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"`' > -@@ -14955,8 +15615,13 @@ reload_flag \ > +@@ -15254,8 +15914,13 @@ reload_flag \ > OBJDUMP \ > deplibs_check_method \ > file_magic_cmd \ > @@ -5366,7 +5368,7 @@ index 12c16faefd9..11b5127bf3a 100755 > STRIP \ > RANLIB \ > CC \ > -@@ -14966,12 +15631,14 @@ lt_cv_sys_global_symbol_pipe \ > +@@ -15265,12 +15930,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 \ > @@ -5382,7 +5384,7 @@ index 12c16faefd9..11b5127bf3a 100755 > DSYMUTIL \ > NMEDIT \ > LIPO \ > -@@ -14987,7 +15654,6 @@ no_undefined_flag \ > +@@ -15286,7 +15953,6 @@ no_undefined_flag \ > hardcode_libdir_flag_spec \ > hardcode_libdir_flag_spec_ld \ > hardcode_libdir_separator \ > @@ -5390,7 +5392,7 @@ index 12c16faefd9..11b5127bf3a 100755 > exclude_expsyms \ > include_expsyms \ > file_list_spec \ > -@@ -15023,6 +15689,7 @@ module_cmds \ > +@@ -15322,6 +15988,7 @@ module_cmds \ > module_expsym_cmds \ > export_symbols_cmds \ > prelink_cmds \ > @@ -5398,7 +5400,7 @@ index 12c16faefd9..11b5127bf3a 100755 > postinstall_cmds \ > postuninstall_cmds \ > finish_cmds \ > -@@ -15795,7 +16462,8 @@ $as_echo X"$file" | > +@@ -16094,7 +16761,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, > @@ -5408,7 +5410,7 @@ index 12c16faefd9..11b5127bf3a 100755 > # Written by Gordon Matzigkeit, 1996 > # > # This file is part of GNU Libtool. > -@@ -15898,19 +16566,42 @@ SP2NL=$lt_lt_SP2NL > +@@ -16197,19 +16865,42 @@ SP2NL=$lt_lt_SP2NL > # turn newlines into spaces. > NL2SP=$lt_lt_NL2SP > > @@ -5452,7 +5454,7 @@ index 12c16faefd9..11b5127bf3a 100755 > # A symbol stripping program. > STRIP=$lt_STRIP > > -@@ -15940,6 +16631,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address > +@@ -16239,6 +16930,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 > > @@ -5465,7 +5467,7 @@ index 12c16faefd9..11b5127bf3a 100755 > # The name of the directory that contains temporary libtool files. > objdir=$objdir > > -@@ -15949,6 +16646,9 @@ MAGIC_CMD=$MAGIC_CMD > +@@ -16248,6 +16945,9 @@ MAGIC_CMD=$MAGIC_CMD > # Must we lock files when doing compilation? > need_locks=$lt_need_locks > > @@ -5475,7 +5477,7 @@ index 12c16faefd9..11b5127bf3a 100755 > # Tool to manipulate archived DWARF debug symbol files on Mac OS X. > DSYMUTIL=$lt_DSYMUTIL > > -@@ -16063,12 +16763,12 @@ with_gcc=$GCC > +@@ -16362,12 +17062,12 @@ with_gcc=$GCC > # Compiler flag to turn off builtin functions. > no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag > > @@ -5491,7 +5493,7 @@ index 12c16faefd9..11b5127bf3a 100755 > # Compiler flag to prevent dynamic linking. > link_static_flag=$lt_lt_prog_compiler_static > > -@@ -16155,9 +16855,6 @@ inherit_rpath=$inherit_rpath > +@@ -16454,9 +17154,6 @@ inherit_rpath=$inherit_rpath > # Whether libtool must link a program against all its dependency libraries. > link_all_deplibs=$link_all_deplibs > > @@ -5501,7 +5503,7 @@ index 12c16faefd9..11b5127bf3a 100755 > # Set to "yes" if exported symbols are required. > always_export_symbols=$always_export_symbols > > -@@ -16173,6 +16870,9 @@ include_expsyms=$lt_include_expsyms > +@@ -16472,6 +17169,9 @@ include_expsyms=$lt_include_expsyms > # Commands necessary for linking programs (against libraries) with templates. > prelink_cmds=$lt_prelink_cmds > > @@ -5511,7 +5513,7 @@ index 12c16faefd9..11b5127bf3a 100755 > # Specify filename containing input files. > file_list_spec=$lt_file_list_spec > > -@@ -16205,210 +16905,169 @@ ltmain="$ac_aux_dir/ltmain.sh" > +@@ -16504,210 +17204,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? > @@ -5885,20 +5887,8 @@ index 12c16faefd9..11b5127bf3a 100755 > (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") > chmod +x "$ofile" > > -diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in > -index bdceff3b56a..6aadae41031 100644 > ---- a/gdbsupport/Makefile.in > -+++ b/gdbsupport/Makefile.in > -@@ -233,6 +233,7 @@ CATOBJEXT = @CATOBJEXT@ > - CC = @CC@ > - CCDEPMODE = @CCDEPMODE@ > - CFLAGS = @CFLAGS@ > -+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ > - CPP = @CPP@ > - CPPFLAGS = @CPPFLAGS@ > - CXX = @CXX@ > diff --git a/gprof/Makefile.in b/gprof/Makefile.in > -index 5ef5ece74a9..9d7ce8b62b2 100644 > +index c9914e46d7d..1857eb8b5a8 100644 > --- a/gprof/Makefile.in > +++ b/gprof/Makefile.in > @@ -321,6 +321,7 @@ CYGPATH_W = @CYGPATH_W@ > @@ -5926,7 +5916,7 @@ index 5ef5ece74a9..9d7ce8b62b2 100644 > ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ > am__include = @am__include@ > diff --git a/gprof/configure b/gprof/configure > -index 5a59f1c1d0e..2506887d3b0 100755 > +index 3e8edd112cb..5b320c60f50 100755 > --- a/gprof/configure > +++ b/gprof/configure > @@ -663,8 +663,11 @@ OTOOL > @@ -7252,7 +7242,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 > int main () > { > void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > -@@ -12777,13 +13427,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' > +@@ -12795,13 +13445,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"`' > @@ -7273,7 +7263,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 > 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"`' > -@@ -12798,14 +13455,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de > +@@ -12816,14 +13473,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"`' > @@ -7292,7 +7282,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 > DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' > NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' > LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' > -@@ -12838,12 +13498,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q > +@@ -12856,12 +13516,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"`' > @@ -7306,7 +7296,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 > 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"`' > -@@ -12898,8 +13558,13 @@ reload_flag \ > +@@ -12916,8 +13576,13 @@ reload_flag \ > OBJDUMP \ > deplibs_check_method \ > file_magic_cmd \ > @@ -7320,7 +7310,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 > STRIP \ > RANLIB \ > CC \ > -@@ -12909,12 +13574,14 @@ lt_cv_sys_global_symbol_pipe \ > +@@ -12927,12 +13592,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 \ > @@ -7336,7 +7326,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 > DSYMUTIL \ > NMEDIT \ > LIPO \ > -@@ -12930,7 +13597,6 @@ no_undefined_flag \ > +@@ -12948,7 +13615,6 @@ no_undefined_flag \ > hardcode_libdir_flag_spec \ > hardcode_libdir_flag_spec_ld \ > hardcode_libdir_separator \ > @@ -7344,7 +7334,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 > exclude_expsyms \ > include_expsyms \ > file_list_spec \ > -@@ -12966,6 +13632,7 @@ module_cmds \ > +@@ -12984,6 +13650,7 @@ module_cmds \ > module_expsym_cmds \ > export_symbols_cmds \ > prelink_cmds \ > @@ -7352,7 +7342,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 > postinstall_cmds \ > postuninstall_cmds \ > finish_cmds \ > -@@ -13731,7 +14398,8 @@ $as_echo X"$file" | > +@@ -13749,7 +14416,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, > @@ -7362,7 +7352,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 > # Written by Gordon Matzigkeit, 1996 > # > # This file is part of GNU Libtool. > -@@ -13834,19 +14502,42 @@ SP2NL=$lt_lt_SP2NL > +@@ -13852,19 +14520,42 @@ SP2NL=$lt_lt_SP2NL > # turn newlines into spaces. > NL2SP=$lt_lt_NL2SP > > @@ -7406,7 +7396,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 > # A symbol stripping program. > STRIP=$lt_STRIP > > -@@ -13876,6 +14567,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address > +@@ -13894,6 +14585,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 > > @@ -7419,7 +7409,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 > # The name of the directory that contains temporary libtool files. > objdir=$objdir > > -@@ -13885,6 +14582,9 @@ MAGIC_CMD=$MAGIC_CMD > +@@ -13903,6 +14600,9 @@ MAGIC_CMD=$MAGIC_CMD > # Must we lock files when doing compilation? > need_locks=$lt_need_locks > > @@ -7429,7 +7419,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 > # Tool to manipulate archived DWARF debug symbol files on Mac OS X. > DSYMUTIL=$lt_DSYMUTIL > > -@@ -13999,12 +14699,12 @@ with_gcc=$GCC > +@@ -14017,12 +14717,12 @@ with_gcc=$GCC > # Compiler flag to turn off builtin functions. > no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag > > @@ -7445,7 +7435,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 > # Compiler flag to prevent dynamic linking. > link_static_flag=$lt_lt_prog_compiler_static > > -@@ -14091,9 +14791,6 @@ inherit_rpath=$inherit_rpath > +@@ -14109,9 +14809,6 @@ inherit_rpath=$inherit_rpath > # Whether libtool must link a program against all its dependency libraries. > link_all_deplibs=$link_all_deplibs > > @@ -7455,7 +7445,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 > # Set to "yes" if exported symbols are required. > always_export_symbols=$always_export_symbols > > -@@ -14109,6 +14806,9 @@ include_expsyms=$lt_include_expsyms > +@@ -14127,6 +14824,9 @@ include_expsyms=$lt_include_expsyms > # Commands necessary for linking programs (against libraries) with templates. > prelink_cmds=$lt_prelink_cmds > > @@ -7465,7 +7455,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 > # Specify filename containing input files. > file_list_spec=$lt_file_list_spec > > -@@ -14141,210 +14841,169 @@ ltmain="$ac_aux_dir/ltmain.sh" > +@@ -14159,210 +14859,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? > @@ -7840,7 +7830,7 @@ index 5a59f1c1d0e..2506887d3b0 100755 > chmod +x "$ofile" > > diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in > -index fd5279b4df1..6e74c7b302a 100644 > +index 01f7dca3f2a..3db326271c9 100644 > --- a/gprofng/Makefile.in > +++ b/gprofng/Makefile.in > @@ -253,6 +253,7 @@ CXXFLAGS = @CXXFLAGS@ > @@ -7860,7 +7850,7 @@ index fd5279b4df1..6e74c7b302a 100644 > NM = @NM@ > NMEDIT = @NMEDIT@ > diff --git a/gprofng/configure b/gprofng/configure > -index ac14d126ac0..f8d7685a72e 100755 > +index 2afc9a381a6..1e57b41ffa4 100755 > --- a/gprofng/configure > +++ b/gprofng/configure > @@ -672,6 +672,8 @@ OTOOL > @@ -9782,7 +9772,7 @@ index ac14d126ac0..f8d7685a72e 100755 > LDCXX=$LD > LD=$lt_save_LD > GCC=$lt_save_GCC > -@@ -17663,13 +18493,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' > +@@ -17690,13 +18520,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"`' > @@ -9803,7 +9793,7 @@ index ac14d126ac0..f8d7685a72e 100755 > 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"`' > -@@ -17684,14 +18521,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de > +@@ -17711,14 +18548,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"`' > @@ -9822,7 +9812,7 @@ index ac14d126ac0..f8d7685a72e 100755 > DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' > NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' > LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' > -@@ -17724,12 +18564,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q > +@@ -17751,12 +18591,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"`' > @@ -9836,7 +9826,7 @@ index ac14d126ac0..f8d7685a72e 100755 > 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"`' > -@@ -17768,8 +18608,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote > +@@ -17795,8 +18635,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"`' > @@ -9846,7 +9836,7 @@ index ac14d126ac0..f8d7685a72e 100755 > 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"`' > -@@ -17796,12 +18636,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ > +@@ -17823,12 +18663,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"`' > @@ -9860,7 +9850,7 @@ index ac14d126ac0..f8d7685a72e 100755 > 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"`' > -@@ -17839,8 +18679,13 @@ reload_flag \ > +@@ -17866,8 +18706,13 @@ reload_flag \ > OBJDUMP \ > deplibs_check_method \ > file_magic_cmd \ > @@ -9874,7 +9864,7 @@ index ac14d126ac0..f8d7685a72e 100755 > STRIP \ > RANLIB \ > CC \ > -@@ -17850,12 +18695,14 @@ lt_cv_sys_global_symbol_pipe \ > +@@ -17877,12 +18722,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 \ > @@ -9890,7 +9880,7 @@ index ac14d126ac0..f8d7685a72e 100755 > DSYMUTIL \ > NMEDIT \ > LIPO \ > -@@ -17871,7 +18718,6 @@ no_undefined_flag \ > +@@ -17898,7 +18745,6 @@ no_undefined_flag \ > hardcode_libdir_flag_spec \ > hardcode_libdir_flag_spec_ld \ > hardcode_libdir_separator \ > @@ -9898,7 +9888,7 @@ index ac14d126ac0..f8d7685a72e 100755 > exclude_expsyms \ > include_expsyms \ > file_list_spec \ > -@@ -17893,8 +18739,8 @@ LD_CXX \ > +@@ -17920,8 +18766,8 @@ LD_CXX \ > reload_flag_CXX \ > compiler_CXX \ > lt_prog_compiler_no_builtin_flag_CXX \ > @@ -9908,7 +9898,7 @@ index ac14d126ac0..f8d7685a72e 100755 > lt_prog_compiler_static_CXX \ > lt_cv_prog_compiler_c_o_CXX \ > export_dynamic_flag_spec_CXX \ > -@@ -17906,7 +18752,6 @@ no_undefined_flag_CXX \ > +@@ -17933,7 +18779,6 @@ no_undefined_flag_CXX \ > hardcode_libdir_flag_spec_CXX \ > hardcode_libdir_flag_spec_ld_CXX \ > hardcode_libdir_separator_CXX \ > @@ -9916,7 +9906,7 @@ index ac14d126ac0..f8d7685a72e 100755 > exclude_expsyms_CXX \ > include_expsyms_CXX \ > file_list_spec_CXX \ > -@@ -17940,6 +18785,7 @@ module_cmds \ > +@@ -17967,6 +18812,7 @@ module_cmds \ > module_expsym_cmds \ > export_symbols_cmds \ > prelink_cmds \ > @@ -9924,7 +9914,7 @@ index ac14d126ac0..f8d7685a72e 100755 > postinstall_cmds \ > postuninstall_cmds \ > finish_cmds \ > -@@ -17954,7 +18800,8 @@ archive_expsym_cmds_CXX \ > +@@ -17981,7 +18827,8 @@ archive_expsym_cmds_CXX \ > module_cmds_CXX \ > module_expsym_cmds_CXX \ > export_symbols_cmds_CXX \ > @@ -9934,7 +9924,7 @@ index ac14d126ac0..f8d7685a72e 100755 > case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in > *[\\\\\\\`\\"\\\$]*) > eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" > -@@ -18711,7 +19558,8 @@ $as_echo X"$file" | > +@@ -18738,7 +19585,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, > @@ -9944,7 +9934,7 @@ index ac14d126ac0..f8d7685a72e 100755 > # Written by Gordon Matzigkeit, 1996 > # > # This file is part of GNU Libtool. > -@@ -18814,19 +19662,42 @@ SP2NL=$lt_lt_SP2NL > +@@ -18841,19 +19689,42 @@ SP2NL=$lt_lt_SP2NL > # turn newlines into spaces. > NL2SP=$lt_lt_NL2SP > > @@ -9988,7 +9978,7 @@ index ac14d126ac0..f8d7685a72e 100755 > # A symbol stripping program. > STRIP=$lt_STRIP > > -@@ -18856,6 +19727,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address > +@@ -18883,6 +19754,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 > > @@ -10001,7 +9991,7 @@ index ac14d126ac0..f8d7685a72e 100755 > # The name of the directory that contains temporary libtool files. > objdir=$objdir > > -@@ -18865,6 +19742,9 @@ MAGIC_CMD=$MAGIC_CMD > +@@ -18892,6 +19769,9 @@ MAGIC_CMD=$MAGIC_CMD > # Must we lock files when doing compilation? > need_locks=$lt_need_locks > > @@ -10011,7 +10001,7 @@ index ac14d126ac0..f8d7685a72e 100755 > # Tool to manipulate archived DWARF debug symbol files on Mac OS X. > DSYMUTIL=$lt_DSYMUTIL > > -@@ -18979,12 +19859,12 @@ with_gcc=$GCC > +@@ -19006,12 +19886,12 @@ with_gcc=$GCC > # Compiler flag to turn off builtin functions. > no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag > > @@ -10027,7 +10017,7 @@ index ac14d126ac0..f8d7685a72e 100755 > # Compiler flag to prevent dynamic linking. > link_static_flag=$lt_lt_prog_compiler_static > > -@@ -19071,9 +19951,6 @@ inherit_rpath=$inherit_rpath > +@@ -19098,9 +19978,6 @@ inherit_rpath=$inherit_rpath > # Whether libtool must link a program against all its dependency libraries. > link_all_deplibs=$link_all_deplibs > > @@ -10037,7 +10027,7 @@ index ac14d126ac0..f8d7685a72e 100755 > # Set to "yes" if exported symbols are required. > always_export_symbols=$always_export_symbols > > -@@ -19089,6 +19966,9 @@ include_expsyms=$lt_include_expsyms > +@@ -19116,6 +19993,9 @@ include_expsyms=$lt_include_expsyms > # Commands necessary for linking programs (against libraries) with templates. > prelink_cmds=$lt_prelink_cmds > > @@ -10047,7 +10037,7 @@ index ac14d126ac0..f8d7685a72e 100755 > # Specify filename containing input files. > file_list_spec=$lt_file_list_spec > > -@@ -19135,210 +20015,169 @@ ltmain="$ac_aux_dir/ltmain.sh" > +@@ -19162,210 +20042,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? > @@ -10421,7 +10411,7 @@ index ac14d126ac0..f8d7685a72e 100755 > (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") > chmod +x "$ofile" > > -@@ -19366,12 +20205,12 @@ with_gcc=$GCC_CXX > +@@ -19393,12 +20232,12 @@ with_gcc=$GCC_CXX > # Compiler flag to turn off builtin functions. > no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX > > @@ -10437,7 +10427,7 @@ index ac14d126ac0..f8d7685a72e 100755 > # Compiler flag to prevent dynamic linking. > link_static_flag=$lt_lt_prog_compiler_static_CXX > > -@@ -19458,9 +20297,6 @@ inherit_rpath=$inherit_rpath_CXX > +@@ -19485,9 +20324,6 @@ inherit_rpath=$inherit_rpath_CXX > # Whether libtool must link a program against all its dependency libraries. > link_all_deplibs=$link_all_deplibs_CXX > > @@ -10447,7 +10437,7 @@ index ac14d126ac0..f8d7685a72e 100755 > # Set to "yes" if exported symbols are required. > always_export_symbols=$always_export_symbols_CXX > > -@@ -19476,6 +20312,9 @@ include_expsyms=$lt_include_expsyms_CXX > +@@ -19503,6 +20339,9 @@ include_expsyms=$lt_include_expsyms_CXX > # Commands necessary for linking programs (against libraries) with templates. > prelink_cmds=$lt_prelink_cmds_CXX > > @@ -10458,7 +10448,7 @@ index ac14d126ac0..f8d7685a72e 100755 > file_list_spec=$lt_file_list_spec_CXX > > diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in > -index 4050586f6a8..394469e3768 100644 > +index a45018334e8..4c30941c6b6 100644 > --- a/gprofng/doc/Makefile.in > +++ b/gprofng/doc/Makefile.in > @@ -237,6 +237,7 @@ CXXFLAGS = @CXXFLAGS@ > @@ -10478,7 +10468,7 @@ index 4050586f6a8..394469e3768 100644 > NM = @NM@ > NMEDIT = @NMEDIT@ > diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in > -index 1206a79d3f0..2f763e5f760 100644 > +index 42886f7c645..b7e31ded46a 100644 > --- a/gprofng/gp-display-html/Makefile.in > +++ b/gprofng/gp-display-html/Makefile.in > @@ -200,6 +200,7 @@ CXXFLAGS = @CXXFLAGS@ > @@ -10498,7 +10488,7 @@ index 1206a79d3f0..2f763e5f760 100644 > NM = @NM@ > NMEDIT = @NMEDIT@ > diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in > -index 9372c6dea78..0cf4f58c0ec 100644 > +index eef61ba85f7..0eb1521b704 100644 > --- a/gprofng/libcollector/Makefile.in > +++ b/gprofng/libcollector/Makefile.in > @@ -316,6 +316,7 @@ CXXFLAGS = @CXXFLAGS@ > @@ -10518,7 +10508,7 @@ index 9372c6dea78..0cf4f58c0ec 100644 > NM = @NM@ > NMEDIT = @NMEDIT@ > diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure > -index ec38721ced2..d9daed11e3f 100755 > +index e92fbfc2242..09e93f878ae 100755 > --- a/gprofng/libcollector/configure > +++ b/gprofng/libcollector/configure > @@ -641,6 +641,8 @@ OTOOL > @@ -13118,7 +13108,7 @@ index ec38721ced2..d9daed11e3f 100755 > file_list_spec=$lt_file_list_spec_CXX > > diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in > -index ba7fdd6e8ad..3a0fc5dbbe7 100644 > +index 4274762334e..74ab09d7661 100644 > --- a/gprofng/src/Makefile.in > +++ b/gprofng/src/Makefile.in > @@ -324,6 +324,7 @@ CXXFLAGS = @CXXFLAGS@ > @@ -13138,10 +13128,10 @@ index ba7fdd6e8ad..3a0fc5dbbe7 100644 > NM = @NM@ > NMEDIT = @NMEDIT@ > diff --git a/ld/Makefile.in b/ld/Makefile.in > -index 782d4017a60..71bbe487aef 100644 > +index 0405028e02f..bd18a0a9e55 100644 > --- a/ld/Makefile.in > +++ b/ld/Makefile.in > -@@ -383,6 +383,7 @@ CYGPATH_W = @CYGPATH_W@ > +@@ -384,6 +384,7 @@ CYGPATH_W = @CYGPATH_W@ > DATADIRNAME = @DATADIRNAME@ > DEFS = @DEFS@ > DEPDIR = @DEPDIR@ > @@ -13149,7 +13139,7 @@ index 782d4017a60..71bbe487aef 100644 > DSYMUTIL = @DSYMUTIL@ > DUMPBIN = @DUMPBIN@ > ECHO_C = @ECHO_C@ > -@@ -433,6 +434,7 @@ LN_S = @LN_S@ > +@@ -434,6 +435,7 @@ LN_S = @LN_S@ > LTLIBOBJS = @LTLIBOBJS@ > MAINT = @MAINT@ > MAKEINFO = @MAKEINFO@ > @@ -13157,7 +13147,7 @@ index 782d4017a60..71bbe487aef 100644 > MKDIR_P = @MKDIR_P@ > MKINSTALLDIRS = @MKINSTALLDIRS@ > MSGFMT = @MSGFMT@ > -@@ -481,6 +483,7 @@ abs_builddir = @abs_builddir@ > +@@ -485,6 +487,7 @@ abs_builddir = @abs_builddir@ > abs_srcdir = @abs_srcdir@ > abs_top_builddir = @abs_top_builddir@ > abs_top_srcdir = @abs_top_srcdir@ > @@ -13166,7 +13156,7 @@ index 782d4017a60..71bbe487aef 100644 > ac_ct_CXX = @ac_ct_CXX@ > ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ > diff --git a/ld/configure b/ld/configure > -index d0a467ac101..45b20013a45 100755 > +index 5f5dad6d67c..18150633570 100755 > --- a/ld/configure > +++ b/ld/configure > @@ -700,8 +700,11 @@ OTOOL > @@ -13181,7 +13171,7 @@ index d0a467ac101..45b20013a45 100755 > OBJDUMP > LN_S > NM > -@@ -828,6 +831,7 @@ enable_static > +@@ -831,6 +834,7 @@ enable_static > with_pic > enable_fast_install > with_gnu_ld > @@ -13189,7 +13179,7 @@ index d0a467ac101..45b20013a45 100755 > enable_libtool_lock > enable_plugins > enable_largefile > -@@ -1552,6 +1556,8 @@ Optional Packages: > +@@ -1562,6 +1566,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] > @@ -13198,7 +13188,7 @@ index d0a467ac101..45b20013a45 100755 > --with-lib-path=dir1:dir2... set default LIB_PATH > --with-sysroot=DIR Search for usr/lib et al within DIR. > --with-system-zlib use installed libz > -@@ -5399,8 +5405,8 @@ esac > +@@ -5533,8 +5539,8 @@ esac > > > > @@ -13209,7 +13199,7 @@ index d0a467ac101..45b20013a45 100755 > > > > -@@ -5440,7 +5446,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO > +@@ -5574,7 +5580,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. > @@ -13218,7 +13208,7 @@ index d0a467ac101..45b20013a45 100755 > 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 > -@@ -6133,8 +6139,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; > +@@ -6267,8 +6273,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" > @@ -13229,7 +13219,7 @@ index d0a467ac101..45b20013a45 100755 > && eval 'test $(( 1 + 1 )) -eq 2 \ > && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ > && xsi_shell=yes > -@@ -6183,6 +6189,80 @@ esac > +@@ -6317,6 +6323,80 @@ esac > > > > @@ -13310,7 +13300,7 @@ index d0a467ac101..45b20013a45 100755 > { $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 ${lt_cv_ld_reload_flag+:} false; then : > -@@ -6199,6 +6279,11 @@ case $reload_flag in > +@@ -6333,6 +6413,11 @@ case $reload_flag in > esac > reload_cmds='$LD$reload_flag -o $output$reload_objs' > case $host_os in > @@ -13322,7 +13312,7 @@ index d0a467ac101..45b20013a45 100755 > darwin*) > if test "$GCC" = yes; then > reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' > -@@ -6367,7 +6452,8 @@ mingw* | pw32*) > +@@ -6501,7 +6586,8 @@ mingw* | pw32*) > lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' > lt_cv_file_magic_cmd='func_win32_libid' > else > @@ -13332,7 +13322,7 @@ index d0a467ac101..45b20013a45 100755 > lt_cv_file_magic_cmd='$OBJDUMP -f' > fi > ;; > -@@ -6521,6 +6607,21 @@ esac > +@@ -6655,6 +6741,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; } > @@ -13354,7 +13344,7 @@ index d0a467ac101..45b20013a45 100755 > 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 > -@@ -6536,6 +6637,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown > +@@ -6670,6 +6771,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown > > > > @@ -13512,7 +13502,7 @@ index d0a467ac101..45b20013a45 100755 > plugin_option= > plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" > for plugin in $plugin_names; do > -@@ -6550,8 +6802,10 @@ for plugin in $plugin_names; do > +@@ -6684,8 +6936,10 @@ for plugin in $plugin_names; do > done > > if test -n "$ac_tool_prefix"; then > @@ -13525,7 +13515,7 @@ index d0a467ac101..45b20013a45 100755 > { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 > $as_echo_n "checking for $ac_word... " >&6; } > if ${ac_cv_prog_AR+:} false; then : > -@@ -6567,7 +6821,7 @@ do > +@@ -6701,7 +6955,7 @@ do > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > @@ -13534,7 +13524,7 @@ index d0a467ac101..45b20013a45 100755 > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > fi > -@@ -6587,11 +6841,15 @@ $as_echo "no" >&6; } > +@@ -6721,11 +6975,15 @@ $as_echo "no" >&6; } > fi > > > @@ -13553,7 +13543,7 @@ index d0a467ac101..45b20013a45 100755 > { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 > $as_echo_n "checking for $ac_word... " >&6; } > if ${ac_cv_prog_ac_ct_AR+:} false; then : > -@@ -6607,7 +6865,7 @@ do > +@@ -6741,7 +6999,7 @@ do > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > @@ -13562,7 +13552,7 @@ index d0a467ac101..45b20013a45 100755 > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > fi > -@@ -6626,6 +6884,10 @@ else > +@@ -6760,6 +7018,10 @@ else > $as_echo "no" >&6; } > fi > > @@ -13573,7 +13563,7 @@ index d0a467ac101..45b20013a45 100755 > if test "x$ac_ct_AR" = x; then > AR="false" > else > -@@ -6637,25 +6899,19 @@ ac_tool_warned=yes ;; > +@@ -6771,25 +7033,19 @@ ac_tool_warned=yes ;; > esac > AR=$ac_ct_AR > fi > @@ -13608,7 +13598,7 @@ index d0a467ac101..45b20013a45 100755 > > > > -@@ -6667,6 +6923,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru > +@@ -6801,6 +7057,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru > > > > @@ -13673,7 +13663,7 @@ index d0a467ac101..45b20013a45 100755 > 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 > -@@ -7006,8 +7320,8 @@ esac > +@@ -7140,8 +7454,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 > @@ -13684,7 +13674,7 @@ index d0a467ac101..45b20013a45 100755 > > # Handle CRLF in mingw tool chain > opt_cr= > -@@ -7043,6 +7357,7 @@ for ac_symprfx in "" "_"; do > +@@ -7177,6 +7491,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 > @@ -13692,7 +13682,7 @@ index d0a467ac101..45b20013a45 100755 > > # Check to see that the pipe works correctly. > pipe_works=no > -@@ -7084,6 +7399,18 @@ _LT_EOF > +@@ -7218,6 +7533,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 > @@ -13711,7 +13701,7 @@ index d0a467ac101..45b20013a45 100755 > #ifdef __cplusplus > extern "C" { > #endif > -@@ -7095,7 +7422,7 @@ _LT_EOF > +@@ -7229,7 +7556,7 @@ _LT_EOF > cat <<_LT_EOF >> conftest.$ac_ext > > /* The mapping between symbol names and symbols. */ > @@ -13720,7 +13710,7 @@ index d0a467ac101..45b20013a45 100755 > const char *name; > void *address; > } > -@@ -7121,8 +7448,8 @@ static const void *lt_preloaded_setup() { > +@@ -7255,8 +7582,8 @@ static const void *lt_preloaded_setup() { > _LT_EOF > # Now try linking the two files. > mv conftest.$ac_objext conftstm.$ac_objext > @@ -13731,7 +13721,7 @@ index d0a467ac101..45b20013a45 100755 > LIBS="conftstm.$ac_objext" > CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" > if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 > -@@ -7132,8 +7459,8 @@ _LT_EOF > +@@ -7266,8 +7593,8 @@ _LT_EOF > test $ac_status = 0; } && test -s conftest${ac_exeext}; then > pipe_works=yes > fi > @@ -13742,7 +13732,7 @@ index d0a467ac101..45b20013a45 100755 > else > echo "cannot find nm_test_func in $nlist" >&5 > fi > -@@ -7170,6 +7497,17 @@ else > +@@ -7304,6 +7631,17 @@ else > $as_echo "ok" >&6; } > fi > > @@ -13760,7 +13750,7 @@ index d0a467ac101..45b20013a45 100755 > > > > -@@ -7186,6 +7524,44 @@ fi > +@@ -7320,6 +7658,44 @@ fi > > > > @@ -13805,7 +13795,7 @@ index d0a467ac101..45b20013a45 100755 > > > > -@@ -7397,6 +7773,123 @@ esac > +@@ -7531,6 +7907,123 @@ esac > > need_locks="$enable_libtool_lock" > > @@ -13929,7 +13919,7 @@ index d0a467ac101..45b20013a45 100755 > > case $host_os in > rhapsody* | darwin*) > -@@ -7960,6 +8453,8 @@ _LT_EOF > +@@ -8094,6 +8587,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 > @@ -13938,7 +13928,7 @@ index d0a467ac101..45b20013a45 100755 > cat > conftest.c << _LT_EOF > int main() { return 0;} > _LT_EOF > -@@ -8028,6 +8523,16 @@ done > +@@ -8162,6 +8657,16 @@ done > > > > @@ -13955,7 +13945,7 @@ index d0a467ac101..45b20013a45 100755 > > > # Set options > -@@ -8543,8 +9048,6 @@ fi > +@@ -8677,8 +9182,6 @@ fi > lt_prog_compiler_pic= > lt_prog_compiler_static= > > @@ -13964,7 +13954,7 @@ index d0a467ac101..45b20013a45 100755 > > if test "$GCC" = yes; then > lt_prog_compiler_wl='-Wl,' > -@@ -8710,6 +9213,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > +@@ -8844,6 +9347,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > lt_prog_compiler_pic='--shared' > lt_prog_compiler_static='--static' > ;; > @@ -13977,7 +13967,7 @@ index d0a467ac101..45b20013a45 100755 > pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) > # Portland Group compilers (*not* the Pentium gcc compiler, > # which looks to be a dead project) > -@@ -8772,7 +9281,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > +@@ -8906,7 +9415,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 > @@ -13986,7 +13976,7 @@ index d0a467ac101..45b20013a45 100755 > lt_prog_compiler_wl='-Qoption ld ';; > *) > lt_prog_compiler_wl='-Wl,';; > -@@ -8829,13 +9338,17 @@ case $host_os in > +@@ -8963,13 +9472,17 @@ case $host_os in > lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" > ;; > esac > @@ -14010,7 +14000,7 @@ index d0a467ac101..45b20013a45 100755 > > # > # Check to make sure the PIC flag actually works. > -@@ -8896,6 +9409,11 @@ fi > +@@ -9030,6 +9543,11 @@ fi > > > > @@ -14022,7 +14012,7 @@ index d0a467ac101..45b20013a45 100755 > # > # Check to make sure the static flag actually works. > # > -@@ -9246,7 +9764,8 @@ _LT_EOF > +@@ -9380,7 +9898,8 @@ _LT_EOF > allow_undefined_flag=unsupported > always_export_symbols=no > enable_shared_with_static_runtimes=yes > @@ -14032,7 +14022,7 @@ index d0a467ac101..45b20013a45 100755 > > 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' > -@@ -9345,12 +9864,12 @@ _LT_EOF > +@@ -9479,12 +9998,12 @@ _LT_EOF > whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' > hardcode_libdir_flag_spec= > hardcode_libdir_flag_spec_ld='-rpath $libdir' > @@ -14047,7 +14037,7 @@ index d0a467ac101..45b20013a45 100755 > fi > ;; > esac > -@@ -9364,8 +9883,8 @@ _LT_EOF > +@@ -9498,8 +10017,8 @@ _LT_EOF > archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' > wlarc= > else > @@ -14058,7 +14048,7 @@ index d0a467ac101..45b20013a45 100755 > fi > ;; > > -@@ -9383,8 +9902,8 @@ _LT_EOF > +@@ -9517,8 +10036,8 @@ _LT_EOF > > _LT_EOF > elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then > @@ -14069,7 +14059,7 @@ index d0a467ac101..45b20013a45 100755 > else > ld_shlibs=no > fi > -@@ -9430,8 +9949,8 @@ _LT_EOF > +@@ -9564,8 +10083,8 @@ _LT_EOF > > *) > if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then > @@ -14080,7 +14070,7 @@ index d0a467ac101..45b20013a45 100755 > else > ld_shlibs=no > fi > -@@ -9561,7 +10080,13 @@ _LT_EOF > +@@ -9695,7 +10214,13 @@ _LT_EOF > allow_undefined_flag='-berok' > # Determine the default libpath from the value encoded in an > # empty executable. > @@ -14095,7 +14085,7 @@ index d0a467ac101..45b20013a45 100755 > /* end confdefs.h. */ > > int > -@@ -9574,22 +10099,29 @@ main () > +@@ -9708,22 +10233,29 @@ main () > _ACEOF > if ac_fn_c_try_link "$LINENO"; then : > > @@ -14138,7 +14128,7 @@ index d0a467ac101..45b20013a45 100755 > > 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" > -@@ -9601,7 +10133,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9735,7 +10267,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. > @@ -14153,7 +14143,7 @@ index d0a467ac101..45b20013a45 100755 > /* end confdefs.h. */ > > int > -@@ -9614,22 +10152,29 @@ main () > +@@ -9748,22 +10286,29 @@ main () > _ACEOF > if ac_fn_c_try_link "$LINENO"; then : > > @@ -14196,7 +14186,7 @@ index d0a467ac101..45b20013a45 100755 > > hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" > # Warning - without using the other run time loading flags, > -@@ -9673,21 +10218,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9807,21 +10352,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 > @@ -14276,7 +14266,7 @@ index d0a467ac101..45b20013a45 100755 > ;; > > darwin* | rhapsody*) > -@@ -9748,7 +10336,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9882,7 +10470,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*) > @@ -14285,7 +14275,7 @@ index d0a467ac101..45b20013a45 100755 > hardcode_libdir_flag_spec='-R$libdir' > hardcode_direct=yes > hardcode_shlibpath_var=no > -@@ -9756,7 +10344,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9890,7 +10478,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > hpux9*) > if test "$GCC" = yes; then > @@ -14294,7 +14284,7 @@ index d0a467ac101..45b20013a45 100755 > 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 > -@@ -9772,7 +10360,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9906,7 +10494,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > hpux10*) > if test "$GCC" = yes && test "$with_gnu_ld" = no; then > @@ -14303,7 +14293,7 @@ index d0a467ac101..45b20013a45 100755 > else > archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' > fi > -@@ -9796,10 +10384,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9930,10 +10518,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*) > @@ -14316,7 +14306,7 @@ index d0a467ac101..45b20013a45 100755 > ;; > esac > else > -@@ -9878,23 +10466,36 @@ fi > +@@ -10012,23 +10600,36 @@ fi > > irix5* | irix6* | nonstopux*) > if test "$GCC" = yes; then > @@ -14361,7 +14351,7 @@ index d0a467ac101..45b20013a45 100755 > 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' > -@@ -9979,7 +10580,7 @@ rm -f core conftest.err conftest.$ac_objext \ > +@@ -10113,7 +10714,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}\*' > @@ -14370,7 +14360,7 @@ index d0a467ac101..45b20013a45 100755 > hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' > else > allow_undefined_flag=' -expect_unresolved \*' > -@@ -9998,9 +10599,9 @@ rm -f core conftest.err conftest.$ac_objext \ > +@@ -10132,9 +10733,9 @@ rm -f core conftest.err conftest.$ac_objext \ > no_undefined_flag=' -z defs' > if test "$GCC" = yes; then > wlarc='${wl}' > @@ -14382,7 +14372,7 @@ index d0a467ac101..45b20013a45 100755 > else > case `$CC -V 2>&1` in > *"Compilers 5.0"*) > -@@ -10576,8 +11177,9 @@ cygwin* | mingw* | pw32* | cegcc*) > +@@ -10710,8 +11311,9 @@ cygwin* | mingw* | pw32* | cegcc*) > need_version=no > need_lib_prefix=no > > @@ -14394,7 +14384,7 @@ index d0a467ac101..45b20013a45 100755 > library_names_spec='$libname.dll.a' > # DLL is installed to $(libdir)/../bin by postinstall_cmds > postinstall_cmds='base_file=`basename \${file}`~ > -@@ -10610,13 +11212,71 @@ cygwin* | mingw* | pw32* | cegcc*) > +@@ -10744,13 +11346,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 > @@ -14467,16 +14457,16 @@ index d0a467ac101..45b20013a45 100755 > # FIXME: first we should search . and the directory the executable is in > shlibpath_var=PATH > ;; > -@@ -11494,7 +12154,7 @@ else > +@@ -11628,7 +12288,7 @@ else > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF > --#line 11494 "configure" > +-#line 11628 "configure" > +#line $LINENO "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > -@@ -11538,10 +12198,10 @@ else > +@@ -11672,10 +12332,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)) > @@ -14489,16 +14479,16 @@ index d0a467ac101..45b20013a45 100755 > int main () > { > void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > -@@ -11600,7 +12260,7 @@ else > +@@ -11734,7 +12394,7 @@ else > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF > --#line 11600 "configure" > +-#line 11734 "configure" > +#line $LINENO "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > -@@ -11644,10 +12304,10 @@ else > +@@ -11778,10 +12438,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)) > @@ -14511,7 +14501,7 @@ index d0a467ac101..45b20013a45 100755 > int main () > { > void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > -@@ -12039,6 +12699,7 @@ $RM -r conftest* > +@@ -12173,6 +12833,7 @@ $RM -r conftest* > > # Allow CC to be a program name with arguments. > lt_save_CC=$CC > @@ -14519,7 +14509,7 @@ index d0a467ac101..45b20013a45 100755 > lt_save_LD=$LD > lt_save_GCC=$GCC > GCC=$GXX > -@@ -12056,6 +12717,7 @@ $RM -r conftest* > +@@ -12190,6 +12851,7 @@ $RM -r conftest* > fi > test -z "${LDCXX+set}" || LD=$LDCXX > CC=${CXX-"c++"} > @@ -14527,7 +14517,7 @@ index d0a467ac101..45b20013a45 100755 > compiler=$CC > compiler_CXX=$CC > for cc_temp in $compiler""; do > -@@ -12338,7 +13000,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie > +@@ -12472,7 +13134,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. > @@ -14542,7 +14532,7 @@ index d0a467ac101..45b20013a45 100755 > /* end confdefs.h. */ > > int > -@@ -12351,22 +13019,29 @@ main () > +@@ -12485,22 +13153,29 @@ main () > _ACEOF > if ac_fn_cxx_try_link "$LINENO"; then : > > @@ -14585,7 +14575,7 @@ index d0a467ac101..45b20013a45 100755 > > hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" > > -@@ -12379,7 +13054,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -12513,7 +13188,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. > @@ -14600,7 +14590,7 @@ index d0a467ac101..45b20013a45 100755 > /* end confdefs.h. */ > > int > -@@ -12392,22 +13073,29 @@ main () > +@@ -12526,22 +13207,29 @@ main () > _ACEOF > if ac_fn_cxx_try_link "$LINENO"; then : > > @@ -14643,7 +14633,7 @@ index d0a467ac101..45b20013a45 100755 > > hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" > # Warning - without using the other run time loading flags, > -@@ -12450,29 +13138,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -12584,29 +13272,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > ;; > > cygwin* | mingw* | pw32* | cegcc*) > @@ -14742,7 +14732,7 @@ index d0a467ac101..45b20013a45 100755 > darwin* | rhapsody*) > > > -@@ -12578,7 +13312,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -12712,7 +13446,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > ;; > *) > if test "$GXX" = yes; then > @@ -14751,7 +14741,7 @@ index d0a467ac101..45b20013a45 100755 > else > # FIXME: insert proper C++ library support > ld_shlibs_CXX=no > -@@ -12649,10 +13383,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -12783,10 +13517,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*) > @@ -14764,7 +14754,7 @@ index d0a467ac101..45b20013a45 100755 > ;; > esac > fi > -@@ -12693,9 +13427,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -12827,9 +13561,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 > @@ -14776,7 +14766,7 @@ index d0a467ac101..45b20013a45 100755 > fi > fi > link_all_deplibs_CXX=yes > -@@ -12765,20 +13499,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -12899,20 +13633,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~ > @@ -14801,7 +14791,7 @@ index d0a467ac101..45b20013a45 100755 > ;; > *) # 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' > -@@ -12973,7 +13707,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -13107,7 +13841,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' > ;; > *) > @@ -14810,7 +14800,7 @@ index d0a467ac101..45b20013a45 100755 > ;; > esac > > -@@ -13019,7 +13753,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -13153,7 +13887,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > solaris*) > case $cc_basename in > @@ -14819,7 +14809,7 @@ index d0a467ac101..45b20013a45 100755 > # Sun C++ 4.2, 5.x and Centerline C++ > archive_cmds_need_lc_CXX=yes > no_undefined_flag_CXX=' -zdefs' > -@@ -13060,9 +13794,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -13194,9 +13928,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 > @@ -14831,7 +14821,7 @@ index d0a467ac101..45b20013a45 100755 > > # Commands to make compiler produce verbose output that lists > # what "hidden" libraries, object files and flags are used when > -@@ -13197,6 +13931,13 @@ private: > +@@ -13331,6 +14065,13 @@ private: > }; > _LT_EOF > > @@ -14845,7 +14835,7 @@ index d0a467ac101..45b20013a45 100755 > if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 > (eval $ac_compile) 2>&5 > ac_status=$? > -@@ -13210,7 +13951,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 > +@@ -13344,7 +14085,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 > @@ -14854,7 +14844,7 @@ index d0a467ac101..45b20013a45 100755 > > -L* | -R* | -l*) > # Some compilers place space between "-{L,R}" and the path. > -@@ -13219,13 +13960,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 > +@@ -13353,13 +14094,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 > test $p = "-R"; then > prev=$p > continue > @@ -14881,7 +14871,7 @@ index d0a467ac101..45b20013a45 100755 > # 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. > -@@ -13245,8 +13995,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 > +@@ -13379,8 +14129,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 > postdeps_CXX="${postdeps_CXX} ${prev}${p}" > fi > fi > @@ -14892,7 +14882,7 @@ index d0a467ac101..45b20013a45 100755 > *.$objext) > # This assumes that the test object file only shows up > # once in the compiler output. > -@@ -13282,6 +14034,7 @@ else > +@@ -13416,6 +14168,7 @@ else > fi > > $RM -f confest.$objext > @@ -14900,7 +14890,7 @@ index d0a467ac101..45b20013a45 100755 > > # PORTME: override above test on systems where it is broken > case $host_os in > -@@ -13317,7 +14070,7 @@ linux*) > +@@ -13451,7 +14204,7 @@ linux*) > > solaris*) > case $cc_basename in > @@ -14909,7 +14899,7 @@ index d0a467ac101..45b20013a45 100755 > # The more standards-conforming stlport4 library is > # incompatible with the Cstd library. Avoid specifying > # it if it's in CXXFLAGS. Ignore libCrun as > -@@ -13382,8 +14135,6 @@ fi > +@@ -13516,8 +14269,6 @@ fi > lt_prog_compiler_pic_CXX= > lt_prog_compiler_static_CXX= > > @@ -14918,7 +14908,7 @@ index d0a467ac101..45b20013a45 100755 > > # C++ specific cases for pic, static, wl, etc. > if test "$GXX" = yes; then > -@@ -13488,6 +14239,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > +@@ -13622,6 +14373,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > ;; > esac > ;; > @@ -14930,7 +14920,7 @@ index d0a467ac101..45b20013a45 100755 > dgux*) > case $cc_basename in > ec++*) > -@@ -13640,7 +14396,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > +@@ -13774,7 +14530,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > ;; > solaris*) > case $cc_basename in > @@ -14939,7 +14929,7 @@ index d0a467ac101..45b20013a45 100755 > # Sun C++ 4.2, 5.x and Centerline C++ > lt_prog_compiler_pic_CXX='-KPIC' > lt_prog_compiler_static_CXX='-Bstatic' > -@@ -13705,10 +14461,17 @@ case $host_os in > +@@ -13839,10 +14595,17 @@ case $host_os in > lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" > ;; > esac > @@ -14960,7 +14950,7 @@ index d0a467ac101..45b20013a45 100755 > > # > # Check to make sure the PIC flag actually works. > -@@ -13766,6 +14529,8 @@ fi > +@@ -13900,6 +14663,8 @@ fi > > > > @@ -14969,7 +14959,7 @@ index d0a467ac101..45b20013a45 100755 > # > # Check to make sure the static flag actually works. > # > -@@ -13943,6 +14708,7 @@ fi > +@@ -14077,6 +14842,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' > @@ -14977,7 +14967,7 @@ index d0a467ac101..45b20013a45 100755 > case $host_os in > aix[4-9]*) > # If we're using GNU nm, then we don't want the "-C" option. > -@@ -13957,15 +14723,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie > +@@ -14091,15 +14857,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie > ;; > pw32*) > export_symbols_cmds_CXX="$ltdll_cmds" > @@ -15003,7 +14993,7 @@ index d0a467ac101..45b20013a45 100755 > > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 > $as_echo "$ld_shlibs_CXX" >&6; } > -@@ -14228,8 +14999,9 @@ cygwin* | mingw* | pw32* | cegcc*) > +@@ -14362,8 +15133,9 @@ cygwin* | mingw* | pw32* | cegcc*) > need_version=no > need_lib_prefix=no > > @@ -15015,7 +15005,7 @@ index d0a467ac101..45b20013a45 100755 > library_names_spec='$libname.dll.a' > # DLL is installed to $(libdir)/../bin by postinstall_cmds > postinstall_cmds='base_file=`basename \${file}`~ > -@@ -14261,13 +15033,71 @@ cygwin* | mingw* | pw32* | cegcc*) > +@@ -14395,13 +15167,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 > @@ -15088,7 +15078,7 @@ index d0a467ac101..45b20013a45 100755 > # FIXME: first we should search . and the directory the executable is in > shlibpath_var=PATH > ;; > -@@ -14807,6 +15637,7 @@ fi > +@@ -14941,6 +15771,7 @@ fi > fi # test -n "$compiler" > > CC=$lt_save_CC > @@ -15096,7 +15086,7 @@ index d0a467ac101..45b20013a45 100755 > LDCXX=$LD > LD=$lt_save_LD > GCC=$lt_save_GCC > -@@ -18172,13 +19003,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' > +@@ -18322,13 +19153,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"`' > @@ -15117,7 +15107,7 @@ index d0a467ac101..45b20013a45 100755 > 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"`' > -@@ -18193,14 +19031,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de > +@@ -18343,14 +19181,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"`' > @@ -15136,7 +15126,7 @@ index d0a467ac101..45b20013a45 100755 > DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' > NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' > LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' > -@@ -18233,12 +19074,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q > +@@ -18383,12 +19224,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"`' > @@ -15150,7 +15140,7 @@ index d0a467ac101..45b20013a45 100755 > 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"`' > -@@ -18277,8 +19118,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote > +@@ -18427,8 +19268,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"`' > @@ -15160,7 +15150,7 @@ index d0a467ac101..45b20013a45 100755 > 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"`' > -@@ -18305,12 +19146,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ > +@@ -18455,12 +19296,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"`' > @@ -15174,7 +15164,7 @@ index d0a467ac101..45b20013a45 100755 > 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"`' > -@@ -18348,8 +19189,13 @@ reload_flag \ > +@@ -18498,8 +19339,13 @@ reload_flag \ > OBJDUMP \ > deplibs_check_method \ > file_magic_cmd \ > @@ -15188,7 +15178,7 @@ index d0a467ac101..45b20013a45 100755 > STRIP \ > RANLIB \ > CC \ > -@@ -18359,12 +19205,14 @@ lt_cv_sys_global_symbol_pipe \ > +@@ -18509,12 +19355,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 \ > @@ -15204,7 +15194,7 @@ index d0a467ac101..45b20013a45 100755 > DSYMUTIL \ > NMEDIT \ > LIPO \ > -@@ -18380,7 +19228,6 @@ no_undefined_flag \ > +@@ -18530,7 +19378,6 @@ no_undefined_flag \ > hardcode_libdir_flag_spec \ > hardcode_libdir_flag_spec_ld \ > hardcode_libdir_separator \ > @@ -15212,7 +15202,7 @@ index d0a467ac101..45b20013a45 100755 > exclude_expsyms \ > include_expsyms \ > file_list_spec \ > -@@ -18402,8 +19249,8 @@ LD_CXX \ > +@@ -18552,8 +19399,8 @@ LD_CXX \ > reload_flag_CXX \ > compiler_CXX \ > lt_prog_compiler_no_builtin_flag_CXX \ > @@ -15222,7 +15212,7 @@ index d0a467ac101..45b20013a45 100755 > lt_prog_compiler_static_CXX \ > lt_cv_prog_compiler_c_o_CXX \ > export_dynamic_flag_spec_CXX \ > -@@ -18415,7 +19262,6 @@ no_undefined_flag_CXX \ > +@@ -18565,7 +19412,6 @@ no_undefined_flag_CXX \ > hardcode_libdir_flag_spec_CXX \ > hardcode_libdir_flag_spec_ld_CXX \ > hardcode_libdir_separator_CXX \ > @@ -15230,7 +15220,7 @@ index d0a467ac101..45b20013a45 100755 > exclude_expsyms_CXX \ > include_expsyms_CXX \ > file_list_spec_CXX \ > -@@ -18449,6 +19295,7 @@ module_cmds \ > +@@ -18599,6 +19445,7 @@ module_cmds \ > module_expsym_cmds \ > export_symbols_cmds \ > prelink_cmds \ > @@ -15238,7 +15228,7 @@ index d0a467ac101..45b20013a45 100755 > postinstall_cmds \ > postuninstall_cmds \ > finish_cmds \ > -@@ -18463,7 +19310,8 @@ archive_expsym_cmds_CXX \ > +@@ -18613,7 +19460,8 @@ archive_expsym_cmds_CXX \ > module_cmds_CXX \ > module_expsym_cmds_CXX \ > export_symbols_cmds_CXX \ > @@ -15248,7 +15238,7 @@ index d0a467ac101..45b20013a45 100755 > case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in > *[\\\\\\\`\\"\\\$]*) > eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" > -@@ -19228,7 +20076,8 @@ $as_echo X"$file" | > +@@ -19378,7 +20226,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, > @@ -15258,7 +15248,7 @@ index d0a467ac101..45b20013a45 100755 > # Written by Gordon Matzigkeit, 1996 > # > # This file is part of GNU Libtool. > -@@ -19331,19 +20180,42 @@ SP2NL=$lt_lt_SP2NL > +@@ -19481,19 +20330,42 @@ SP2NL=$lt_lt_SP2NL > # turn newlines into spaces. > NL2SP=$lt_lt_NL2SP > > @@ -15302,7 +15292,7 @@ index d0a467ac101..45b20013a45 100755 > # A symbol stripping program. > STRIP=$lt_STRIP > > -@@ -19373,6 +20245,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address > +@@ -19523,6 +20395,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 > > @@ -15315,7 +15305,7 @@ index d0a467ac101..45b20013a45 100755 > # The name of the directory that contains temporary libtool files. > objdir=$objdir > > -@@ -19382,6 +20260,9 @@ MAGIC_CMD=$MAGIC_CMD > +@@ -19532,6 +20410,9 @@ MAGIC_CMD=$MAGIC_CMD > # Must we lock files when doing compilation? > need_locks=$lt_need_locks > > @@ -15325,7 +15315,7 @@ index d0a467ac101..45b20013a45 100755 > # Tool to manipulate archived DWARF debug symbol files on Mac OS X. > DSYMUTIL=$lt_DSYMUTIL > > -@@ -19496,12 +20377,12 @@ with_gcc=$GCC > +@@ -19646,12 +20527,12 @@ with_gcc=$GCC > # Compiler flag to turn off builtin functions. > no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag > > @@ -15341,7 +15331,7 @@ index d0a467ac101..45b20013a45 100755 > # Compiler flag to prevent dynamic linking. > link_static_flag=$lt_lt_prog_compiler_static > > -@@ -19588,9 +20469,6 @@ inherit_rpath=$inherit_rpath > +@@ -19738,9 +20619,6 @@ inherit_rpath=$inherit_rpath > # Whether libtool must link a program against all its dependency libraries. > link_all_deplibs=$link_all_deplibs > > @@ -15351,7 +15341,7 @@ index d0a467ac101..45b20013a45 100755 > # Set to "yes" if exported symbols are required. > always_export_symbols=$always_export_symbols > > -@@ -19606,6 +20484,9 @@ include_expsyms=$lt_include_expsyms > +@@ -19756,6 +20634,9 @@ include_expsyms=$lt_include_expsyms > # Commands necessary for linking programs (against libraries) with templates. > prelink_cmds=$lt_prelink_cmds > > @@ -15361,7 +15351,7 @@ index d0a467ac101..45b20013a45 100755 > # Specify filename containing input files. > file_list_spec=$lt_file_list_spec > > -@@ -19652,210 +20533,169 @@ ltmain="$ac_aux_dir/ltmain.sh" > +@@ -19802,210 +20683,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? > @@ -15735,7 +15725,7 @@ index d0a467ac101..45b20013a45 100755 > (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") > chmod +x "$ofile" > > -@@ -19883,12 +20723,12 @@ with_gcc=$GCC_CXX > +@@ -20033,12 +20873,12 @@ with_gcc=$GCC_CXX > # Compiler flag to turn off builtin functions. > no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX > > @@ -15751,7 +15741,7 @@ index d0a467ac101..45b20013a45 100755 > # Compiler flag to prevent dynamic linking. > link_static_flag=$lt_lt_prog_compiler_static_CXX > > -@@ -19975,9 +20815,6 @@ inherit_rpath=$inherit_rpath_CXX > +@@ -20125,9 +20965,6 @@ inherit_rpath=$inherit_rpath_CXX > # Whether libtool must link a program against all its dependency libraries. > link_all_deplibs=$link_all_deplibs_CXX > > @@ -15761,7 +15751,7 @@ index d0a467ac101..45b20013a45 100755 > # Set to "yes" if exported symbols are required. > always_export_symbols=$always_export_symbols_CXX > > -@@ -19993,6 +20830,9 @@ include_expsyms=$lt_include_expsyms_CXX > +@@ -20143,6 +20980,9 @@ include_expsyms=$lt_include_expsyms_CXX > # Commands necessary for linking programs (against libraries) with templates. > prelink_cmds=$lt_prelink_cmds_CXX > > @@ -15772,7 +15762,7 @@ index d0a467ac101..45b20013a45 100755 > file_list_spec=$lt_file_list_spec_CXX > > diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in > -index e6a4c8e2ef3..3547e3649b7 100644 > +index 0a61880ba67..5889b0477cd 100644 > --- a/libbacktrace/Makefile.in > +++ b/libbacktrace/Makefile.in > @@ -827,6 +827,7 @@ CPP = @CPP@ > @@ -17713,7 +17703,7 @@ index 406b67b8cbc..b648da40aab 100755 > chmod +x "$ofile" > > diff --git a/libctf/Makefile.in b/libctf/Makefile.in > -index 1984f50867a..51a3dd26e87 100644 > +index f2b852e3fae..63e3b2e05ea 100644 > --- a/libctf/Makefile.in > +++ b/libctf/Makefile.in > @@ -393,6 +393,7 @@ CYGPATH_W = @CYGPATH_W@ > @@ -17733,7 +17723,7 @@ index 1984f50867a..51a3dd26e87 100644 > NM = @NM@ > NMEDIT = @NMEDIT@ > diff --git a/libctf/configure b/libctf/configure > -index 8704bc215f4..c1bf438bda6 100755 > +index b347b292195..d6d6e341887 100755 > --- a/libctf/configure > +++ b/libctf/configure > @@ -669,6 +669,8 @@ OTOOL > @@ -17762,7 +17752,7 @@ index 8704bc215f4..c1bf438bda6 100755 > --with-system-zlib use installed libz > > Some influential environment variables: > -@@ -5571,8 +5576,8 @@ esac > +@@ -5568,8 +5573,8 @@ esac > > > > @@ -17773,7 +17763,7 @@ index 8704bc215f4..c1bf438bda6 100755 > > > > -@@ -5612,7 +5617,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO > +@@ -5609,7 +5614,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. > @@ -17782,7 +17772,7 @@ index 8704bc215f4..c1bf438bda6 100755 > 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 > -@@ -6305,8 +6310,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; > +@@ -6302,8 +6307,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" > @@ -17793,7 +17783,7 @@ index 8704bc215f4..c1bf438bda6 100755 > && eval 'test $(( 1 + 1 )) -eq 2 \ > && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ > && xsi_shell=yes > -@@ -6355,6 +6360,80 @@ esac > +@@ -6352,6 +6357,80 @@ esac > > > > @@ -17874,7 +17864,7 @@ index 8704bc215f4..c1bf438bda6 100755 > { $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 ${lt_cv_ld_reload_flag+:} false; then : > -@@ -6371,6 +6450,11 @@ case $reload_flag in > +@@ -6368,6 +6447,11 @@ case $reload_flag in > esac > reload_cmds='$LD$reload_flag -o $output$reload_objs' > case $host_os in > @@ -17886,7 +17876,7 @@ index 8704bc215f4..c1bf438bda6 100755 > darwin*) > if test "$GCC" = yes; then > reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' > -@@ -6539,7 +6623,8 @@ mingw* | pw32*) > +@@ -6536,7 +6620,8 @@ mingw* | pw32*) > lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' > lt_cv_file_magic_cmd='func_win32_libid' > else > @@ -17896,7 +17886,7 @@ index 8704bc215f4..c1bf438bda6 100755 > lt_cv_file_magic_cmd='$OBJDUMP -f' > fi > ;; > -@@ -6693,6 +6778,21 @@ esac > +@@ -6690,6 +6775,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; } > @@ -17918,7 +17908,7 @@ index 8704bc215f4..c1bf438bda6 100755 > 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 > -@@ -6708,6 +6808,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown > +@@ -6705,6 +6805,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown > > > > @@ -18076,7 +18066,7 @@ index 8704bc215f4..c1bf438bda6 100755 > plugin_option= > plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" > for plugin in $plugin_names; do > -@@ -6722,8 +6973,10 @@ for plugin in $plugin_names; do > +@@ -6719,8 +6970,10 @@ for plugin in $plugin_names; do > done > > if test -n "$ac_tool_prefix"; then > @@ -18089,7 +18079,7 @@ index 8704bc215f4..c1bf438bda6 100755 > { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 > $as_echo_n "checking for $ac_word... " >&6; } > if ${ac_cv_prog_AR+:} false; then : > -@@ -6739,7 +6992,7 @@ do > +@@ -6736,7 +6989,7 @@ do > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > @@ -18098,7 +18088,7 @@ index 8704bc215f4..c1bf438bda6 100755 > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > fi > -@@ -6759,11 +7012,15 @@ $as_echo "no" >&6; } > +@@ -6756,11 +7009,15 @@ $as_echo "no" >&6; } > fi > > > @@ -18117,7 +18107,7 @@ index 8704bc215f4..c1bf438bda6 100755 > { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 > $as_echo_n "checking for $ac_word... " >&6; } > if ${ac_cv_prog_ac_ct_AR+:} false; then : > -@@ -6779,7 +7036,7 @@ do > +@@ -6776,7 +7033,7 @@ do > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > @@ -18126,7 +18116,7 @@ index 8704bc215f4..c1bf438bda6 100755 > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > fi > -@@ -6798,6 +7055,10 @@ else > +@@ -6795,6 +7052,10 @@ else > $as_echo "no" >&6; } > fi > > @@ -18137,7 +18127,7 @@ index 8704bc215f4..c1bf438bda6 100755 > if test "x$ac_ct_AR" = x; then > AR="false" > else > -@@ -6809,25 +7070,19 @@ ac_tool_warned=yes ;; > +@@ -6806,25 +7067,19 @@ ac_tool_warned=yes ;; > esac > AR=$ac_ct_AR > fi > @@ -18172,7 +18162,7 @@ index 8704bc215f4..c1bf438bda6 100755 > > > > -@@ -6839,6 +7094,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru > +@@ -6836,6 +7091,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru > > > > @@ -18237,7 +18227,7 @@ index 8704bc215f4..c1bf438bda6 100755 > 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 > -@@ -7178,8 +7491,8 @@ esac > +@@ -7175,8 +7488,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 > @@ -18248,7 +18238,7 @@ index 8704bc215f4..c1bf438bda6 100755 > > # Handle CRLF in mingw tool chain > opt_cr= > -@@ -7215,6 +7528,7 @@ for ac_symprfx in "" "_"; do > +@@ -7212,6 +7525,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 > @@ -18256,7 +18246,7 @@ index 8704bc215f4..c1bf438bda6 100755 > > # Check to see that the pipe works correctly. > pipe_works=no > -@@ -7256,6 +7570,18 @@ _LT_EOF > +@@ -7253,6 +7567,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 > @@ -18275,7 +18265,7 @@ index 8704bc215f4..c1bf438bda6 100755 > #ifdef __cplusplus > extern "C" { > #endif > -@@ -7267,7 +7593,7 @@ _LT_EOF > +@@ -7264,7 +7590,7 @@ _LT_EOF > cat <<_LT_EOF >> conftest.$ac_ext > > /* The mapping between symbol names and symbols. */ > @@ -18284,7 +18274,7 @@ index 8704bc215f4..c1bf438bda6 100755 > const char *name; > void *address; > } > -@@ -7293,8 +7619,8 @@ static const void *lt_preloaded_setup() { > +@@ -7290,8 +7616,8 @@ static const void *lt_preloaded_setup() { > _LT_EOF > # Now try linking the two files. > mv conftest.$ac_objext conftstm.$ac_objext > @@ -18295,7 +18285,7 @@ index 8704bc215f4..c1bf438bda6 100755 > LIBS="conftstm.$ac_objext" > CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" > if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 > -@@ -7304,8 +7630,8 @@ _LT_EOF > +@@ -7301,8 +7627,8 @@ _LT_EOF > test $ac_status = 0; } && test -s conftest${ac_exeext}; then > pipe_works=yes > fi > @@ -18306,7 +18296,7 @@ index 8704bc215f4..c1bf438bda6 100755 > else > echo "cannot find nm_test_func in $nlist" >&5 > fi > -@@ -7342,6 +7668,14 @@ else > +@@ -7339,6 +7665,17 @@ else > $as_echo "ok" >&6; } > fi > > @@ -18318,10 +18308,13 @@ index 8704bc215f4..c1bf438bda6 100755 > +fi > + > + > ++ > ++ > ++ > > > > -@@ -7360,6 +7694,47 @@ fi > +@@ -7355,6 +7692,44 @@ fi > > > > @@ -18331,7 +18324,6 @@ index 8704bc215f4..c1bf438bda6 100755 > + > + > + > -+ > +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 > +$as_echo_n "checking for sysroot... " >&6; } > + > @@ -18364,12 +18356,10 @@ index 8704bc215f4..c1bf438bda6 100755 > + > + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 > +$as_echo "${lt_sysroot:-no}" >&6; } > -+ > -+ > > > > -@@ -7569,6 +7944,123 @@ esac > +@@ -7566,6 +7941,123 @@ esac > > need_locks="$enable_libtool_lock" > > @@ -18493,7 +18483,7 @@ index 8704bc215f4..c1bf438bda6 100755 > > case $host_os in > rhapsody* | darwin*) > -@@ -8132,6 +8624,8 @@ _LT_EOF > +@@ -8129,6 +8621,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 > @@ -18502,7 +18492,7 @@ index 8704bc215f4..c1bf438bda6 100755 > cat > conftest.c << _LT_EOF > int main() { return 0;} > _LT_EOF > -@@ -8684,8 +9178,6 @@ fi > +@@ -8681,8 +9175,6 @@ fi > lt_prog_compiler_pic= > lt_prog_compiler_static= > > @@ -18511,7 +18501,7 @@ index 8704bc215f4..c1bf438bda6 100755 > > if test "$GCC" = yes; then > lt_prog_compiler_wl='-Wl,' > -@@ -8851,6 +9343,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > +@@ -8848,6 +9340,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > lt_prog_compiler_pic='--shared' > lt_prog_compiler_static='--static' > ;; > @@ -18524,7 +18514,7 @@ index 8704bc215f4..c1bf438bda6 100755 > pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) > # Portland Group compilers (*not* the Pentium gcc compiler, > # which looks to be a dead project) > -@@ -8913,7 +9411,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > +@@ -8910,7 +9408,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 > @@ -18533,7 +18523,7 @@ index 8704bc215f4..c1bf438bda6 100755 > lt_prog_compiler_wl='-Qoption ld ';; > *) > lt_prog_compiler_wl='-Wl,';; > -@@ -8970,13 +9468,17 @@ case $host_os in > +@@ -8967,13 +9465,17 @@ case $host_os in > lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" > ;; > esac > @@ -18557,7 +18547,7 @@ index 8704bc215f4..c1bf438bda6 100755 > > # > # Check to make sure the PIC flag actually works. > -@@ -9037,6 +9539,11 @@ fi > +@@ -9034,6 +9536,11 @@ fi > > > > @@ -18569,7 +18559,7 @@ index 8704bc215f4..c1bf438bda6 100755 > # > # Check to make sure the static flag actually works. > # > -@@ -9387,7 +9894,8 @@ _LT_EOF > +@@ -9384,7 +9891,8 @@ _LT_EOF > allow_undefined_flag=unsupported > always_export_symbols=no > enable_shared_with_static_runtimes=yes > @@ -18579,7 +18569,7 @@ index 8704bc215f4..c1bf438bda6 100755 > > 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' > -@@ -9486,12 +9994,12 @@ _LT_EOF > +@@ -9483,12 +9991,12 @@ _LT_EOF > whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' > hardcode_libdir_flag_spec= > hardcode_libdir_flag_spec_ld='-rpath $libdir' > @@ -18594,7 +18584,7 @@ index 8704bc215f4..c1bf438bda6 100755 > fi > ;; > esac > -@@ -9505,8 +10013,8 @@ _LT_EOF > +@@ -9502,8 +10010,8 @@ _LT_EOF > archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' > wlarc= > else > @@ -18605,7 +18595,7 @@ index 8704bc215f4..c1bf438bda6 100755 > fi > ;; > > -@@ -9524,8 +10032,8 @@ _LT_EOF > +@@ -9521,8 +10029,8 @@ _LT_EOF > > _LT_EOF > elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then > @@ -18616,7 +18606,7 @@ index 8704bc215f4..c1bf438bda6 100755 > else > ld_shlibs=no > fi > -@@ -9571,8 +10079,8 @@ _LT_EOF > +@@ -9568,8 +10076,8 @@ _LT_EOF > > *) > if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then > @@ -18627,7 +18617,7 @@ index 8704bc215f4..c1bf438bda6 100755 > else > ld_shlibs=no > fi > -@@ -9702,7 +10210,13 @@ _LT_EOF > +@@ -9699,7 +10207,13 @@ _LT_EOF > allow_undefined_flag='-berok' > # Determine the default libpath from the value encoded in an > # empty executable. > @@ -18642,7 +18632,7 @@ index 8704bc215f4..c1bf438bda6 100755 > /* end confdefs.h. */ > > int > -@@ -9715,22 +10229,29 @@ main () > +@@ -9712,22 +10226,29 @@ main () > _ACEOF > if ac_fn_c_try_link "$LINENO"; then : > > @@ -18685,7 +18675,7 @@ index 8704bc215f4..c1bf438bda6 100755 > > 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" > -@@ -9742,7 +10263,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9739,7 +10260,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. > @@ -18700,7 +18690,7 @@ index 8704bc215f4..c1bf438bda6 100755 > /* end confdefs.h. */ > > int > -@@ -9755,22 +10282,29 @@ main () > +@@ -9752,22 +10279,29 @@ main () > _ACEOF > if ac_fn_c_try_link "$LINENO"; then : > > @@ -18743,7 +18733,7 @@ index 8704bc215f4..c1bf438bda6 100755 > > hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" > # Warning - without using the other run time loading flags, > -@@ -9815,20 +10349,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9812,20 +10346,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. > @@ -18821,7 +18811,7 @@ index 8704bc215f4..c1bf438bda6 100755 > ;; > > darwin* | rhapsody*) > -@@ -9889,7 +10466,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9886,7 +10463,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*) > @@ -18830,7 +18820,7 @@ index 8704bc215f4..c1bf438bda6 100755 > hardcode_libdir_flag_spec='-R$libdir' > hardcode_direct=yes > hardcode_shlibpath_var=no > -@@ -9897,7 +10474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9894,7 +10471,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > hpux9*) > if test "$GCC" = yes; then > @@ -18839,7 +18829,7 @@ index 8704bc215f4..c1bf438bda6 100755 > 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 > -@@ -9913,7 +10490,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9910,7 +10487,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > hpux10*) > if test "$GCC" = yes && test "$with_gnu_ld" = no; then > @@ -18848,7 +18838,7 @@ index 8704bc215f4..c1bf438bda6 100755 > else > archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' > fi > -@@ -9937,10 +10514,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -9934,10 +10511,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*) > @@ -18861,7 +18851,7 @@ index 8704bc215f4..c1bf438bda6 100755 > ;; > esac > else > -@@ -10019,23 +10596,36 @@ fi > +@@ -10016,23 +10593,36 @@ fi > > irix5* | irix6* | nonstopux*) > if test "$GCC" = yes; then > @@ -18906,7 +18896,7 @@ index 8704bc215f4..c1bf438bda6 100755 > 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' > -@@ -10120,7 +10710,7 @@ rm -f core conftest.err conftest.$ac_objext \ > +@@ -10117,7 +10707,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}\*' > @@ -18915,7 +18905,7 @@ index 8704bc215f4..c1bf438bda6 100755 > hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' > else > allow_undefined_flag=' -expect_unresolved \*' > -@@ -10139,9 +10729,9 @@ rm -f core conftest.err conftest.$ac_objext \ > +@@ -10136,9 +10726,9 @@ rm -f core conftest.err conftest.$ac_objext \ > no_undefined_flag=' -z defs' > if test "$GCC" = yes; then > wlarc='${wl}' > @@ -18927,7 +18917,7 @@ index 8704bc215f4..c1bf438bda6 100755 > else > case `$CC -V 2>&1` in > *"Compilers 5.0"*) > -@@ -10717,8 +11307,9 @@ cygwin* | mingw* | pw32* | cegcc*) > +@@ -10714,8 +11304,9 @@ cygwin* | mingw* | pw32* | cegcc*) > need_version=no > need_lib_prefix=no > > @@ -18939,7 +18929,7 @@ index 8704bc215f4..c1bf438bda6 100755 > library_names_spec='$libname.dll.a' > # DLL is installed to $(libdir)/../bin by postinstall_cmds > postinstall_cmds='base_file=`basename \${file}`~ > -@@ -10751,13 +11342,71 @@ cygwin* | mingw* | pw32* | cegcc*) > +@@ -10748,13 +11339,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 > @@ -19012,16 +19002,16 @@ index 8704bc215f4..c1bf438bda6 100755 > # FIXME: first we should search . and the directory the executable is in > shlibpath_var=PATH > ;; > -@@ -11635,7 +12284,7 @@ else > +@@ -11632,7 +12281,7 @@ else > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF > --#line 11638 "configure" > +-#line 11635 "configure" > +#line $LINENO "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > -@@ -11679,10 +12328,10 @@ else > +@@ -11676,10 +12325,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)) > @@ -19034,16 +19024,16 @@ index 8704bc215f4..c1bf438bda6 100755 > int main () > { > void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > -@@ -11741,7 +12390,7 @@ else > +@@ -11738,7 +12387,7 @@ else > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF > --#line 11744 "configure" > +-#line 11741 "configure" > +#line $LINENO "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > -@@ -11785,10 +12434,10 @@ else > +@@ -11782,10 +12431,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)) > @@ -19056,7 +19046,7 @@ index 8704bc215f4..c1bf438bda6 100755 > int main () > { > void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > -@@ -14473,13 +15122,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' > +@@ -15832,13 +16481,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"`' > @@ -19077,7 +19067,7 @@ index 8704bc215f4..c1bf438bda6 100755 > 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"`' > -@@ -14494,14 +15150,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de > +@@ -15853,14 +16509,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"`' > @@ -19096,7 +19086,7 @@ index 8704bc215f4..c1bf438bda6 100755 > DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' > NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' > LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' > -@@ -14534,12 +15193,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q > +@@ -15893,12 +16552,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"`' > @@ -19110,7 +19100,7 @@ index 8704bc215f4..c1bf438bda6 100755 > 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"`' > -@@ -14594,8 +15253,13 @@ reload_flag \ > +@@ -15953,8 +16612,13 @@ reload_flag \ > OBJDUMP \ > deplibs_check_method \ > file_magic_cmd \ > @@ -19124,7 +19114,7 @@ index 8704bc215f4..c1bf438bda6 100755 > STRIP \ > RANLIB \ > CC \ > -@@ -14605,12 +15269,14 @@ lt_cv_sys_global_symbol_pipe \ > +@@ -15964,12 +16628,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 \ > @@ -19140,7 +19130,7 @@ index 8704bc215f4..c1bf438bda6 100755 > DSYMUTIL \ > NMEDIT \ > LIPO \ > -@@ -14626,7 +15292,6 @@ no_undefined_flag \ > +@@ -15985,7 +16651,6 @@ no_undefined_flag \ > hardcode_libdir_flag_spec \ > hardcode_libdir_flag_spec_ld \ > hardcode_libdir_separator \ > @@ -19148,7 +19138,7 @@ index 8704bc215f4..c1bf438bda6 100755 > exclude_expsyms \ > include_expsyms \ > file_list_spec \ > -@@ -14662,6 +15327,7 @@ module_cmds \ > +@@ -16021,6 +16686,7 @@ module_cmds \ > module_expsym_cmds \ > export_symbols_cmds \ > prelink_cmds \ > @@ -19156,7 +19146,7 @@ index 8704bc215f4..c1bf438bda6 100755 > postinstall_cmds \ > postuninstall_cmds \ > finish_cmds \ > -@@ -15418,7 +16084,8 @@ $as_echo X"$file" | > +@@ -16778,7 +17444,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, > @@ -19166,7 +19156,7 @@ index 8704bc215f4..c1bf438bda6 100755 > # Written by Gordon Matzigkeit, 1996 > # > # This file is part of GNU Libtool. > -@@ -15521,19 +16188,42 @@ SP2NL=$lt_lt_SP2NL > +@@ -16881,19 +17548,42 @@ SP2NL=$lt_lt_SP2NL > # turn newlines into spaces. > NL2SP=$lt_lt_NL2SP > > @@ -19210,7 +19200,7 @@ index 8704bc215f4..c1bf438bda6 100755 > # A symbol stripping program. > STRIP=$lt_STRIP > > -@@ -15563,6 +16253,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address > +@@ -16923,6 +17613,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 > > @@ -19223,7 +19213,7 @@ index 8704bc215f4..c1bf438bda6 100755 > # The name of the directory that contains temporary libtool files. > objdir=$objdir > > -@@ -15572,6 +16268,9 @@ MAGIC_CMD=$MAGIC_CMD > +@@ -16932,6 +17628,9 @@ MAGIC_CMD=$MAGIC_CMD > # Must we lock files when doing compilation? > need_locks=$lt_need_locks > > @@ -19233,7 +19223,7 @@ index 8704bc215f4..c1bf438bda6 100755 > # Tool to manipulate archived DWARF debug symbol files on Mac OS X. > DSYMUTIL=$lt_DSYMUTIL > > -@@ -15686,12 +16385,12 @@ with_gcc=$GCC > +@@ -17046,12 +17745,12 @@ with_gcc=$GCC > # Compiler flag to turn off builtin functions. > no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag > > @@ -19249,7 +19239,7 @@ index 8704bc215f4..c1bf438bda6 100755 > # Compiler flag to prevent dynamic linking. > link_static_flag=$lt_lt_prog_compiler_static > > -@@ -15778,9 +16477,6 @@ inherit_rpath=$inherit_rpath > +@@ -17138,9 +17837,6 @@ inherit_rpath=$inherit_rpath > # Whether libtool must link a program against all its dependency libraries. > link_all_deplibs=$link_all_deplibs > > @@ -19259,7 +19249,7 @@ index 8704bc215f4..c1bf438bda6 100755 > # Set to "yes" if exported symbols are required. > always_export_symbols=$always_export_symbols > > -@@ -15796,6 +16492,9 @@ include_expsyms=$lt_include_expsyms > +@@ -17156,6 +17852,9 @@ include_expsyms=$lt_include_expsyms > # Commands necessary for linking programs (against libraries) with templates. > prelink_cmds=$lt_prelink_cmds > > @@ -19269,7 +19259,7 @@ index 8704bc215f4..c1bf438bda6 100755 > # Specify filename containing input files. > file_list_spec=$lt_file_list_spec > > -@@ -15828,210 +16527,169 @@ ltmain="$ac_aux_dir/ltmain.sh" > +@@ -17188,210 +17887,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? > @@ -19643,1442 +19633,1155 @@ index 8704bc215f4..c1bf438bda6 100755 > (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") > chmod +x "$ofile" > > -diff --git a/libtool.m4 b/libtool.m4 > -index ad63ebbb385..b65c22bf80d 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 @@ > +diff --git a/libsframe/Makefile.in b/libsframe/Makefile.in > +index 107b82ccfdc..4a4459bf5eb 100644 > +--- a/libsframe/Makefile.in > ++++ b/libsframe/Makefile.in > +@@ -1,7 +1,7 @@ > +-# Makefile.in generated by automake 1.15.1 from Makefile.am. > ++# Makefile.in generated by automake 1.16.5 from Makefile.am. > + # @configure_input@ > > - 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. > - ]) > +-# Copyright (C) 1994-2017 Free Software Foundation, Inc. > ++# Copyright (C) 1994-2021 Free Software Foundation, Inc. > > --# serial 56 LT_INIT > -+# serial 57 LT_INIT > + # This Makefile.in is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -139,6 +139,10 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs > + CONFIG_HEADER = config.h > + CONFIG_CLEAN_FILES = > + CONFIG_CLEAN_VPATH_FILES = > ++@HAVE_COMPAT_DEJAGNU_TRUE@am__EXEEXT_1 = testsuite/libsframe.decode/be-flipping$(EXEEXT) \ > ++@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-1$(EXEEXT) \ > ++@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-2$(EXEEXT) \ > ++@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.encode/encode-1$(EXEEXT) > + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; > + am__vpath_adj = case $$p in \ > + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ > +@@ -179,27 +183,27 @@ am__v_lt_0 = --silent > + am__v_lt_1 = > + @INSTALL_LIBBFD_FALSE@am_libsframe_la_rpath = > + @INSTALL_LIBBFD_TRUE@am_libsframe_la_rpath = -rpath $(libdir) > +-@HAVE_COMPAT_DEJAGNU_TRUE@am__EXEEXT_1 = testsuite/libsframe.decode/be-flipping$(EXEEXT) \ > +-@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-1$(EXEEXT) \ > +-@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.decode/frecnt-2$(EXEEXT) \ > +-@HAVE_COMPAT_DEJAGNU_TRUE@ testsuite/libsframe.encode/encode-1$(EXEEXT) > + am__dirstamp = $(am__leading_dot)dirstamp > +-am_testsuite_libsframe_decode_be_flipping_OBJECTS = testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.$(OBJEXT) > ++am_testsuite_libsframe_decode_be_flipping_OBJECTS = \ > ++ testsuite/libsframe.decode/be_flipping-be-flipping.$(OBJEXT) > + testsuite_libsframe_decode_be_flipping_OBJECTS = \ > + $(am_testsuite_libsframe_decode_be_flipping_OBJECTS) > + testsuite_libsframe_decode_be_flipping_DEPENDENCIES = \ > + ${top_builddir}/libsframe.la > +-am_testsuite_libsframe_decode_frecnt_1_OBJECTS = testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.$(OBJEXT) > ++am_testsuite_libsframe_decode_frecnt_1_OBJECTS = \ > ++ testsuite/libsframe.decode/frecnt_1-frecnt-1.$(OBJEXT) > + testsuite_libsframe_decode_frecnt_1_OBJECTS = \ > + $(am_testsuite_libsframe_decode_frecnt_1_OBJECTS) > + testsuite_libsframe_decode_frecnt_1_DEPENDENCIES = \ > + ${top_builddir}/libsframe.la > +-am_testsuite_libsframe_decode_frecnt_2_OBJECTS = testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.$(OBJEXT) > ++am_testsuite_libsframe_decode_frecnt_2_OBJECTS = \ > ++ testsuite/libsframe.decode/frecnt_2-frecnt-2.$(OBJEXT) > + testsuite_libsframe_decode_frecnt_2_OBJECTS = \ > + $(am_testsuite_libsframe_decode_frecnt_2_OBJECTS) > + testsuite_libsframe_decode_frecnt_2_DEPENDENCIES = \ > + ${top_builddir}/libsframe.la > +-am_testsuite_libsframe_encode_encode_1_OBJECTS = testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.$(OBJEXT) > ++am_testsuite_libsframe_encode_encode_1_OBJECTS = \ > ++ testsuite/libsframe.encode/encode_1-encode-1.$(OBJEXT) > + testsuite_libsframe_encode_encode_1_OBJECTS = \ > + $(am_testsuite_libsframe_encode_encode_1_OBJECTS) > + testsuite_libsframe_encode_encode_1_DEPENDENCIES = \ > +@@ -218,7 +222,14 @@ am__v_at_0 = @ > + am__v_at_1 = > + DEFAULT_INCLUDES = -I.@am__isrc@ > + depcomp = $(SHELL) $(top_srcdir)/../depcomp > +-am__depfiles_maybe = depfiles > ++am__maybe_remake_depfiles = depfiles > ++am__depfiles_remade = ./$(DEPDIR)/libsframe_la-sframe-dump.Plo \ > ++ ./$(DEPDIR)/libsframe_la-sframe-error.Plo \ > ++ ./$(DEPDIR)/libsframe_la-sframe.Plo \ > ++ testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po \ > ++ testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po \ > ++ testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po \ > ++ testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po > + am__mv = mv -f > + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ > + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) > +@@ -295,8 +306,8 @@ am__can_run_installinfo = \ > + esac > + am__include_HEADERS_DIST = $(INCDIR)/sframe.h $(INCDIR)/sframe-api.h > + HEADERS = $(include_HEADERS) > +-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ > +- $(LISP)config.h.in > ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ > ++ config.h.in > + # Read a list of newline-separated strings from the standard input, > + # and print each of them once, without duplicates. Input order is > + # *not* preserved. > +@@ -313,9 +324,6 @@ am__define_uniq_tagged_files = \ > + unique=`for i in $$list; do \ > + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ > + done | $(am__uniquify_input)` > +-ETAGS = etags > +-CTAGS = ctags > +-CSCOPE = cscope > + AM_RECURSIVE_TARGETS = cscope > + DEJATOOL = $(PACKAGE) > + RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir > +@@ -341,6 +349,8 @@ am__post_remove_distdir = $(am__remove_distdir) > + DIST_ARCHIVES = $(distdir).tar.gz > + GZIP_ENV = --best > + DIST_TARGETS = dist-gzip > ++# Exists only to be overridden by the user if desired. > ++AM_DISTCHECK_DVI_TARGET = dvi > + distuninstallcheck_listfiles = find . -type f -print > + am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ > + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' > +@@ -359,15 +369,19 @@ CFLAGS = @CFLAGS@ > + COMPAT_DEJAGNU = @COMPAT_DEJAGNU@ > + CPP = @CPP@ > + CPPFLAGS = @CPPFLAGS@ > ++CSCOPE = @CSCOPE@ > ++CTAGS = @CTAGS@ > + CYGPATH_W = @CYGPATH_W@ > + DEFS = @DEFS@ > + DEPDIR = @DEPDIR@ > ++DLLTOOL = @DLLTOOL@ > + DSYMUTIL = @DSYMUTIL@ > + DUMPBIN = @DUMPBIN@ > + ECHO_C = @ECHO_C@ > + ECHO_N = @ECHO_N@ > + ECHO_T = @ECHO_T@ > + EGREP = @EGREP@ > ++ETAGS = @ETAGS@ > + EXEEXT = @EXEEXT@ > + FGREP = @FGREP@ > + GREP = @GREP@ > +@@ -386,6 +400,7 @@ LN_S = @LN_S@ > + LTLIBOBJS = @LTLIBOBJS@ > + MAINT = @MAINT@ > + MAKEINFO = @MAKEINFO@ > ++MANIFEST_TOOL = @MANIFEST_TOOL@ > + MKDIR_P = @MKDIR_P@ > + NM = @NM@ > + NMEDIT = @NMEDIT@ > +@@ -541,8 +556,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status > + echo ' $(SHELL) ./config.status'; \ > + $(SHELL) ./config.status;; \ > + *) \ > +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ > +- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ > ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ > ++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ > + esac; > + $(srcdir)/doc/local.mk $(srcdir)/testsuite/local.mk $(srcdir)/testsuite/libsframe.decode/local.mk $(srcdir)/testsuite/libsframe.encode/local.mk $(am__empty): > + > +@@ -570,6 +585,15 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) > + distclean-hdr: > + -rm -f config.h stamp-h1 > + > ++clean-checkPROGRAMS: > ++ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ > ++ echo " rm -f" $$list; \ > ++ rm -f $$list || exit $$?; \ > ++ test -n "$(EXEEXT)" || exit 0; \ > ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ > ++ echo " rm -f" $$list; \ > ++ rm -f $$list > ++ > + install-libLTLIBRARIES: $(lib_LTLIBRARIES) > + @$(NORMAL_INSTALL) > + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ > +@@ -618,36 +642,27 @@ clean-noinstLTLIBRARIES: > + > + libsframe.la: $(libsframe_la_OBJECTS) $(libsframe_la_DEPENDENCIES) $(EXTRA_libsframe_la_DEPENDENCIES) > + $(AM_V_CCLD)$(LINK) $(am_libsframe_la_rpath) $(libsframe_la_OBJECTS) $(libsframe_la_LIBADD) $(LIBS) > +- > +-clean-checkPROGRAMS: > +- @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ > +- echo " rm -f" $$list; \ > +- rm -f $$list || exit $$?; \ > +- test -n "$(EXEEXT)" || exit 0; \ > +- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ > +- echo " rm -f" $$list; \ > +- rm -f $$list > + testsuite/libsframe.decode/$(am__dirstamp): > + @$(MKDIR_P) testsuite/libsframe.decode > + @: > testsuite/libsframe.decode/$(am__dirstamp) > + testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp): > + @$(MKDIR_P) testsuite/libsframe.decode/$(DEPDIR) > + @: > testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) > +-testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.$(OBJEXT): \ > ++testsuite/libsframe.decode/be_flipping-be-flipping.$(OBJEXT): \ > + testsuite/libsframe.decode/$(am__dirstamp) \ > + testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) > + > + testsuite/libsframe.decode/be-flipping$(EXEEXT): $(testsuite_libsframe_decode_be_flipping_OBJECTS) $(testsuite_libsframe_decode_be_flipping_DEPENDENCIES) $(EXTRA_testsuite_libsframe_decode_be_flipping_DEPENDENCIES) testsuite/libsframe.decode/$(am__dirstamp) > + @rm -f testsuite/libsframe.decode/be-flipping$(EXEEXT) > + $(AM_V_CCLD)$(LINK) $(testsuite_libsframe_decode_be_flipping_OBJECTS) $(testsuite_libsframe_decode_be_flipping_LDADD) $(LIBS) > +-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.$(OBJEXT): \ > ++testsuite/libsframe.decode/frecnt_1-frecnt-1.$(OBJEXT): \ > + testsuite/libsframe.decode/$(am__dirstamp) \ > + testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) > + > + testsuite/libsframe.decode/frecnt-1$(EXEEXT): $(testsuite_libsframe_decode_frecnt_1_OBJECTS) $(testsuite_libsframe_decode_frecnt_1_DEPENDENCIES) $(EXTRA_testsuite_libsframe_decode_frecnt_1_DEPENDENCIES) testsuite/libsframe.decode/$(am__dirstamp) > + @rm -f testsuite/libsframe.decode/frecnt-1$(EXEEXT) > + $(AM_V_CCLD)$(LINK) $(testsuite_libsframe_decode_frecnt_1_OBJECTS) $(testsuite_libsframe_decode_frecnt_1_LDADD) $(LIBS) > +-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.$(OBJEXT): \ > ++testsuite/libsframe.decode/frecnt_2-frecnt-2.$(OBJEXT): \ > + testsuite/libsframe.decode/$(am__dirstamp) \ > + testsuite/libsframe.decode/$(DEPDIR)/$(am__dirstamp) > + > +@@ -660,7 +675,7 @@ testsuite/libsframe.encode/$(am__dirstamp): > + testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp): > + @$(MKDIR_P) testsuite/libsframe.encode/$(DEPDIR) > + @: > testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp) > +-testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.$(OBJEXT): \ > ++testsuite/libsframe.encode/encode_1-encode-1.$(OBJEXT): \ > + testsuite/libsframe.encode/$(am__dirstamp) \ > + testsuite/libsframe.encode/$(DEPDIR)/$(am__dirstamp) > + > +@@ -676,13 +691,19 @@ mostlyclean-compile: > + distclean-compile: > + -rm -f *.tab.c > > +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-dump.Plo@am__quote@ > +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-error.Plo@am__quote@ > +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe.Plo@am__quote@ > +-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Po@am__quote@ > +-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Po@am__quote@ > +-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Po@am__quote@ > +-@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Po@am__quote@ > ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-dump.Plo@am__quote@ # am--include-marker > ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe-error.Plo@am__quote@ # am--include-marker > ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsframe_la-sframe.Plo@am__quote@ # am--include-marker > ++@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po@am__quote@ # am--include-marker > ++@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po@am__quote@ # am--include-marker > ++@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po@am__quote@ # am--include-marker > ++@AMDEP_TRUE@@am__include@ @am__quote@testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po@am__quote@ # am--include-marker > ++ > ++$(am__depfiles_remade): > ++ @$(MKDIR_P) $(@D) > ++ @echo '# dummy' >$@-t && $(am__mv) $@-t $@ > ++ > ++am--depfiles: $(am__depfiles_remade) > > - # LT_PREREQ(VERSION) > -@@ -166,10 +168,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 > + .c.o: > + @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ > +@@ -729,61 +750,61 @@ libsframe_la-sframe-error.lo: sframe-error.c > + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ > + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsframe_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsframe_la-sframe-error.lo `test -f 'sframe-error.c' || echo '$(srcdir)/'`sframe-error.c > + > +-testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o: testsuite/libsframe.decode/be-flipping.c > +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o `test -f 'testsuite/libsframe.decode/be-flipping.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/be-flipping.c > +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Po > +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/be-flipping.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o' libtool=no @AMDEPBACKSLASH@ > ++testsuite/libsframe.decode/be_flipping-be-flipping.o: testsuite/libsframe.decode/be-flipping.c > ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/be_flipping-be-flipping.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Tpo -c -o testsuite/libsframe.decode/be_flipping-be-flipping.o `test -f 'testsuite/libsframe.decode/be-flipping.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/be-flipping.c > ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Tpo testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po > ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/be-flipping.c' object='testsuite/libsframe.decode/be_flipping-be-flipping.o' libtool=no @AMDEPBACKSLASH@ > + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ > +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.o `test -f 'testsuite/libsframe.decode/be-flipping.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/be-flipping.c > ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/be_flipping-be-flipping.o `test -f 'testsuite/libsframe.decode/be-flipping.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/be-flipping.c > + > +-testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj: testsuite/libsframe.decode/be-flipping.c > +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj `if test -f 'testsuite/libsframe.decode/be-flipping.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/be-flipping.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/be-flipping.c'; fi` > +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_be_flipping-be-flipping.Po > +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/be-flipping.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj' libtool=no @AMDEPBACKSLASH@ > ++testsuite/libsframe.decode/be_flipping-be-flipping.obj: testsuite/libsframe.decode/be-flipping.c > ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/be_flipping-be-flipping.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Tpo -c -o testsuite/libsframe.decode/be_flipping-be-flipping.obj `if test -f 'testsuite/libsframe.decode/be-flipping.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/be-flipping.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/be-flipping.c'; fi` > ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Tpo testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po > ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/be-flipping.c' object='testsuite/libsframe.decode/be_flipping-be-flipping.obj' libtool=no @AMDEPBACKSLASH@ > + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ > +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_be_flipping-be-flipping.obj `if test -f 'testsuite/libsframe.decode/be-flipping.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/be-flipping.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/be-flipping.c'; fi` > ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_be_flipping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/be_flipping-be-flipping.obj `if test -f 'testsuite/libsframe.decode/be-flipping.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/be-flipping.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/be-flipping.c'; fi` > + > +-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o: testsuite/libsframe.decode/frecnt-1.c > +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o `test -f 'testsuite/libsframe.decode/frecnt-1.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-1.c > +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Po > +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-1.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o' libtool=no @AMDEPBACKSLASH@ > ++testsuite/libsframe.decode/frecnt_1-frecnt-1.o: testsuite/libsframe.decode/frecnt-1.c > ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/frecnt_1-frecnt-1.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Tpo -c -o testsuite/libsframe.decode/frecnt_1-frecnt-1.o `test -f 'testsuite/libsframe.decode/frecnt-1.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-1.c > ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Tpo testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po > ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-1.c' object='testsuite/libsframe.decode/frecnt_1-frecnt-1.o' libtool=no @AMDEPBACKSLASH@ > + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ > +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.o `test -f 'testsuite/libsframe.decode/frecnt-1.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-1.c > ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/frecnt_1-frecnt-1.o `test -f 'testsuite/libsframe.decode/frecnt-1.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-1.c > + > +-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj: testsuite/libsframe.decode/frecnt-1.c > +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj `if test -f 'testsuite/libsframe.decode/frecnt-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-1.c'; fi` > +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_1-frecnt-1.Po > +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-1.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj' libtool=no @AMDEPBACKSLASH@ > ++testsuite/libsframe.decode/frecnt_1-frecnt-1.obj: testsuite/libsframe.decode/frecnt-1.c > ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/frecnt_1-frecnt-1.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Tpo -c -o testsuite/libsframe.decode/frecnt_1-frecnt-1.obj `if test -f 'testsuite/libsframe.decode/frecnt-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-1.c'; fi` > ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Tpo testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po > ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-1.c' object='testsuite/libsframe.decode/frecnt_1-frecnt-1.obj' libtool=no @AMDEPBACKSLASH@ > + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ > +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_1-frecnt-1.obj `if test -f 'testsuite/libsframe.decode/frecnt-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-1.c'; fi` > ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/frecnt_1-frecnt-1.obj `if test -f 'testsuite/libsframe.decode/frecnt-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-1.c'; fi` > + > +-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o: testsuite/libsframe.decode/frecnt-2.c > +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o `test -f 'testsuite/libsframe.decode/frecnt-2.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-2.c > +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Po > +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-2.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o' libtool=no @AMDEPBACKSLASH@ > ++testsuite/libsframe.decode/frecnt_2-frecnt-2.o: testsuite/libsframe.decode/frecnt-2.c > ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/frecnt_2-frecnt-2.o -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Tpo -c -o testsuite/libsframe.decode/frecnt_2-frecnt-2.o `test -f 'testsuite/libsframe.decode/frecnt-2.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-2.c > ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Tpo testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po > ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-2.c' object='testsuite/libsframe.decode/frecnt_2-frecnt-2.o' libtool=no @AMDEPBACKSLASH@ > + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ > +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.o `test -f 'testsuite/libsframe.decode/frecnt-2.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-2.c > ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/frecnt_2-frecnt-2.o `test -f 'testsuite/libsframe.decode/frecnt-2.c' || echo '$(srcdir)/'`testsuite/libsframe.decode/frecnt-2.c > + > +-testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj: testsuite/libsframe.decode/frecnt-2.c > +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Tpo -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj `if test -f 'testsuite/libsframe.decode/frecnt-2.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-2.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-2.c'; fi` > +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Tpo testsuite/libsframe.decode/$(DEPDIR)/testsuite_libsframe_decode_frecnt_2-frecnt-2.Po > +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-2.c' object='testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj' libtool=no @AMDEPBACKSLASH@ > ++testsuite/libsframe.decode/frecnt_2-frecnt-2.obj: testsuite/libsframe.decode/frecnt-2.c > ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.decode/frecnt_2-frecnt-2.obj -MD -MP -MF testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Tpo -c -o testsuite/libsframe.decode/frecnt_2-frecnt-2.obj `if test -f 'testsuite/libsframe.decode/frecnt-2.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-2.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-2.c'; fi` > ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Tpo testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po > ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.decode/frecnt-2.c' object='testsuite/libsframe.decode/frecnt_2-frecnt-2.obj' libtool=no @AMDEPBACKSLASH@ > + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ > +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/testsuite_libsframe_decode_frecnt_2-frecnt-2.obj `if test -f 'testsuite/libsframe.decode/frecnt-2.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-2.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-2.c'; fi` > ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_decode_frecnt_2_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.decode/frecnt_2-frecnt-2.obj `if test -f 'testsuite/libsframe.decode/frecnt-2.c'; then $(CYGPATH_W) 'testsuite/libsframe.decode/frecnt-2.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.decode/frecnt-2.c'; fi` > + > +-testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o: testsuite/libsframe.encode/encode-1.c > +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o -MD -MP -MF testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Tpo -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o `test -f 'testsuite/libsframe.encode/encode-1.c' || echo '$(srcdir)/'`testsuite/libsframe.encode/encode-1.c > +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Tpo testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Po > +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.encode/encode-1.c' object='testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o' libtool=no @AMDEPBACKSLASH@ > ++testsuite/libsframe.encode/encode_1-encode-1.o: testsuite/libsframe.encode/encode-1.c > ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.encode/encode_1-encode-1.o -MD -MP -MF testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Tpo -c -o testsuite/libsframe.encode/encode_1-encode-1.o `test -f 'testsuite/libsframe.encode/encode-1.c' || echo '$(srcdir)/'`testsuite/libsframe.encode/encode-1.c > ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Tpo testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po > ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.encode/encode-1.c' object='testsuite/libsframe.encode/encode_1-encode-1.o' libtool=no @AMDEPBACKSLASH@ > + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ > +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.o `test -f 'testsuite/libsframe.encode/encode-1.c' || echo '$(srcdir)/'`testsuite/libsframe.encode/encode-1.c > ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/encode_1-encode-1.o `test -f 'testsuite/libsframe.encode/encode-1.c' || echo '$(srcdir)/'`testsuite/libsframe.encode/encode-1.c > + > +-testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj: testsuite/libsframe.encode/encode-1.c > +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj -MD -MP -MF testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Tpo -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi` > +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Tpo testsuite/libsframe.encode/$(DEPDIR)/testsuite_libsframe_encode_encode_1-encode-1.Po > +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.encode/encode-1.c' object='testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj' libtool=no @AMDEPBACKSLASH@ > ++testsuite/libsframe.encode/encode_1-encode-1.obj: testsuite/libsframe.encode/encode-1.c > ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testsuite/libsframe.encode/encode_1-encode-1.obj -MD -MP -MF testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Tpo -c -o testsuite/libsframe.encode/encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi` > ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Tpo testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po > ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testsuite/libsframe.encode/encode-1.c' object='testsuite/libsframe.encode/encode_1-encode-1.obj' libtool=no @AMDEPBACKSLASH@ > + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ > +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/testsuite_libsframe_encode_encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi` > ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testsuite_libsframe_encode_encode_1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testsuite/libsframe.encode/encode_1-encode-1.obj `if test -f 'testsuite/libsframe.encode/encode-1.c'; then $(CYGPATH_W) 'testsuite/libsframe.encode/encode-1.c'; else $(CYGPATH_W) '$(srcdir)/testsuite/libsframe.encode/encode-1.c'; fi` > + > + mostlyclean-libtool: > + -rm -f *.lo > +@@ -1020,7 +1041,7 @@ site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG) > + @echo '# Do not edit here. If you wish to override these values' >>site.tmp > + @echo '# edit the last section' >>site.tmp > + @echo 'set srcdir "$(srcdir)"' >>site.tmp > +- @echo "set objdir `pwd`" >>site.tmp > ++ @echo "set objdir \"`pwd`\"" >>site.tmp > + @echo 'set build_alias "$(build_alias)"' >>site.tmp > + @echo 'set build_triplet $(build_triplet)' >>site.tmp > + @echo 'set host_alias "$(host_alias)"' >>site.tmp > +@@ -1044,8 +1065,10 @@ distclean-DEJAGNU: > + -l='$(DEJATOOL)'; for tool in $$l; do \ > + rm -f $$tool.sum $$tool.log; \ > + done > ++distdir: $(BUILT_SOURCES) > ++ $(MAKE) $(AM_MAKEFLAGS) distdir-am > > - _LT_CONFIG_LIBTOOL_INIT([ > - # See if we are running on zsh, and set the options which allow our > -@@ -632,7 +637,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. > +-distdir: $(DISTFILES) > ++distdir-am: $(DISTFILES) > + $(am__remove_distdir) > + test -d "$(distdir)" || mkdir "$(distdir)" > + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ > +@@ -1103,6 +1126,10 @@ dist-xz: distdir > + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz > + $(am__post_remove_distdir) > > --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." > ++dist-zstd: distdir > ++ tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst > ++ $(am__post_remove_distdir) > ++ > + dist-tarZ: distdir > + @echo WARNING: "Support for distribution archives compressed with" \ > + "legacy program 'compress' is deprecated." >&2 > +@@ -1145,6 +1172,8 @@ distcheck: dist > + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ > + *.zip*) \ > + unzip $(distdir).zip ;;\ > ++ *.tar.zst*) \ > ++ zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ > + esac > + chmod -R a-w $(distdir) > + chmod u+w $(distdir) > +@@ -1160,7 +1189,7 @@ distcheck: dist > + $(DISTCHECK_CONFIGURE_FLAGS) \ > + --srcdir=../.. --prefix="$$dc_install_base" \ > + && $(MAKE) $(AM_MAKEFLAGS) \ > +- && $(MAKE) $(AM_MAKEFLAGS) dvi \ > ++ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ > + && $(MAKE) $(AM_MAKEFLAGS) check \ > + && $(MAKE) $(AM_MAKEFLAGS) install \ > + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ > +@@ -1216,6 +1245,8 @@ check-am: all-am > + $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU > + check: check-am > + all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h > ++install-checkPROGRAMS: install-libLTLIBRARIES > ++ > + installdirs: > + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includedir)"; do \ > + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ > +@@ -1266,7 +1297,13 @@ clean-am: clean-aminfo clean-checkPROGRAMS clean-generic \ > > -@@ -746,15 +751,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) > + distclean: distclean-am > + -rm -f $(am__CONFIG_DISTCLEAN_FILES) > +- -rm -rf ./$(DEPDIR) testsuite/libsframe.decode/$(DEPDIR) testsuite/libsframe.encode/$(DEPDIR) > ++ -rm -f ./$(DEPDIR)/libsframe_la-sframe-dump.Plo > ++ -rm -f ./$(DEPDIR)/libsframe_la-sframe-error.Plo > ++ -rm -f ./$(DEPDIR)/libsframe_la-sframe.Plo > ++ -rm -f testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po > ++ -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po > ++ -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po > ++ -rm -f testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po > + -rm -f Makefile > + distclean-am: clean-am distclean-DEJAGNU distclean-compile \ > + distclean-generic distclean-hdr distclean-libtool \ > +@@ -1406,7 +1443,13 @@ installcheck-am: > + maintainer-clean: maintainer-clean-am > + -rm -f $(am__CONFIG_DISTCLEAN_FILES) > + -rm -rf $(top_srcdir)/autom4te.cache > +- -rm -rf ./$(DEPDIR) testsuite/libsframe.decode/$(DEPDIR) testsuite/libsframe.encode/$(DEPDIR) > ++ -rm -f ./$(DEPDIR)/libsframe_la-sframe-dump.Plo > ++ -rm -f ./$(DEPDIR)/libsframe_la-sframe-error.Plo > ++ -rm -f ./$(DEPDIR)/libsframe_la-sframe.Plo > ++ -rm -f testsuite/libsframe.decode/$(DEPDIR)/be_flipping-be-flipping.Po > ++ -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_1-frecnt-1.Po > ++ -rm -f testsuite/libsframe.decode/$(DEPDIR)/frecnt_2-frecnt-2.Po > ++ -rm -f testsuite/libsframe.encode/$(DEPDIR)/encode_1-encode-1.Po > + -rm -f Makefile > + maintainer-clean-am: distclean-am maintainer-clean-aminfo \ > + maintainer-clean-generic > +@@ -1430,28 +1473,28 @@ uninstall-am: uninstall-dvi-am uninstall-html-am \ > + > + .MAKE: all check-am install-am install-strip > + > +-.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-DEJAGNU \ > +- check-am clean clean-aminfo clean-checkPROGRAMS clean-cscope \ > +- clean-generic clean-libLTLIBRARIES clean-libtool \ > ++.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \ > ++ check-DEJAGNU check-am clean clean-aminfo clean-checkPROGRAMS \ > ++ clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \ > + clean-noinstLTLIBRARIES cscope cscopelist-am ctags ctags-am \ > + dist dist-all dist-bzip2 dist-gzip dist-info dist-lzip \ > +- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ > +- distclean-DEJAGNU distclean-compile distclean-generic \ > +- distclean-hdr distclean-libtool distclean-tags distcleancheck \ > +- distdir distuninstallcheck dvi dvi-am html html-am html-local \ > +- info info-am install install-am install-data install-data-am \ > +- install-dvi install-dvi-am install-exec install-exec-am \ > +- install-html install-html-am install-includeHEADERS \ > +- install-info install-info-am install-libLTLIBRARIES \ > +- install-man install-pdf install-pdf-am install-ps \ > +- install-ps-am install-strip installcheck installcheck-am \ > +- installdirs maintainer-clean maintainer-clean-aminfo \ > +- maintainer-clean-generic mostlyclean mostlyclean-aminfo \ > +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ > +- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ > +- uninstall-dvi-am uninstall-html-am uninstall-includeHEADERS \ > +- uninstall-info-am uninstall-libLTLIBRARIES uninstall-pdf-am \ > +- uninstall-ps-am > ++ dist-shar dist-tarZ dist-xz dist-zip dist-zstd distcheck \ > ++ distclean distclean-DEJAGNU distclean-compile \ > ++ distclean-generic distclean-hdr distclean-libtool \ > ++ distclean-tags distcleancheck distdir distuninstallcheck dvi \ > ++ dvi-am html html-am html-local info info-am install install-am \ > ++ install-data install-data-am install-dvi install-dvi-am \ > ++ install-exec install-exec-am install-html install-html-am \ > ++ install-includeHEADERS install-info install-info-am \ > ++ install-libLTLIBRARIES install-man install-pdf install-pdf-am \ > ++ install-ps install-ps-am install-strip installcheck \ > ++ installcheck-am installdirs maintainer-clean \ > ++ maintainer-clean-aminfo maintainer-clean-generic mostlyclean \ > ++ mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \ > ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ > ++ uninstall-am uninstall-dvi-am uninstall-html-am \ > ++ uninstall-includeHEADERS uninstall-info-am \ > ++ uninstall-libLTLIBRARIES uninstall-pdf-am uninstall-ps-am > + > + .PRECIOUS: Makefile > + > +diff --git a/libsframe/aclocal.m4 b/libsframe/aclocal.m4 > +index b0cdd6b184d..c83d4f62ece 100644 > +--- a/libsframe/aclocal.m4 > ++++ b/libsframe/aclocal.m4 > +@@ -1,6 +1,6 @@ > +-# generated automatically by aclocal 1.15.1 -*- Autoconf -*- > ++# generated automatically by aclocal 1.16.5 -*- Autoconf -*- > > -- _LT_PROG_XSI_SHELLFNS > -+ _LT_PROG_REPLACE_SHELLFNS > +-# Copyright (C) 1996-2017 Free Software Foundation, Inc. > ++# Copyright (C) 1996-2021 Free Software Foundation, Inc. > > -- 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 +982,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 +1073,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], > - fi > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. > + If you have problems, you may need to regenerate the build system entirely. > + To do so, use the procedure documented by the package, typically 'autoreconf'.])]) > + > +-# Copyright (C) 2002-2017 Free Software Foundation, Inc. > ++# Copyright (C) 2002-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) > + # generated from the m4 files accompanying Automake X.Y. > + # (This private macro should not be called outside this file.) > + AC_DEFUN([AM_AUTOMAKE_VERSION], > +-[am__api_version='1.15' > ++[am__api_version='1.16' > + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to > + dnl require some minimum version. Point them to the right macro. > +-m4_if([$1], [1.15.1], [], > ++m4_if([$1], [1.16.5], [], > + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl > ]) > > --# _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_SOURCE([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 > +@@ -51,12 +51,12 @@ m4_define([_AM_AUTOCONF_VERSION], []) > + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. > + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. > + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], > +-[AM_AUTOMAKE_VERSION([1.15.1])dnl > ++[AM_AUTOMAKE_VERSION([1.16.5])dnl > + m4_ifndef([AC_AUTOCONF_VERSION], > + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl > + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) > > +-# Copyright (C) 2011-2017 Free Software Foundation, Inc. > ++# Copyright (C) 2011-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -118,7 +118,7 @@ AC_SUBST([AR])dnl > > -@@ -1117,7 +1132,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO > + # AM_AUX_DIR_EXPAND -*- Autoconf -*- > > - 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 +1176,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) > - ])# _LT_PROG_ECHO_BACKSLASH > +-# Copyright (C) 2001-2017 Free Software Foundation, Inc. > ++# Copyright (C) 2001-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -170,7 +170,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` > > + # AM_CONDITIONAL -*- Autoconf -*- > > -+# _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,6 +1368,51 @@ need_locks="$enable_libtool_lock" > - ])# _LT_ENABLE_LOCK > +-# Copyright (C) 1997-2017 Free Software Foundation, Inc. > ++# Copyright (C) 1997-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -201,7 +201,7 @@ AC_CONFIG_COMMANDS_PRE( > + Usually this means the macro was only invoked conditionally.]]) > + fi])]) > > +-# Copyright (C) 1999-2017 Free Software Foundation, Inc. > ++# Copyright (C) 1999-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -392,13 +392,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl > > -+# _LT_PROG_AR > -+# ----------- > -+m4_defun([_LT_PROG_AR], > -+[AC_CHECK_TOOLS(AR, [ar], false) > -+ touch conftest.c > -+ $AR $plugin_option rc conftest.a conftest.c > -+ if test "$?" != 0; then > -+ AC_MSG_WARN([Failed: $AR $plugin_option rc]) > -+ else > -+ AR="$AR $plugin_option" > + # Generate code to set up dependency tracking. -*- Autoconf -*- > + > +-# Copyright (C) 1999-2017 Free Software Foundation, Inc. > ++# Copyright (C) 1999-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > + # with or without modifications, as long as this notice is preserved. > + > +- > + # _AM_OUTPUT_DEPENDENCY_COMMANDS > + # ------------------------------ > + AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], > +@@ -406,49 +405,43 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], > + # Older Autoconf quotes --file arguments for eval, but not when files > + # are listed without --file. Let's play safe and only enable the eval > + # if we detect the quoting. > +- case $CONFIG_FILES in > +- *\'*) eval set x "$CONFIG_FILES" ;; > +- *) set x $CONFIG_FILES ;; > +- esac > ++ # TODO: see whether this extra hack can be removed once we start > ++ # requiring Autoconf 2.70 or later. > ++ AS_CASE([$CONFIG_FILES], > ++ [*\'*], [eval set x "$CONFIG_FILES"], > ++ [*], [set x $CONFIG_FILES]) > + shift > +- for mf > ++ # Used to flag and report bootstrapping failures. > ++ am_rc=0 > ++ for am_mf > + do > + # Strip MF so we end up with the name of the file. > +- mf=`echo "$mf" | sed -e 's/:.*$//'` > +- # Check whether this is an Automake generated Makefile or not. > +- # We used to match only the files named 'Makefile.in', but > +- # some people rename them; so instead we look at the file content. > +- # Grep'ing the first line is not enough: some people post-process > +- # each Makefile.in and add a new line on top of each file to say so. > +- # Grep'ing the whole file is not good either: AIX grep has a line > ++ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` > ++ # Check whether this is an Automake generated Makefile which includes > ++ # dependency-tracking related rules and includes. > ++ # Grep'ing the whole file directly is not great: AIX grep has a line > + # limit of 2048, but all sed's we know have understand at least 4000. > +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then > +- dirpart=`AS_DIRNAME("$mf")` > +- else > +- continue > +- fi > +- # Extract the definition of DEPDIR, am__include, and am__quote > +- # from the Makefile without running 'make'. > +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` > +- test -z "$DEPDIR" && continue > +- am__include=`sed -n 's/^am__include = //p' < "$mf"` > +- test -z "$am__include" && continue > +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` > +- # Find all dependency output files, they are included files with > +- # $(DEPDIR) in their names. We invoke sed twice because it is the > +- # simplest approach to changing $(DEPDIR) to its actual value in the > +- # expansion. > +- for file in `sed -n " > +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ > +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do > +- # Make sure the directory exists. > +- test -f "$dirpart/$file" && continue > +- fdir=`AS_DIRNAME(["$file"])` > +- AS_MKDIR_P([$dirpart/$fdir]) > +- # echo "creating $dirpart/$file" > +- echo '# dummy' > "$dirpart/$file" > +- done > ++ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ > ++ || continue > ++ am_dirpart=`AS_DIRNAME(["$am_mf"])` > ++ am_filepart=`AS_BASENAME(["$am_mf"])` > ++ AM_RUN_LOG([cd "$am_dirpart" \ > ++ && sed -e '/# am--include-marker/d' "$am_filepart" \ > ++ | $MAKE -f - am--depfiles]) || am_rc=$? > + done > ++ if test $am_rc -ne 0; then > ++ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments > ++ for automatic dependency tracking. If GNU make was not used, consider > ++ re-running the configure script with MAKE="gmake" (or whatever is > ++ necessary). You can also try re-running configure with the > ++ '--disable-dependency-tracking' option to at least be able to build > ++ the package (albeit without support for automatic dependency tracking).]) > + fi > -+ rm -f conftest.* > -+: ${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 > ++ AS_UNSET([am_dirpart]) > ++ AS_UNSET([am_filepart]) > ++ AS_UNSET([am_mf]) > ++ AS_UNSET([am_rc]) > ++ rm -f conftest-deps.mk > + } > + ])# _AM_OUTPUT_DEPENDENCY_COMMANDS > + > +@@ -457,18 +450,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], > + # ----------------------------- > + # This macro should only be invoked once -- use via AC_REQUIRE. > + # > +-# This code is only required when automatic dependency tracking > +-# is enabled. FIXME. This creates each '.P' file that we will > +-# need in order to bootstrap the dependency handling code. > ++# This code is only required when automatic dependency tracking is enabled. > ++# This creates each '.Po' and '.Plo' makefile fragment that we'll need in > ++# order to bootstrap the dependency handling code. > + AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], > + [AC_CONFIG_COMMANDS([depfiles], > + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], > +- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) > +-]) > ++ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) > + > + # Do all the work for Automake. -*- Autoconf -*- > + > +-# Copyright (C) 1996-2017 Free Software Foundation, Inc. > ++# Copyright (C) 1996-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -496,6 +488,10 @@ m4_defn([AC_PROG_CC]) > + # release and drop the old call support. > + AC_DEFUN([AM_INIT_AUTOMAKE], > + [AC_PREREQ([2.65])dnl > ++m4_ifdef([_$0_ALREADY_INIT], > ++ [m4_fatal([$0 expanded multiple times > ++]m4_defn([_$0_ALREADY_INIT]))], > ++ [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl > + dnl Autoconf wants to disallow AM_ names. We explicitly allow > + dnl the ones we care about. > + m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl > +@@ -532,7 +528,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl > + [_AM_SET_OPTIONS([$1])dnl > + dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. > + m4_if( > +- m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), > ++ m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), > + [ok:ok],, > + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl > + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl > +@@ -555,8 +551,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl > + AC_REQUIRE([AC_PROG_MKDIR_P])dnl > + # For better backward compatibility. To be removed once Automake 1.9.x > + # dies out for good. For more background, see: > +-# > +-# > ++# > ++# > + AC_SUBST([mkdir_p], ['$(MKDIR_P)']) > + # We need awk for the "check" target (and possibly the TAP driver). The > + # system "awk" is bad on some platforms. > +@@ -584,6 +580,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], > + [m4_define([AC_PROG_OBJCXX], > + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl > + ]) > ++# Variables for tags utilities; see am/tags.am > ++if test -z "$CTAGS"; then > ++ CTAGS=ctags > +fi > -+_LT_DECL([], [archiver_list_spec], [1], > -+ [How to feed a file listing to the archiver]) > -+])# _LT_PROG_AR > -+ > ++AC_SUBST([CTAGS]) > ++if test -z "$ETAGS"; then > ++ ETAGS=etags > ++fi > ++AC_SUBST([ETAGS]) > ++if test -z "$CSCOPE"; then > ++ CSCOPE=cscope > ++fi > ++AC_SUBST([CSCOPE]) > + > - # _LT_CMD_OLD_ARCHIVE > - # ------------------- > - m4_defun([_LT_CMD_OLD_ARCHIVE], > -@@ -1336,23 +1429,7 @@ for plugin in $plugin_names; do > - fi > + AC_REQUIRE([AM_SILENT_RULES])dnl > + dnl The testsuite driver may need to know about EXEEXT, so add the > + dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This > +@@ -623,7 +633,7 @@ END > + Aborting the configuration process, to ensure you take notice of the issue. > + > + You can download and install GNU coreutils to get an 'rm' implementation > +-that behaves properly: . > ++that behaves properly: . > + > + If you want to complete the configuration process using your problematic > + 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM > +@@ -665,7 +675,7 @@ for _am_header in $config_headers :; do > done > + echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) > > --AC_CHECK_TOOL(AR, ar, false) > --test -z "$AR" && AR=ar > --if test -n "$plugin_option"; then > -- if $AR --help 2>&1 | grep -q "\--plugin"; then > -- touch conftest.c > -- $AR $plugin_option rc conftest.a conftest.c > -- if test "$?" != 0; then > -- AC_MSG_WARN([Failed: $AR $plugin_option rc]) > -- else > -- AR="$AR $plugin_option" > -- fi > -- rm -f conftest.* > -- fi > --fi > --test -z "$AR_FLAGS" && AR_FLAGS=cru > --_LT_DECL([], [AR], [1], [The archiver]) > --_LT_DECL([], [AR_FLAGS], [1]) > -+_LT_PROG_AR > +-# Copyright (C) 2001-2017 Free Software Foundation, Inc. > ++# Copyright (C) 2001-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -689,7 +699,7 @@ AC_SUBST([install_sh])]) > + # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- > + # From Jim Meyering > > - AC_CHECK_TOOL(STRIP, strip, :) > - test -z "$STRIP" && STRIP=: > -@@ -1653,7 +1730,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" > +-# Copyright (C) 1996-2017 Free Software Foundation, Inc. > ++# Copyright (C) 1996-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -724,7 +734,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) > > - #if HAVE_DLFCN_H > -@@ -1697,10 +1774,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 > + # Check to see how 'make' treats includes. -*- Autoconf -*- > > --void fnord () { int i=42; } > -+int fnord () { return 42; } > - int main () > - { > - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > -@@ -2240,8 +2317,9 @@ cygwin* | mingw* | pw32* | cegcc*) > - need_version=no > - need_lib_prefix=no > +-# Copyright (C) 2001-2017 Free Software Foundation, Inc. > ++# Copyright (C) 2001-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -732,49 +742,42 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) > > -- 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}`~ > -@@ -2274,13 +2352,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 > - ;; > -@@ -2970,6 +3106,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' > -@@ -3036,7 +3177,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 > - ;; > -@@ -3187,6 +3329,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 > -@@ -3194,7 +3351,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 > + # AM_MAKE_INCLUDE() > + # ----------------- > +-# Check to see how make treats includes. > ++# Check whether make has an 'include' directive that can support all > ++# the idioms we need for our automatic dependency tracking code. > + AC_DEFUN([AM_MAKE_INCLUDE], > +-[am_make=${MAKE-make} > +-cat > confinc << 'END' > ++[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) > ++cat > confinc.mk << 'END' > + am__doit: > +- @echo this is the am__doit target > ++ @echo this is the am__doit target >confinc.out > + .PHONY: am__doit > + END > +-# If we don't find an include directive, just comment out the code. > +-AC_MSG_CHECKING([for style of include used by $am_make]) > + am__include="#" > + am__quote= > +-_am_result=none > +-# First try GNU make style include. > +-echo "include confinc" > confmf > +-# Ignore all kinds of additional output from 'make'. > +-case `$am_make -s -f confmf 2> /dev/null` in #( > +-*the\ am__doit\ target*) > +- am__include=include > +- am__quote= > +- _am_result=GNU > +- ;; > +-esac > +-# Now try BSD make style include. > +-if test "$am__include" = "#"; then > +- echo '.include "confinc"' > confmf > +- case `$am_make -s -f confmf 2> /dev/null` in #( > +- *the\ am__doit\ target*) > +- am__include=.include > +- am__quote="\"" > +- _am_result=BSD > +- ;; > +- esac > +-fi > +-AC_SUBST([am__include]) > +-AC_SUBST([am__quote]) > +-AC_MSG_RESULT([$_am_result]) > +-rm -f confinc confmf > +-]) > ++# BSD make does it like this. > ++echo '.include "confinc.mk" # ignored' > confmf.BSD > ++# Other make implementations (GNU, Solaris 10, AIX) do it like this. > ++echo 'include confinc.mk # ignored' > confmf.GNU > ++_am_result=no > ++for s in GNU BSD; do > ++ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) > ++ AS_CASE([$?:`cat confinc.out 2>/dev/null`], > ++ ['0:this is the am__doit target'], > ++ [AS_CASE([$s], > ++ [BSD], [am__include='.include' am__quote='"'], > ++ [am__include='include' am__quote=''])]) > ++ if test "$am__include" != "#"; then > ++ _am_result="yes ($s style)" > ++ break > ++ fi > ++done > ++rm -f confinc.* confmf.* > ++AC_MSG_RESULT([${_am_result}]) > ++AC_SUBST([am__include])]) > ++AC_SUBST([am__quote])]) > > + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- > > -@@ -3305,6 +3466,67 @@ dnl aclocal-1.4 backwards compatibility: > - dnl AC_DEFUN([AM_PROG_NM], []) > - dnl AC_DEFUN([AC_PROG_NM], []) > +-# Copyright (C) 1997-2017 Free Software Foundation, Inc. > ++# Copyright (C) 1997-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -795,12 +798,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN], > + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl > + AC_REQUIRE_AUX_FILE([missing])dnl > + if test x"${MISSING+set}" != xset; then > +- case $am_aux_dir in > +- *\ * | *\ *) > +- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; > +- *) > +- MISSING="\${SHELL} $am_aux_dir/missing" ;; > +- esac > ++ MISSING="\${SHELL} '$am_aux_dir/missing'" > + fi > + # Use eval to expand $SHELL > + if eval "$MISSING --is-lightweight"; then > +@@ -813,7 +811,7 @@ fi > > -+# _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 > -+ > + # Helper functions for option handling. -*- Autoconf -*- > > - # LT_LIB_M > - # -------- > -@@ -3431,8 +3653,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'" > +-# Copyright (C) 2001-2017 Free Software Foundation, Inc. > ++# Copyright (C) 2001-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -842,7 +840,7 @@ AC_DEFUN([_AM_SET_OPTIONS], > + AC_DEFUN([_AM_IF_OPTION], > + [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) > > - # 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'" > +-# Copyright (C) 1999-2017 Free Software Foundation, Inc. > ++# Copyright (C) 1999-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -889,7 +887,7 @@ AC_LANG_POP([C])]) > + # For backward compatibility. > + AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) > > - # Handle CRLF in mingw tool chain > - opt_cr= > -@@ -3468,6 +3690,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'" > +-# Copyright (C) 2001-2017 Free Software Foundation, Inc. > ++# Copyright (C) 2001-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -908,7 +906,7 @@ AC_DEFUN([AM_RUN_LOG], > > - # Check to see that the pipe works correctly. > - pipe_works=no > -@@ -3501,6 +3724,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 > -@@ -3512,7 +3747,7 @@ _LT_EOF > - cat <<_LT_EOF >> conftest.$ac_ext > + # Check to make sure that the build environment is sane. -*- Autoconf -*- > > - /* The mapping between symbol names and symbols. */ > --const struct { > -+LT@&t@_DLSYM_CONST struct { > - const char *name; > - void *address; > - } > -@@ -3538,15 +3773,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 > -@@ -3579,6 +3814,13 @@ else > - AC_MSG_RESULT(ok) > - fi > +-# Copyright (C) 1996-2017 Free Software Foundation, Inc. > ++# Copyright (C) 1996-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -989,7 +987,7 @@ AC_CONFIG_COMMANDS_PRE( > + rm -f conftest.file > + ]) > > -+# 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], > -@@ -3589,6 +3831,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 > +-# Copyright (C) 2009-2017 Free Software Foundation, Inc. > ++# Copyright (C) 2009-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -1049,7 +1047,7 @@ AC_SUBST([AM_BACKSLASH])dnl > + _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl > + ]) > > +-# Copyright (C) 2001-2017 Free Software Foundation, Inc. > ++# Copyright (C) 2001-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -1077,7 +1075,7 @@ fi > + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" > + AC_SUBST([INSTALL_STRIP_PROGRAM])]) > > -@@ -3600,7 +3844,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= > - _LT_TAGVAR(lt_prog_compiler_pic, $1)= > - _LT_TAGVAR(lt_prog_compiler_static, $1)= > +-# Copyright (C) 2006-2017 Free Software Foundation, Inc. > ++# Copyright (C) 2006-2021 Free Software Foundation, Inc. > + # > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +@@ -1096,7 +1094,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) > > --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 > -@@ -3706,6 +3949,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++*) > -@@ -3858,7 +4107,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' > -@@ -4081,6 +4330,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) > -@@ -4143,7 +4398,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,';; > -@@ -4200,9 +4455,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 how to create a tarball. -*- Autoconf -*- > > +-# Copyright (C) 2004-2017 Free Software Foundation, Inc. > ++# Copyright (C) 2004-2021 Free Software Foundation, Inc. > # > - # Check to make sure the PIC flag actually works. > -@@ -4221,6 +4478,8 @@ fi > - _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], > - [Additional compiler flags for building library objects]) > + # This file is free software; the Free Software Foundation > + # gives unlimited permission to copy and/or distribute it, > +diff --git a/libsframe/configure b/libsframe/configure > +index 7bbed5d8ccf..795e7802110 100755 > +--- a/libsframe/configure > ++++ b/libsframe/configure > +@@ -654,6 +654,8 @@ OTOOL > + LIPO > + NMEDIT > + DSYMUTIL > ++MANIFEST_TOOL > ++DLLTOOL > + OBJDUMP > + LN_S > + NM > +@@ -678,6 +680,9 @@ AM_BACKSLASH > + AM_DEFAULT_VERBOSITY > + AM_DEFAULT_V > + AM_V > ++CSCOPE > ++ETAGS > ++CTAGS > + am__fastdepCC_FALSE > + am__fastdepCC_TRUE > + CCDEPMODE > +@@ -685,7 +690,6 @@ am__nodep > + AMDEPBACKSLASH > + AMDEP_FALSE > + AMDEP_TRUE > +-am__quote > + am__include > + DEPDIR > + am__untar > +@@ -758,7 +762,8 @@ PACKAGE_VERSION > + PACKAGE_TARNAME > + PACKAGE_NAME > + PATH_SEPARATOR > +-SHELL' > ++SHELL > ++am__quote' > + ac_subst_files='' > + ac_user_opts=' > + enable_option_checking > +@@ -769,6 +774,7 @@ enable_static > + with_pic > + enable_fast_install > + with_gnu_ld > ++with_libtool_sysroot > + enable_libtool_lock > + enable_largefile > + enable_maintainer_mode > +@@ -1424,6 +1430,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). > > -+_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. > - # > -@@ -4241,6 +4500,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 > -@@ -4249,6 +4509,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. > -@@ -4263,15 +4524,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)= > -@@ -4439,7 +4705,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'] > + Some influential environment variables: > + CC C compiler command > +@@ -3606,7 +3614,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } > + $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h > > - 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' > -@@ -4538,12 +4805,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 > -@@ -4557,8 +4824,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 > - ;; > > -@@ -4576,8 +4843,8 @@ _LT_EOF > +-am__api_version='1.15' > ++am__api_version='1.16' > > - _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 > -@@ -4623,8 +4890,8 @@ _LT_EOF > + # Find a good install program. We prefer a C program (faster), > + # so one script is as good as another. But avoid the broken or > +@@ -3779,12 +3787,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' > + program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` > > - *) > - 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 > -@@ -4754,7 +5021,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 > -@@ -4765,7 +5032,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. > -@@ -4809,20 +5076,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 > - ;; > + if test x"${MISSING+set}" != xset; then > +- case $am_aux_dir in > +- *\ * | *\ *) > +- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; > +- *) > +- MISSING="\${SHELL} $am_aux_dir/missing" ;; > +- esac > ++ MISSING="\${SHELL} '$am_aux_dir/missing'" > + fi > + # Use eval to expand $SHELL > + if eval "$MISSING --is-lightweight"; then > +@@ -4032,45 +4035,45 @@ DEPDIR="${am__leading_dot}deps" > > - darwin* | rhapsody*) > -@@ -4856,7 +5166,7 @@ _LT_EOF > + ac_config_commands="$ac_config_commands depfiles" > > - # 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 > -@@ -4864,7 +5174,7 @@ _LT_EOF > +- > +-am_make=${MAKE-make} > +-cat > confinc << 'END' > ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 > ++$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } > ++cat > confinc.mk << 'END' > + am__doit: > +- @echo this is the am__doit target > ++ @echo this is the am__doit target >confinc.out > + .PHONY: am__doit > + END > +-# If we don't find an include directive, just comment out the code. > +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 > +-$as_echo_n "checking for style of include used by $am_make... " >&6; } > + am__include="#" > + am__quote= > +-_am_result=none > +-# First try GNU make style include. > +-echo "include confinc" > confmf > +-# Ignore all kinds of additional output from 'make'. > +-case `$am_make -s -f confmf 2> /dev/null` in #( > +-*the\ am__doit\ target*) > +- am__include=include > +- am__quote= > +- _am_result=GNU > +- ;; > +-esac > +-# Now try BSD make style include. > +-if test "$am__include" = "#"; then > +- echo '.include "confinc"' > confmf > +- case `$am_make -s -f confmf 2> /dev/null` in #( > +- *the\ am__doit\ target*) > +- am__include=.include > +- am__quote="\"" > +- _am_result=BSD > ++# BSD make does it like this. > ++echo '.include "confinc.mk" # ignored' > confmf.BSD > ++# Other make implementations (GNU, Solaris 10, AIX) do it like this. > ++echo 'include confinc.mk # ignored' > confmf.GNU > ++_am_result=no > ++for s in GNU BSD; do > ++ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 > ++ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 > ++ ac_status=$? > ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 > ++ (exit $ac_status); } > ++ case $?:`cat confinc.out 2>/dev/null` in #( > ++ '0:this is the am__doit target') : > ++ case $s in #( > ++ BSD) : > ++ am__include='.include' am__quote='"' ;; #( > ++ *) : > ++ am__include='include' am__quote='' ;; > ++esac ;; #( > ++ *) : > + ;; > +- esac > +-fi > +- > +- > +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 > +-$as_echo "$_am_result" >&6; } > +-rm -f confinc confmf > ++esac > ++ if test "$am__include" != "#"; then > ++ _am_result="yes ($s style)" > ++ break > ++ fi > ++done > ++rm -f confinc.* confmf.* > ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 > ++$as_echo "${_am_result}" >&6; } > > - 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 > -@@ -4880,7 +5190,7 @@ _LT_EOF > + # Check whether --enable-dependency-tracking was given. > + if test "${enable_dependency_tracking+set}" = set; then : > +@@ -4182,8 +4185,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} > > - 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 > -@@ -4904,10 +5214,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 > -@@ -4954,16 +5264,31 @@ _LT_EOF > + # For better backward compatibility. To be removed once Automake 1.9.x > + # dies out for good. For more background, see: > +-# > +-# > ++# > ++# > + mkdir_p='$(MKDIR_P)' > > - 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([AC_LANG_SOURCE([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' > -@@ -5048,7 +5373,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 \*' > -@@ -5067,9 +5392,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"*) > -@@ -5341,8 +5666,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], > -@@ -5353,6 +5676,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 > -@@ -5454,6 +5779,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 > -@@ -5515,6 +5841,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 > -@@ -5532,6 +5859,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]) > -@@ -5695,7 +6023,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" > + # We need awk for the "check" target (and possibly the TAP driver). The > +@@ -4330,6 +4333,20 @@ else > + fi > > - _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" > -@@ -5707,7 +6035,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. > -@@ -5749,29 +6077,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 > ++# Variables for tags utilities; see am/tags.am > ++if test -z "$CTAGS"; then > ++ CTAGS=ctags > ++fi > ++ > ++if test -z "$ETAGS"; then > ++ ETAGS=etags > ++fi > ++ > ++if test -z "$CSCOPE"; then > ++ CSCOPE=cscope > ++fi > ++ > + > -+ 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) > - ;; > -@@ -5846,7 +6220,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 > -@@ -5917,10 +6291,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 > -@@ -5961,9 +6335,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 > -@@ -6033,20 +6407,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' > -@@ -6241,7 +6615,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 > > -@@ -6287,7 +6661,7 @@ if test "$_lt_caught_CXX_error" != yes; then > + # POSIX will say in a future version that running "rm -f" with no argument > + # is OK; and we want to be able to make that assumption in our Makefile > +@@ -4362,7 +4379,7 @@ END > + Aborting the configuration process, to ensure you take notice of the issue. > > - 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' > -@@ -6328,9 +6702,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' > + You can download and install GNU coreutils to get an 'rm' implementation > +-that behaves properly: . > ++that behaves properly: . > > - # Commands to make compiler produce verbose output that lists > - # what "hidden" libraries, object files and flags are used when > -@@ -6459,6 +6833,7 @@ if test "$_lt_caught_CXX_error" != yes; then > - fi # test -n "$compiler" > + If you want to complete the configuration process using your problematic > + 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM > +@@ -5308,8 +5325,8 @@ esac > > - CC=$lt_save_CC > -+ CFLAGS=$lt_save_CFLAGS > - LDCXX=$LD > - LD=$lt_save_LD > - GCC=$lt_save_GCC > -@@ -6473,6 +6848,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 > -@@ -6481,6 +6879,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)= > -@@ -6531,6 +6930,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 > -@@ -6542,7 +6948,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. > -@@ -6551,13 +6957,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. > -@@ -6577,8 +6992,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. > -@@ -6614,6 +7031,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], > -@@ -6650,7 +7068,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 > -@@ -6763,7 +7181,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]) > -@@ -6817,6 +7237,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 > -@@ -6893,7 +7314,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 > - > -@@ -6949,7 +7372,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 > -@@ -6986,10 +7410,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" > -@@ -7020,7 +7446,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 > - > - > -@@ -7055,9 +7482,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]) > -@@ -7070,7 +7499,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 > - > +-macro_version='2.2.7a' > +-macro_revision='1.3134' > ++macro_version='2.4' > ++macro_revision='1.3293' > > -@@ -7129,6 +7559,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 > - # ------------ > -@@ -7222,8 +7661,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], > +@@ -5420,7 +5437,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 > +@@ -6113,8 +6130,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" > @@ -21089,288 +20792,16 @@ index ad63ebbb385..b65c22bf80d 100644 > && eval 'test $(( 1 + 1 )) -eq 2 \ > && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ > && xsi_shell=yes > -@@ -7262,206 +7701,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl > - ])# _LT_CHECK_SHELL_FEATURES > +@@ -6163,6 +6180,80 @@ esac > > > --# _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=: > ++{ $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 ${lt_cv_to_host_file_cmd+:} false; then : > ++ $as_echo_n "(cached) " >&6 > +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 > ++ case $host in > + *-*-mingw* ) > + case $build in > + *-*-mingw* ) # actually msys > @@ -21383,18 +20814,7 @@ index ad63ebbb385..b65c22bf80d 100644 > + 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 > @@ -21407,21 +20827,28 @@ index ad63ebbb385..b65c22bf80d 100644 > + 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. > ++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 ${lt_cv_to_tool_file_cmd+:} false; 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* ) > @@ -21432,2675 +20859,6403 @@ index ad63ebbb385..b65c22bf80d 100644 > + esac > + ;; > +esac > - ]) > ++ > ++fi > ++ > +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 9503ec85d70..70e856e0659 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 , 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 . > -+# GNU libtool home page: . > -+# General help using GNU software: . > - > - 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 > ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 > ++$as_echo "$lt_cv_to_tool_file_cmd" >&6; } > + > + > -+# 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}" > ++ > + { $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 ${lt_cv_ld_reload_flag+:} false; then : > +@@ -6179,6 +6270,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 > -+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` > -+} # func_dirname_and_basename may be replaced by extended shell implementation > ++ ;; > + darwin*) > + if test "$GCC" = yes; then > + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' > +@@ -6347,7 +6443,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 > + ;; > +@@ -6501,6 +6598,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 > + > -+# 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 > + 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 > +@@ -6516,6 +6628,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown > > --# 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 > ++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 ${ac_cv_prog_DLLTOOL+:} false; 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 as_fn_executable_p "$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 > + > -+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 > ++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 > + > -+# 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 > + > ++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 ${ac_cv_prog_ac_ct_DLLTOOL+:} false; 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 as_fn_executable_p "$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 > + > -+# func_arith arithmetic-term... > -+func_arith () > -+{ > -+ func_arith_result=`expr "${@}"` > -+} # func_arith may be replaced by extended shell implementation > ++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 > + > -+# 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 > ++test -z "$DLLTOOL" && DLLTOOL=dlltool > + > + > -+# 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 > ++ > ++ > ++{ $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 ${lt_cv_sharedlib_from_linklib_cmd+:} false; 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 > + ;; > -+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) > -+ shift; set dummy --mode uninstall ${1+"$@"}; shift > ++*) > ++ # 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 > ++ > ++ > ++ > ++ > ++ > ++ > ++ > + plugin_option= > + plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" > + for plugin in $plugin_names; do > +@@ -6530,8 +6793,10 @@ for plugin in $plugin_names; do > + done > + > + 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 ${ac_cv_prog_AR+:} false; then : > +@@ -6547,7 +6812,7 @@ do > + test -z "$as_dir" && as_dir=. > + for ac_exec_ext in '' $ac_executable_extensions; do > + if as_fn_executable_p "$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 > +@@ -6567,11 +6832,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 ${ac_cv_prog_ac_ct_AR+:} false; then : > +@@ -6587,7 +6856,7 @@ do > + test -z "$as_dir" && as_dir=. > + for ac_exec_ext in '' $ac_executable_extensions; do > + if as_fn_executable_p "$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 > +@@ -6606,6 +6875,10 @@ else > + $as_echo "no" >&6; } > + fi > > -- # Parse non-mode specific arguments: > -- while test "$#" -gt 0; do > + > ++ test -n "$ac_ct_AR" && break > ++done > + > -+# 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 > + if test "x$ac_ct_AR" = x; then > + AR="false" > + else > +@@ -6617,29 +6890,81 @@ ac_tool_warned=yes ;; > + esac > + AR=$ac_ct_AR > + fi > +-else > +- AR="$ac_cv_prog_AR" > + fi > + > +-test -z "$AR" && AR=ar > +-if test -n "$plugin_option"; then > +- if $AR --help 2>&1 | grep -q "\--plugin"; then > +- touch conftest.c > +- $AR $plugin_option rc conftest.a conftest.c > +- if test "$?" != 0; then > +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 > ++ touch conftest.c > ++ $AR $plugin_option rc conftest.a conftest.c > ++ if test "$?" != 0; then > ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 > + $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} > +- else > +- AR="$AR $plugin_option" > +- fi > +- rm -f conftest.* > ++ else > ++ AR="$AR $plugin_option" > + fi > +-fi > +-test -z "$AR_FLAGS" && AR_FLAGS=cru > ++ rm -f conftest.* > ++: ${AR=ar} > ++: ${AR_FLAGS=cru} > + > + > -+# Parse options once, thoroughly. This comes as soon as possible in the > -+# script to make things like `--version' happen as quickly as we can. > ++ > ++ > ++ > ++ > ++ > + > + > + > + > ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 > ++$as_echo_n "checking for archiver @FILE support... " >&6; } > ++if ${lt_cv_ar_at_file+:} false; 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 () > +{ > -+ # 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 > - ;; > ++ ; > ++ 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 > + > -+ --) break ;; > -+ -*) func_fatal_help "unrecognized option \`$opt'" ;; > -+ *) set dummy "$opt" ${1+"$@"}; shift; break ;; > - esac > - done > - > -+ # Validate options: > ++fi > ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext > + > -+ # save first non-option argument > -+ if test "$#" -gt 0; then > -+ nonopt="$opt" > -+ shift > -+ fi > ++fi > ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 > ++$as_echo "$lt_cv_ar_at_file" >&6; } > + > -+ # preserve --debug > -+ test "$opt_debug" = : || func_append preserve_args " --debug" > ++if test "x$lt_cv_ar_at_file" = xno; then > ++ archiver_list_spec= > ++else > ++ archiver_list_spec=$lt_cv_ar_at_file > ++fi > > - 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 > +@@ -6986,8 +7311,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'" > > -- 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." > -+ } > + # 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= > +@@ -7023,6 +7348,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'" > > -- # Darwin sucks > -- eval "std_shrext=\"$shrext_cmds\"" > -+ # Bail if the options were screwed > -+ $exit_cmd $EXIT_FAILURE > -+} > + # Check to see that the pipe works correctly. > + pipe_works=no > +@@ -7064,6 +7390,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 > +@@ -7075,7 +7413,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; > + } > +@@ -7101,8 +7439,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 > +@@ -7112,8 +7450,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 > +@@ -7150,6 +7488,16 @@ else > + $as_echo "ok" >&6; } > + fi > > -- # 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 > ++# 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 > ++ > ++ > ++ > ++ > > -- # 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" > - } > +@@ -7166,6 +7514,45 @@ fi > > - # 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 > + > ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 > ++$as_echo_n "checking for sysroot... " >&6; } > + > -+# 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 > -+ > ++# 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 > + > -+# 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 > + > ++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 > + > -+# 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 > ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 > ++$as_echo "${lt_sysroot:-no}" >&6; } > + > + > + > +@@ -7371,11 +7758,128 @@ sparc*-*solaris*) > + ;; > + esac > + fi > +- rm -rf conftest* > +- ;; > ++ rm -rf conftest* > ++ ;; > ++esac > + > ++need_locks="$enable_libtool_lock" > + > -+# 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 > ++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 ${ac_cv_prog_MANIFEST_TOOL+:} false; 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 as_fn_executable_p "$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 > -+} > -+# end func_convert_path_check > -+ > ++done > ++ done > ++IFS=$as_save_IFS > + > -+# 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 > ++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 > + > + > -+################################################## > -+# $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. > ++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 ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; 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 as_fn_executable_p "$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 > + > -+# 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 > ++ 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 ${lt_cv_path_mainfest_tool+:} false; 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 > + > -+# 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 > + > +-need_locks="$enable_libtool_lock" > + > + > + case $host_os in > +@@ -7940,6 +8444,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 > +@@ -8492,8 +8998,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,' > +@@ -8659,6 +9163,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) > +@@ -8721,7 +9231,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,';; > +@@ -8778,13 +9288,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 ${lt_cv_prog_compiler_pic+:} false; 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. > +@@ -8845,6 +9359,11 @@ fi > + > + > + > + > + > -+# 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"` > ++ > + # > + # Check to make sure the static flag actually works. > + # > +@@ -9195,7 +9714,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' > +@@ -9294,12 +9814,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 > +@@ -9313,8 +9833,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 > + ;; > + > +@@ -9332,8 +9852,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 > +@@ -9379,8 +9899,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 > +@@ -9510,7 +10030,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 ${lt_cv_aix_libpath_+:} false; then : > ++ $as_echo_n "(cached) " >&6 > ++else > ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext > + /* end confdefs.h. */ > + > + int > +@@ -9523,22 +10049,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 > -+ func_convert_file_check "$1" "$func_to_host_file_result" > -+} > -+# end func_convert_file_cygwin_to_w32 > + > ++fi > + > -+# 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" > ++ 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" > +@@ -9550,7 +10083,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 ${lt_cv_aix_libpath_+:} false; then : > ++ $as_echo_n "(cached) " >&6 > ++else > ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext > + /* end confdefs.h. */ > + > + int > +@@ -9563,22 +10102,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 > -+} > -+# 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 > + 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 > -+} > -+# end func_convert_path_msys_to_cygwin > + > ++fi > + > -+# 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 > ++ aix_libpath=$lt_cv_aix_libpath_ > ++fi > > - # Add the arguments to base_compile. > -- base_compile="$base_compile $lastarg" > -+ func_append base_compile " $lastarg" > - continue > - ;; > + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" > + # Warning - without using the other run time loading flags, > +@@ -9623,20 +10169,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 > + ;; > > -@@ -1364,8 +2034,7 @@ func_mode_compile () > - esac # case $arg_mode > + darwin* | rhapsody*) > +@@ -9697,7 +10286,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > - # 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 > + # 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 > +@@ -9705,7 +10294,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > - case $arg_mode in > -@@ -1496,17 +2165,16 @@ compiler." > - $opt_dry_run || $RM $removelist > - exit $EXIT_FAILURE > + 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 > -- removelist="$removelist $output_obj" > -+ func_append removelist " $output_obj" > - $ECHO "$srcfile" > "$lockfile" > - fi > +@@ -9721,7 +10310,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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" > + 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 > +@@ -9745,10 +10334,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 > +@@ -9827,23 +10416,36 @@ 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 > + 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 ${lt_cv_irix_exported_symbol+:} false; 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' > +@@ -9928,7 +10530,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 \*' > +@@ -9947,9 +10549,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"*) > +@@ -10525,8 +11127,9 @@ cygwin* | mingw* | pw32* | cegcc*) > + need_version=no > + need_lib_prefix=no > > - # 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'" > - ;; > +- 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}`~ > +@@ -10559,13 +11162,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 > - > -@@ -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 > ++ dynamic_linker='Win32 ld.exe' > ++ ;; > + > - # 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 > ++ *,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' > + ;; > > -@@ -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 > + *) > ++ # 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 > + ;; > +@@ -11443,7 +12104,7 @@ else > + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > + lt_status=$lt_dlunknown > + cat > conftest.$ac_ext <<_LT_EOF > +-#line 11446 "configure" > ++#line $LINENO "configure" > + #include "confdefs.h" > > - if test "X$opt_dry_run" = Xfalse; then > -@@ -1972,22 +2642,59 @@ func_mode_execute () > - fi > - } > + #if HAVE_DLFCN_H > +@@ -11487,10 +12148,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 > > --test "$mode" = execute && func_mode_execute ${1+"$@"} > -+test "$opt_mode" = execute && func_mode_execute ${1+"$@"} > +-void fnord () { int i=42; } > ++int fnord () { return 42; } > + int main () > + { > + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > +@@ -11549,7 +12210,7 @@ else > + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > + lt_status=$lt_dlunknown > + cat > conftest.$ac_ext <<_LT_EOF > +-#line 11552 "configure" > ++#line $LINENO "configure" > + #include "confdefs.h" > > + #if HAVE_DLFCN_H > +@@ -11593,10 +12254,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 > > - # func_mode_finish arg... > - func_mode_finish () > +-void fnord () { int i=42; } > ++int fnord () { return 42; } > + int main () > { > - $opt_debug > -- libdirs="$nonopt" > -+ libs= > -+ libdirs= > - admincmds= > + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > +@@ -13361,7 +14022,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 > + # > + # INIT-COMMANDS > + # > +-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" > ++AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" > > -- 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 > + # The HP-UX ksh and POSIX shell print the target directory to stdout > +@@ -13399,13 +14060,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"`' > +@@ -13420,14 +14088,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"`' > +@@ -13460,12 +14131,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"`' > +@@ -13520,8 +14191,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 \ > +@@ -13531,12 +14207,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 \ > +@@ -13552,7 +14230,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 \ > +@@ -13588,6 +14265,7 @@ module_cmds \ > + module_expsym_cmds \ > + export_symbols_cmds \ > + prelink_cmds \ > ++postlink_cmds \ > + postinstall_cmds \ > + postuninstall_cmds \ > + finish_cmds \ > +@@ -14234,29 +14912,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} > + # Older Autoconf quotes --file arguments for eval, but not when files > + # are listed without --file. Let's play safe and only enable the eval > + # if we detect the quoting. > +- case $CONFIG_FILES in > +- *\'*) eval set x "$CONFIG_FILES" ;; > +- *) set x $CONFIG_FILES ;; > +- esac > ++ # TODO: see whether this extra hack can be removed once we start > ++ # requiring Autoconf 2.70 or later. > ++ case $CONFIG_FILES in #( > ++ *\'*) : > ++ eval set x "$CONFIG_FILES" ;; #( > ++ *) : > ++ set x $CONFIG_FILES ;; #( > ++ *) : > ++ ;; > ++esac > + shift > +- for mf > ++ # Used to flag and report bootstrapping failures. > ++ am_rc=0 > ++ for am_mf > + do > + # Strip MF so we end up with the name of the file. > +- mf=`echo "$mf" | sed -e 's/:.*$//'` > +- # Check whether this is an Automake generated Makefile or not. > +- # We used to match only the files named 'Makefile.in', but > +- # some people rename them; so instead we look at the file content. > +- # Grep'ing the first line is not enough: some people post-process > +- # each Makefile.in and add a new line on top of each file to say so. > +- # Grep'ing the whole file is not good either: AIX grep has a line > ++ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` > ++ # Check whether this is an Automake generated Makefile which includes > ++ # dependency-tracking related rules and includes. > ++ # Grep'ing the whole file directly is not great: AIX grep has a line > + # limit of 2048, but all sed's we know have understand at least 4000. > +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then > +- dirpart=`$as_dirname -- "$mf" || > +-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ > +- X"$mf" : 'X\(//\)[^/]' \| \ > +- X"$mf" : 'X\(//\)$' \| \ > +- X"$mf" : 'X\(/\)' \| . 2>/dev/null || > +-$as_echo X"$mf" | > ++ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ > ++ || continue > ++ am_dirpart=`$as_dirname -- "$am_mf" || > ++$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ > ++ X"$am_mf" : 'X\(//\)[^/]' \| \ > ++ X"$am_mf" : 'X\(//\)$' \| \ > ++ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || > ++$as_echo X"$am_mf" | > + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ > + s//\1/ > + q > +@@ -14274,53 +14958,50 @@ $as_echo X"$mf" | > + q > + } > + s/.*/./; q'` > +- else > +- continue > +- fi > +- # Extract the definition of DEPDIR, am__include, and am__quote > +- # from the Makefile without running 'make'. > +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` > +- test -z "$DEPDIR" && continue > +- am__include=`sed -n 's/^am__include = //p' < "$mf"` > +- test -z "$am__include" && continue > +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` > +- # Find all dependency output files, they are included files with > +- # $(DEPDIR) in their names. We invoke sed twice because it is the > +- # simplest approach to changing $(DEPDIR) to its actual value in the > +- # expansion. > +- for file in `sed -n " > +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ > +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do > +- # Make sure the directory exists. > +- test -f "$dirpart/$file" && continue > +- fdir=`$as_dirname -- "$file" || > +-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ > +- X"$file" : 'X\(//\)[^/]' \| \ > +- X"$file" : 'X\(//\)$' \| \ > +- X"$file" : 'X\(/\)' \| . 2>/dev/null || > +-$as_echo X"$file" | > +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ > +- s//\1/ > +- q > +- } > +- /^X\(\/\/\)[^/].*/{ > ++ am_filepart=`$as_basename -- "$am_mf" || > ++$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ > ++ X"$am_mf" : 'X\(//\)$' \| \ > ++ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || > ++$as_echo X/"$am_mf" | > ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ > + s//\1/ > + q > + } > +- /^X\(\/\/\)$/{ > ++ /^X\/\(\/\/\)$/{ > + s//\1/ > + q > + } > +- /^X\(\/\).*/{ > ++ /^X\/\(\/\).*/{ > + s//\1/ > + q > + } > + s/.*/./; q'` > +- as_dir=$dirpart/$fdir; as_fn_mkdir_p > +- # echo "creating $dirpart/$file" > +- echo '# dummy' > "$dirpart/$file" > +- done > ++ { echo "$as_me:$LINENO: cd "$am_dirpart" \ > ++ && sed -e '/# am--include-marker/d' "$am_filepart" \ > ++ | $MAKE -f - am--depfiles" >&5 > ++ (cd "$am_dirpart" \ > ++ && sed -e '/# am--include-marker/d' "$am_filepart" \ > ++ | $MAKE -f - am--depfiles) >&5 2>&5 > ++ ac_status=$? > ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 > ++ (exit $ac_status); } || am_rc=$? > + done > ++ if test $am_rc -ne 0; then > ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 > ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} > ++as_fn_error $? "Something went wrong bootstrapping makefile fragments > ++ for automatic dependency tracking. If GNU make was not used, consider > ++ re-running the configure script with MAKE=\"gmake\" (or whatever is > ++ necessary). You can also try re-running configure with the > ++ '--disable-dependency-tracking' option to at least be able to build > ++ the package (albeit without support for automatic dependency tracking). > ++See \`config.log' for more details" "$LINENO" 5; } > ++ fi > ++ { am_dirpart=; unset am_dirpart;} > ++ { am_filepart=; unset am_filepart;} > ++ { am_mf=; unset am_mf;} > ++ { am_rc=; unset am_rc;} > ++ rm -f conftest-deps.mk > + } > + ;; > + "libtool":C) > +@@ -14344,7 +15025,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. > +@@ -14447,19 +15129,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 > + > -+ 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 > ++# convert \$build files to toolchain format. > ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd > ++ > + # An object symbol dumper. > + OBJDUMP=$lt_OBJDUMP > > -- 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\" > + # Method to check whether dependent libraries are shared objects. > + deplibs_check_method=$lt_deplibs_check_method > > -- $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 > +-# 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 > > -- 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 > ++# How to find potential files when deplibs_check_method = "file_magic". > ++file_magic_glob=$lt_file_magic_glob > + > - # 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 > ++# Find potential files using nocaseglob when deplibs_check_method = "file_magic". > ++want_nocaseglob=$lt_want_nocaseglob > + > -+ func_stripname '' '/' "$destdir" > -+ s_destdir=$func_stripname_result > ++# DLL creation program. > ++DLLTOOL=$lt_DLLTOOL > + > - # 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\$%%"` > ++# 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 > > - # 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 $?' > ++# How to feed a file listing to the archiver. > ++archiver_list_spec=$lt_archiver_list_spec > ++ > + # A symbol stripping program. > + STRIP=$lt_STRIP > > - # 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" > - ;; > +@@ -14489,6 +15194,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 > > - *.lo) > -@@ -2503,7 +3222,7 @@ func_mode_install () > - test -n "$future_libdirs" && \ > - func_warning "remember to run \`$progname --finish$future_libdirs'" > ++# 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 > > -- 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 > - } > +@@ -14498,6 +15209,9 @@ MAGIC_CMD=$MAGIC_CMD > + # Must we lock files when doing compilation? > + need_locks=$lt_need_locks > > --test "$mode" = install && func_mode_install ${1+"$@"} > -+test "$opt_mode" = install && func_mode_install ${1+"$@"} > ++# Manifest tool. > ++MANIFEST_TOOL=$lt_MANIFEST_TOOL > ++ > + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. > + DSYMUTIL=$lt_DSYMUTIL > > +@@ -14612,12 +15326,12 @@ with_gcc=$GCC > + # Compiler flag to turn off builtin functions. > + no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag > > - # func_generate_dlsyms outputname originator pic_p > -@@ -2559,6 +3278,18 @@ extern \"C\" { > - #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" > - #endif > +-# 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 > > -+/* 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 > ++# How to pass a linker flag through the compiler. > ++wl=$lt_lt_prog_compiler_wl > + > - /* External symbol declarations for the compiler. */\ > - " > + # Compiler flag to prevent dynamic linking. > + link_static_flag=$lt_lt_prog_compiler_static > > -@@ -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 > +@@ -14704,9 +15418,6 @@ inherit_rpath=$inherit_rpath > + # Whether libtool must link a program against all its dependency libraries. > + link_all_deplibs=$link_all_deplibs > > - 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 > +-# 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 > > - 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 > +@@ -14722,6 +15433,9 @@ include_expsyms=$lt_include_expsyms > + # Commands necessary for linking programs (against libraries) with templates. > + prelink_cmds=$lt_prelink_cmds > > -@@ -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 . > -+ $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" > -+} > ++# Commands necessary for finishing linking programs. > ++postlink_cmds=$lt_postlink_cmds > + > -+# 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 > -+} > - > + # Specify filename containing input files. > + file_list_spec=$lt_file_list_spec > > - # 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 > +@@ -14754,210 +15468,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) > - > - $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+\"\$@\"} > --" > -- ;; > +- case $xsi_shell in > +- yes) > +- cat << \_LT_EOF >> "$cfgfile" > - > -- *) > -- $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_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_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 > +- case ${1} in > +- */*) func_dirname_result="${1%/*}${2}" ;; > +- * ) func_dirname_result="${3}" ;; > +- esac > -} > --# 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_basename file > +-func_basename () > -{ > -- 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 > +- func_basename_result="${1##*/}" > -} > --# 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. > +-# 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##*/}" > +-} > - > -- 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, ...) > +-# 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 () > -{ > -- va_list args; > -- va_start (args, fmt); > -- (void) vfprintf (stderr, fmt, args); > -- va_end (args); > +- # 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}"} > -} > -+#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 < --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 < --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 < - 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) > -+ { > +-# 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/libtool.m4 b/libtool.m4 > +index ad63ebbb385..b65c22bf80d 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) > +@@ -166,10 +168,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 > +@@ -632,7 +637,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 +751,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 +982,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 +1073,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_SOURCE([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 +1132,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 +1176,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,6 +1368,51 @@ need_locks="$enable_libtool_lock" > + ])# _LT_ENABLE_LOCK > + > + > ++# _LT_PROG_AR > ++# ----------- > ++m4_defun([_LT_PROG_AR], > ++[AC_CHECK_TOOLS(AR, [ar], false) > ++ touch conftest.c > ++ $AR $plugin_option rc conftest.a conftest.c > ++ if test "$?" != 0; then > ++ AC_MSG_WARN([Failed: $AR $plugin_option rc]) > ++ else > ++ AR="$AR $plugin_option" > ++ fi > ++ rm -f conftest.* > ++: ${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], > +@@ -1336,23 +1429,7 @@ for plugin in $plugin_names; do > + fi > + done > + > +-AC_CHECK_TOOL(AR, ar, false) > +-test -z "$AR" && AR=ar > +-if test -n "$plugin_option"; then > +- if $AR --help 2>&1 | grep -q "\--plugin"; then > +- touch conftest.c > +- $AR $plugin_option rc conftest.a conftest.c > +- if test "$?" != 0; then > +- AC_MSG_WARN([Failed: $AR $plugin_option rc]) > +- else > +- AR="$AR $plugin_option" > +- fi > +- rm -f conftest.* > +- fi > +-fi > +-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=: > +@@ -1653,7 +1730,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 > +@@ -1697,10 +1774,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); > +@@ -2240,8 +2317,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}`~ > +@@ -2274,13 +2352,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 > + ;; > +@@ -2970,6 +3106,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' > +@@ -3036,7 +3177,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 > + ;; > +@@ -3187,6 +3329,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 > +@@ -3194,7 +3351,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 > + > + > +@@ -3305,6 +3466,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 > + # -------- > +@@ -3431,8 +3653,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= > +@@ -3468,6 +3690,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 > +@@ -3501,6 +3724,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 > +@@ -3512,7 +3747,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; > + } > +@@ -3538,15 +3773,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 > +@@ -3579,6 +3814,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], > +@@ -3589,6 +3831,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 > + > + > +@@ -3600,7 +3844,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 > +@@ -3706,6 +3949,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++*) > +@@ -3858,7 +4107,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' > +@@ -4081,6 +4330,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) > +@@ -4143,7 +4398,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,';; > +@@ -4200,9 +4455,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. > +@@ -4221,6 +4478,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. > + # > +@@ -4241,6 +4500,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 > +@@ -4249,6 +4509,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. > +@@ -4263,15 +4524,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)= > +@@ -4439,7 +4705,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' > +@@ -4538,12 +4805,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 > +@@ -4557,8 +4824,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 > + ;; > + > +@@ -4576,8 +4843,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 > +@@ -4623,8 +4890,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 > +@@ -4754,7 +5021,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 > +@@ -4765,7 +5032,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. > +@@ -4809,20 +5076,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*) > +@@ -4856,7 +5166,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 > +@@ -4864,7 +5174,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 > +@@ -4880,7 +5190,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 > +@@ -4904,10 +5214,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 > +@@ -4954,16 +5264,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([AC_LANG_SOURCE([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' > +@@ -5048,7 +5373,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 \*' > +@@ -5067,9 +5392,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"*) > +@@ -5341,8 +5666,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], > +@@ -5353,6 +5676,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 > +@@ -5454,6 +5779,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 > +@@ -5515,6 +5841,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 > +@@ -5532,6 +5859,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]) > +@@ -5695,7 +6023,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" > +@@ -5707,7 +6035,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. > +@@ -5749,29 +6077,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) > + ;; > +@@ -5846,7 +6220,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 > +@@ -5917,10 +6291,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 > +@@ -5961,9 +6335,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 > +@@ -6033,20 +6407,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' > +@@ -6241,7 +6615,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 > + > +@@ -6287,7 +6661,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' > +@@ -6328,9 +6702,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 > +@@ -6459,6 +6833,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 > +@@ -6473,6 +6848,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 > +@@ -6481,6 +6879,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)= > +@@ -6531,6 +6930,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 > +@@ -6542,7 +6948,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. > +@@ -6551,13 +6957,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. > +@@ -6577,8 +6992,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. > +@@ -6614,6 +7031,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], > +@@ -6650,7 +7068,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 > +@@ -6763,7 +7181,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]) > +@@ -6817,6 +7237,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 > +@@ -6893,7 +7314,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 > + > +@@ -6949,7 +7372,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 > +@@ -6986,10 +7410,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" > +@@ -7020,7 +7446,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 > + > + > +@@ -7055,9 +7482,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]) > +@@ -7070,7 +7499,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 > + > + > +@@ -7129,6 +7559,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 > + # ------------ > +@@ -7222,8 +7661,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 > +@@ -7262,206 +7701,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 9503ec85d70..70e856e0659 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 , 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 . > ++# GNU libtool home page: . > ++# General help using GNU software: . > + > + 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 . > ++ $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 < +-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 < +-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 < + 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 > @@ -26696,271 +29851,752 @@ index bf87f77132d..9c7b5d41185 100644 > +# 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]) > +-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 bf92b5e0790..c573da90c5c 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/Makefile.in b/opcodes/Makefile.in > +index c1eca5a42ed..7cab295b26d 100644 > +--- a/opcodes/Makefile.in > ++++ b/opcodes/Makefile.in > +@@ -292,6 +292,7 @@ CYGPATH_W = @CYGPATH_W@ > + DATADIRNAME = @DATADIRNAME@ > + DEFS = @DEFS@ > + DEPDIR = @DEPDIR@ > ++DLLTOOL = @DLLTOOL@ > + DSYMUTIL = @DSYMUTIL@ > + DUMPBIN = @DUMPBIN@ > + ECHO_C = @ECHO_C@ > +@@ -325,6 +326,7 @@ LN_S = @LN_S@ > + LTLIBOBJS = @LTLIBOBJS@ > + MAINT = @MAINT@ > + MAKEINFO = @MAKEINFO@ > ++MANIFEST_TOOL = @MANIFEST_TOOL@ > + MKDIR_P = @MKDIR_P@ > + MKINSTALLDIRS = @MKINSTALLDIRS@ > + MSGFMT = @MSGFMT@ > +@@ -363,6 +365,7 @@ abs_builddir = @abs_builddir@ > + abs_srcdir = @abs_srcdir@ > + abs_top_builddir = @abs_top_builddir@ > + abs_top_srcdir = @abs_top_srcdir@ > ++ac_ct_AR = @ac_ct_AR@ > + ac_ct_CC = @ac_ct_CC@ > + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ > + am__include = @am__include@ > +diff --git a/opcodes/configure b/opcodes/configure > +index 483ae4f7a9c..907807594f9 100755 > +--- a/opcodes/configure > ++++ b/opcodes/configure > +@@ -682,6 +682,9 @@ OTOOL > + LIPO > + NMEDIT > + DSYMUTIL > ++MANIFEST_TOOL > ++ac_ct_AR > ++DLLTOOL > + OBJDUMP > + LN_S > + NM > +@@ -800,6 +803,7 @@ enable_static > + with_pic > + enable_fast_install > + with_gnu_ld > ++with_libtool_sysroot > + enable_libtool_lock > + enable_checking > + enable_targets > +@@ -1468,6 +1472,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 > +@@ -4977,8 +4983,8 @@ esac > + > + > + > +-macro_version='2.2.7a' > +-macro_revision='1.3134' > ++macro_version='2.4' > ++macro_revision='1.3293' > + > + > + > +@@ -5018,7 +5024,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 > +@@ -5711,8 +5717,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 > +@@ -5761,6 +5767,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 ${lt_cv_to_host_file_cmd+:} false; 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 ${lt_cv_to_tool_file_cmd+:} false; 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 ${lt_cv_ld_reload_flag+:} false; then : > +@@ -5777,6 +5857,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' > +@@ -5945,7 +6030,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 > + ;; > +@@ -6099,6 +6185,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 > +@@ -6114,6 +6215,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown > + > > - 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 bf92b5e0790..c573da90c5c 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 > ++ > ++ > ++ > ++ > ++ > ++ > ++ > ++ > ++ > ++ > ++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 ${ac_cv_prog_DLLTOOL+:} false; 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 as_fn_executable_p "$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 ${ac_cv_prog_ac_ct_DLLTOOL+:} false; 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 as_fn_executable_p "$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 ${lt_cv_sharedlib_from_linklib_cmd+:} false; 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 > ++ > ++ > ++ > ++ > ++ > ++ > ++ > + plugin_option= > + plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" > + for plugin in $plugin_names; do > +@@ -6128,8 +6380,10 @@ for plugin in $plugin_names; do > + done > > - # These exist entirely to fool aclocal when bootstrapping libtool. > - # > -diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in > -index 2257b0872af..73aae3b210f 100644 > ---- a/opcodes/Makefile.in > -+++ b/opcodes/Makefile.in > -@@ -292,6 +292,7 @@ CYGPATH_W = @CYGPATH_W@ > - DATADIRNAME = @DATADIRNAME@ > - DEFS = @DEFS@ > - DEPDIR = @DEPDIR@ > -+DLLTOOL = @DLLTOOL@ > - DSYMUTIL = @DSYMUTIL@ > - DUMPBIN = @DUMPBIN@ > - ECHO_C = @ECHO_C@ > -@@ -325,6 +326,7 @@ LN_S = @LN_S@ > - LTLIBOBJS = @LTLIBOBJS@ > - MAINT = @MAINT@ > - MAKEINFO = @MAKEINFO@ > -+MANIFEST_TOOL = @MANIFEST_TOOL@ > - MKDIR_P = @MKDIR_P@ > - MKINSTALLDIRS = @MKINSTALLDIRS@ > - MSGFMT = @MSGFMT@ > -@@ -363,6 +365,7 @@ abs_builddir = @abs_builddir@ > - abs_srcdir = @abs_srcdir@ > - abs_top_builddir = @abs_top_builddir@ > - abs_top_srcdir = @abs_top_srcdir@ > -+ac_ct_AR = @ac_ct_AR@ > - ac_ct_CC = @ac_ct_CC@ > - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ > - am__include = @am__include@ > -diff --git a/opcodes/configure b/opcodes/configure > -index db023b48c28..c562aada2a4 100755 > ---- a/opcodes/configure > -+++ b/opcodes/configure > -@@ -682,6 +682,9 @@ OTOOL > - LIPO > - NMEDIT > - DSYMUTIL > -+MANIFEST_TOOL > -+ac_ct_AR > -+DLLTOOL > - OBJDUMP > - LN_S > - NM > -@@ -800,6 +803,7 @@ enable_static > - with_pic > - enable_fast_install > - with_gnu_ld > -+with_libtool_sysroot > - enable_libtool_lock > - enable_checking > - enable_targets > -@@ -1468,6 +1472,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). > + 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 ${ac_cv_prog_AR+:} false; then : > +@@ -6145,7 +6399,7 @@ do > + test -z "$as_dir" && as_dir=. > + for ac_exec_ext in '' $ac_executable_extensions; do > + if as_fn_executable_p "$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 > +@@ -6165,11 +6419,15 @@ $as_echo "no" >&6; } > + fi > > - Some influential environment variables: > - CC C compiler command > -@@ -4977,8 +4983,8 @@ esac > > ++ 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 ${ac_cv_prog_ac_ct_AR+:} false; then : > +@@ -6185,7 +6443,7 @@ do > + test -z "$as_dir" && as_dir=. > + for ac_exec_ext in '' $ac_executable_extensions; do > + if as_fn_executable_p "$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 > +@@ -6204,6 +6462,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 > +@@ -6215,25 +6477,20 @@ ac_tool_warned=yes ;; > + esac > + AR=$ac_ct_AR > + fi > +-else > +- AR="$ac_cv_prog_AR" > + fi > > --macro_version='2.2.7a' > --macro_revision='1.3134' > -+macro_version='2.4' > -+macro_revision='1.3293' > +-test -z "$AR" && AR=ar > +-if test -n "$plugin_option"; then > +- if $AR --help 2>&1 | grep -q "\--plugin"; then > +- touch conftest.c > +- $AR $plugin_option rc conftest.a conftest.c > +- if test "$?" != 0; then > +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 > ++ touch conftest.c > ++ $AR $plugin_option rc conftest.a conftest.c > ++ if test "$?" != 0; then > ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 > + $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} > +- else > +- AR="$AR $plugin_option" > +- fi > +- rm -f conftest.* > ++ else > ++ AR="$AR $plugin_option" > + fi > +-fi > +-test -z "$AR_FLAGS" && AR_FLAGS=cru > ++ rm -f conftest.* > ++: ${AR=ar} > ++: ${AR_FLAGS=cru} > ++ > > > > -@@ -5018,7 +5024,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 > -@@ -5711,8 +5717,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 > -@@ -5761,6 +5767,80 @@ esac > +@@ -6244,6 +6501,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru > > > > -+{ $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 ${lt_cv_to_host_file_cmd+:} false; then : > ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 > ++$as_echo_n "checking for archiver @FILE support... " >&6; } > ++if ${lt_cv_ar_at_file+:} false; 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; } > ++ 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; } > + > -+{ $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 ${lt_cv_to_tool_file_cmd+:} false; then : > -+ $as_echo_n "(cached) " >&6 > ++if test "x$lt_cv_ar_at_file" = xno; then > ++ archiver_list_spec= > +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 > -+ > ++ archiver_list_spec=$lt_cv_ar_at_file > +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 ${lt_cv_ld_reload_flag+:} false; then : > -@@ -5777,6 +5857,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' > -@@ -5945,7 +6030,8 @@ mingw* | pw32*) > - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' > - lt_cv_file_magic_cmd='func_win32_libid' > + > + 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. > +@@ -6584,8 +6898,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= > +@@ -6621,6 +6935,7 @@ for ac_symprfx in "" "_"; do > 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' > + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" > fi > - ;; > -@@ -6099,6 +6185,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; } > ++ 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 > +@@ -6662,6 +6977,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 > + > -+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 > + #ifdef __cplusplus > + extern "C" { > + #endif > +@@ -6673,7 +7000,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; > + } > +@@ -6699,8 +7026,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 > +@@ -6710,8 +7037,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 > +@@ -6748,6 +7075,14 @@ 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 > + > - 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 > -@@ -6114,6 +6215,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown > ++ > + > > > +@@ -6766,6 +7101,47 @@ 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; } > ++ > + > + > + > + > +@@ -6975,6 +7351,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 ${ac_cv_prog_MANIFEST_TOOL+:} false; 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 as_fn_executable_p "$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 > + > + > -+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 > ++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 ${ac_cv_prog_DLLTOOL+:} false; then : > ++if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : > + $as_echo_n "(cached) " >&6 > +else > -+ if test -n "$DLLTOOL"; then > -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. > ++ 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 > @@ -26969,7 +30605,7 @@ index db023b48c28..c562aada2a4 100755 > + test -z "$as_dir" && as_dir=. > + for ac_exec_ext in '' $ac_executable_extensions; do > + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" > ++ 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 > @@ -26978,2522 +30614,3178 @@ index db023b48c28..c562aada2a4 100755 > +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 > ++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 ${lt_cv_path_mainfest_tool+:} false; 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*) > +@@ -7538,6 +8031,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 > +@@ -8090,8 +8585,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,' > +@@ -8257,6 +8750,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) > +@@ -8319,7 +8818,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,';; > +@@ -8376,13 +8875,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 ${lt_cv_prog_compiler_pic+:} false; 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. > +@@ -8443,6 +8946,11 @@ fi > + > + > + > ++ > ++ > ++ > ++ > ++ > + # > + # Check to make sure the static flag actually works. > + # > +@@ -8793,7 +9301,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' > +@@ -8892,12 +9401,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 > +@@ -8911,8 +9420,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 > + ;; > + > +@@ -8930,8 +9439,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 > +@@ -8977,8 +9486,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 > +@@ -9108,7 +9617,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 ${lt_cv_aix_libpath_+:} false; then : > ++ $as_echo_n "(cached) " >&6 > ++else > ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext > + /* end confdefs.h. */ > + > + int > +@@ -9121,22 +9636,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 > -+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 ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : > -+ $as_echo_n "(cached) " >&6 > + > + 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" > +@@ -9148,7 +9670,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 -n "$ac_ct_DLLTOOL"; then > -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. > ++ if ${lt_cv_aix_libpath_+:} false; then : > ++ $as_echo_n "(cached) " >&6 > +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 as_fn_executable_p "$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 > ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext > + /* end confdefs.h. */ > + > + int > +@@ -9161,22 +9689,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 > -+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 > + 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 > -+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 ${lt_cv_sharedlib_from_linklib_cmd+:} false; 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 > -+ > + > -+ > -+ > -+ > -+ > -+ > - plugin_option= > - plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" > - for plugin in $plugin_names; do > -@@ -6128,8 +6380,10 @@ for plugin in $plugin_names; do > - done > ++ aix_libpath=$lt_cv_aix_libpath_ > ++fi > > - 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 ${ac_cv_prog_AR+:} false; then : > -@@ -6145,7 +6399,7 @@ do > - test -z "$as_dir" && as_dir=. > - for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$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 > -@@ -6165,11 +6419,15 @@ $as_echo "no" >&6; } > - fi > + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" > + # Warning - without using the other run time loading flags, > +@@ -9221,20 +9756,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*) > +@@ -9295,7 +9873,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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 ${ac_cv_prog_ac_ct_AR+:} false; then : > -@@ -6185,7 +6443,7 @@ do > - test -z "$as_dir" && as_dir=. > - for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$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 > -@@ -6204,6 +6462,10 @@ else > - $as_echo "no" >&6; } > + # 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 > +@@ -9303,7 +9881,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 > +@@ -9319,7 +9897,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 > +@@ -9343,10 +9921,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 > +@@ -9425,23 +10003,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 ${lt_cv_irix_exported_symbol+:} false; 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' > +@@ -9526,7 +10117,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 \*' > +@@ -9545,9 +10136,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"*) > +@@ -10123,8 +10714,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}`~ > +@@ -10157,13 +10749,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' > ++ ;; > + > -+ test -n "$ac_ct_AR" && break > -+done > ++ *,cl*) > ++ # Native MSVC > ++ libname_spec='$name' > ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' > ++ library_names_spec='${libname}.dll.lib' > + > - if test "x$ac_ct_AR" = x; then > - AR="false" > - else > -@@ -6215,25 +6477,20 @@ ac_tool_warned=yes ;; > - esac > - AR=$ac_ct_AR > - fi > --else > -- AR="$ac_cv_prog_AR" > - fi > - > --test -z "$AR" && AR=ar > --if test -n "$plugin_option"; then > -- if $AR --help 2>&1 | grep -q "\--plugin"; then > -- touch conftest.c > -- $AR $plugin_option rc conftest.a conftest.c > -- if test "$?" != 0; then > -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 > -+ touch conftest.c > -+ $AR $plugin_option rc conftest.a conftest.c > -+ if test "$?" != 0; then > -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 > - $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} > -- else > -- AR="$AR $plugin_option" > -- fi > -- rm -f conftest.* > -+ else > -+ AR="$AR $plugin_option" > - fi > --fi > --test -z "$AR_FLAGS" && AR_FLAGS=cru > -+ rm -f conftest.* > -+: ${AR=ar} > -+: ${AR_FLAGS=cru} > ++ 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 > + ;; > +@@ -11041,7 +11691,7 @@ else > + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > + lt_status=$lt_dlunknown > + cat > conftest.$ac_ext <<_LT_EOF > +-#line 11044 "configure" > ++#line $LINENO "configure" > + #include "confdefs.h" > > + #if HAVE_DLFCN_H > +@@ -11085,10 +11735,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 > > -@@ -6244,6 +6501,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru > +-void fnord () { int i=42; } > ++int fnord () { return 42; } > + int main () > + { > + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > +@@ -11147,7 +11797,7 @@ else > + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > + lt_status=$lt_dlunknown > + cat > conftest.$ac_ext <<_LT_EOF > +-#line 11150 "configure" > ++#line $LINENO "configure" > + #include "confdefs.h" > > + #if HAVE_DLFCN_H > +@@ -11191,10 +11841,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); > +@@ -13414,13 +14064,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"`' > +@@ -13435,14 +14092,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"`' > +@@ -13475,12 +14135,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"`' > +@@ -13535,8 +14195,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 \ > +@@ -13546,12 +14211,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 \ > +@@ -13567,7 +14234,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 \ > +@@ -13603,6 +14269,7 @@ module_cmds \ > + module_expsym_cmds \ > + export_symbols_cmds \ > + prelink_cmds \ > ++postlink_cmds \ > + postinstall_cmds \ > + postuninstall_cmds \ > + finish_cmds \ > +@@ -14368,7 +15035,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. > +@@ -14471,19 +15139,42 @@ SP2NL=$lt_lt_SP2NL > + # turn newlines into spaces. > + NL2SP=$lt_lt_NL2SP > > -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 > -+$as_echo_n "checking for archiver @FILE support... " >&6; } > -+if ${lt_cv_ar_at_file+:} false; 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 () > -+{ > ++# convert \$build file names to \$host format. > ++to_host_file_cmd=$lt_cv_to_host_file_cmd > + > -+ ; > -+ 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 > ++# convert \$build files to toolchain format. > ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd > + > -+fi > -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext > + # 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 > + > -+fi > -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 > -+$as_echo "$lt_cv_ar_at_file" >&6; } > ++# Find potential files using nocaseglob when deplibs_check_method = "file_magic". > ++want_nocaseglob=$lt_want_nocaseglob > + > -+if test "x$lt_cv_ar_at_file" = xno; then > -+ archiver_list_spec= > -+else > -+ archiver_list_spec=$lt_cv_ar_at_file > -+fi > ++# 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 > + > +@@ -14513,6 +15204,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 > > - 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. > -@@ -6584,8 +6898,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'" > +@@ -14522,6 +15219,9 @@ MAGIC_CMD=$MAGIC_CMD > + # Must we lock files when doing compilation? > + need_locks=$lt_need_locks > > - # 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'" > ++# Manifest tool. > ++MANIFEST_TOOL=$lt_MANIFEST_TOOL > ++ > + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. > + DSYMUTIL=$lt_DSYMUTIL > > - # Handle CRLF in mingw tool chain > - opt_cr= > -@@ -6621,6 +6935,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'" > +@@ -14636,12 +15336,12 @@ with_gcc=$GCC > + # Compiler flag to turn off builtin functions. > + no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag > > - # Check to see that the pipe works correctly. > - pipe_works=no > -@@ -6662,6 +6977,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 > +-# 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 > + > - #ifdef __cplusplus > - extern "C" { > - #endif > -@@ -6673,7 +7000,7 @@ _LT_EOF > - cat <<_LT_EOF >> conftest.$ac_ext > + # Compiler flag to prevent dynamic linking. > + link_static_flag=$lt_lt_prog_compiler_static > > - /* The mapping between symbol names and symbols. */ > --const struct { > -+LT_DLSYM_CONST struct { > - const char *name; > - void *address; > - } > -@@ -6699,8 +7026,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 > -@@ -6710,8 +7037,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 > -@@ -6748,6 +7075,14 @@ else > - $as_echo "ok" >&6; } > - fi > +@@ -14728,9 +15428,6 @@ inherit_rpath=$inherit_rpath > + # Whether libtool must link a program against all its dependency libraries. > + link_all_deplibs=$link_all_deplibs > > -+# 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 > +-# 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 > + > +@@ -14746,6 +15443,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 > + > +@@ -14778,210 +15478,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) > + > - > - > - > -@@ -6766,6 +7101,47 @@ fi > - > - > - > ++ 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=: > + > -+{ $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 > ++ 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=: > + > + > -+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 > ++ 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=: > + > -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 > -+$as_echo "${lt_sysroot:-no}" >&6; } > + > ++ 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=: > + > - > - > - > -@@ -6975,6 +7351,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 ${ac_cv_prog_MANIFEST_TOOL+:} false; 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 as_fn_executable_p "$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 > ++ 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=: > + > + > -+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 ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; 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 as_fn_executable_p "$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 > ++ 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=: > + > -+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 > ++ 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=: > + > -+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 ${lt_cv_path_mainfest_tool+:} false; 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 > + > ++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=: > + > + > - > - case $host_os in > - rhapsody* | darwin*) > -@@ -7538,6 +8031,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 > -@@ -8090,8 +8585,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,' > -@@ -8257,6 +8750,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) > -@@ -8319,7 +8818,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,';; > -@@ -8376,13 +8875,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 ${lt_cv_prog_compiler_pic+:} false; then : > -+ $as_echo_n "(cached) " >&6 > ++ # 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 > -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic > ++ # 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 > -+{ $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 > ++ > ++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" > > - # > - # Check to make sure the PIC flag actually works. > -@@ -8443,6 +8946,11 @@ fi > +diff --git a/sim/Makefile.in b/sim/Makefile.in > +index 65085cada9c..c216f21920f 100644 > +--- a/sim/Makefile.in > ++++ b/sim/Makefile.in > +@@ -1029,6 +1029,7 @@ CYGPATH_W = @CYGPATH_W@ > + C_DIALECT = @C_DIALECT@ > + DEFS = @DEFS@ > + DEPDIR = @DEPDIR@ > ++DLLTOOL = @DLLTOOL@ > + DSYMUTIL = @DSYMUTIL@ > + DTC = @DTC@ > + DUMPBIN = @DUMPBIN@ > +@@ -1089,6 +1090,7 @@ LN_S = @LN_S@ > + LTLIBOBJS = @LTLIBOBJS@ > + MAINT = @MAINT@ > + MAKEINFO = @MAKEINFO@ > ++MANIFEST_TOOL = @MANIFEST_TOOL@ > + MKDIR_P = @MKDIR_P@ > + NM = @NM@ > + NMEDIT = @NMEDIT@ > +@@ -1150,6 +1152,7 @@ abs_builddir = @abs_builddir@ > + abs_srcdir = @abs_srcdir@ > + abs_top_builddir = @abs_top_builddir@ > + abs_top_srcdir = @abs_top_srcdir@ > ++ac_ct_AR = @ac_ct_AR@ > + ac_ct_CC = @ac_ct_CC@ > + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ > + am__include = @am__include@ > +diff --git a/sim/configure b/sim/configure > +index c31ff71c805..1936741abe2 100755 > +--- a/sim/configure > ++++ b/sim/configure > +@@ -887,8 +887,11 @@ OTOOL > + LIPO > + NMEDIT > + DSYMUTIL > ++MANIFEST_TOOL > + AWK > + STRIP > ++ac_ct_AR > ++DLLTOOL > + OBJDUMP > + LN_S > + NM > +@@ -991,6 +994,7 @@ enable_static > + with_pic > + enable_fast_install > + with_gnu_ld > ++with_libtool_sysroot > + enable_libtool_lock > + enable_maintainer_mode > + enable_dependency_tracking > +@@ -1809,6 +1813,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 > +@@ -5642,8 +5648,8 @@ esac > > > -+ > -+ > -+ > -+ > -+ > - # > - # Check to make sure the static flag actually works. > - # > -@@ -8793,7 +9301,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' > -@@ -8892,12 +9401,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 > -@@ -8911,8 +9420,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 > - ;; > +-macro_version='2.2.7a' > +-macro_revision='1.3134' > ++macro_version='2.4' > ++macro_revision='1.3293' > > -@@ -8930,8 +9439,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 > -@@ -8977,8 +9486,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 > -@@ -9108,7 +9617,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 ${lt_cv_aix_libpath_+:} false; then : > -+ $as_echo_n "(cached) " >&6 > -+else > -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext > - /* end confdefs.h. */ > +@@ -5683,7 +5689,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 > +@@ -6376,8 +6382,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 > +@@ -6426,6 +6432,80 @@ esac > > - int > -@@ -9121,22 +9636,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 > + > ++{ $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 ${lt_cv_to_host_file_cmd+:} false; 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 > + > -+ 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" > -@@ -9148,7 +9670,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 ${lt_cv_aix_libpath_+:} false; then : > ++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 ${lt_cv_to_tool_file_cmd+:} false; then : > + $as_echo_n "(cached) " >&6 > +else > -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext > - /* end confdefs.h. */ > - > - int > -@@ -9161,22 +9689,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 > ++ #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 > + > -+ 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, > -@@ -9221,20 +9756,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*) > -@@ -9295,7 +9873,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 > -@@ -9303,7 +9881,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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 ${lt_cv_ld_reload_flag+:} false; then : > +@@ -6442,6 +6522,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' > +@@ -6610,7 +6695,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 > + ;; > +@@ -6764,6 +6850,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 > +@@ -6779,6 +6880,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown > > - 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 > -@@ -9319,7 +9897,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 > -@@ -9343,10 +9921,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 > -@@ -9425,23 +10003,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 ${lt_cv_irix_exported_symbol+:} false; then : > ++ > ++ > ++ > ++ > ++ > ++ > ++ > ++ > ++ > ++ > ++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 ${ac_cv_prog_DLLTOOL+:} false; 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 > ++ if test -n "$DLLTOOL"; then > ++ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. > +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" > ++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 as_fn_executable_p "$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 > -+{ $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' > -@@ -9526,7 +10117,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 \*' > -@@ -9545,9 +10136,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"*) > -@@ -10123,8 +10714,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}`~ > -@@ -10157,13 +10749,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' > ++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 ${ac_cv_prog_ac_ct_DLLTOOL+:} false; 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 as_fn_executable_p "$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 ${lt_cv_sharedlib_from_linklib_cmd+:} false; 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 > ++ > + > -+ *,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 > - ;; > -@@ -11041,7 +11691,7 @@ else > - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > - lt_status=$lt_dlunknown > - cat > conftest.$ac_ext <<_LT_EOF > --#line 11044 "configure" > -+#line $LINENO "configure" > - #include "confdefs.h" > - > - #if HAVE_DLFCN_H > -@@ -11085,10 +11735,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); > -@@ -11147,7 +11797,7 @@ else > - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > - lt_status=$lt_dlunknown > - cat > conftest.$ac_ext <<_LT_EOF > --#line 11150 "configure" > -+#line $LINENO "configure" > - #include "confdefs.h" > - > - #if HAVE_DLFCN_H > -@@ -11191,10 +11841,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); > -@@ -13396,13 +14046,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"`' > -@@ -13417,14 +14074,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"`' > -@@ -13457,12 +14117,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"`' > -@@ -13517,8 +14177,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 \ > -@@ -13528,12 +14193,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 \ > -@@ -13549,7 +14216,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 \ > -@@ -13585,6 +14251,7 @@ module_cmds \ > - module_expsym_cmds \ > - export_symbols_cmds \ > - prelink_cmds \ > -+postlink_cmds \ > - postinstall_cmds \ > - postuninstall_cmds \ > - finish_cmds \ > -@@ -14350,7 +15017,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. > -@@ -14453,19 +15121,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 > ++ > + plugin_option= > + plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" > + for plugin in $plugin_names; do > +@@ -6793,8 +7045,10 @@ for plugin in $plugin_names; do > + done > > - # Method to check whether dependent libraries are shared objects. > - deplibs_check_method=$lt_deplibs_check_method > + 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 ${ac_cv_prog_AR+:} false; then : > +@@ -6810,7 +7064,7 @@ do > + test -z "$as_dir" && as_dir=. > + for ac_exec_ext in '' $ac_executable_extensions; do > + if as_fn_executable_p "$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 > +@@ -6830,11 +7084,15 @@ $as_echo "no" >&6; } > + fi > > --# 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 > ++ 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 ${ac_cv_prog_ac_ct_AR+:} false; then : > +@@ -6850,7 +7108,7 @@ do > + test -z "$as_dir" && as_dir=. > + for ac_exec_ext in '' $ac_executable_extensions; do > + if as_fn_executable_p "$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 > +@@ -6869,6 +7127,10 @@ else > + $as_echo "no" >&6; } > + fi > + > + > -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". > -+want_nocaseglob=$lt_want_nocaseglob > ++ test -n "$ac_ct_AR" && break > ++done > + > -+# DLL creation program. > -+DLLTOOL=$lt_DLLTOOL > + if test "x$ac_ct_AR" = x; then > + AR="false" > + else > +@@ -6880,29 +7142,81 @@ ac_tool_warned=yes ;; > + esac > + AR=$ac_ct_AR > + fi > +-else > +- AR="$ac_cv_prog_AR" > + fi > + > +-test -z "$AR" && AR=ar > +-if test -n "$plugin_option"; then > +- if $AR --help 2>&1 | grep -q "\--plugin"; then > +- touch conftest.c > +- $AR $plugin_option rc conftest.a conftest.c > +- if test "$?" != 0; then > +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 > ++ touch conftest.c > ++ $AR $plugin_option rc conftest.a conftest.c > ++ if test "$?" != 0; then > ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 > + $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} > +- else > +- AR="$AR $plugin_option" > +- fi > +- rm -f conftest.* > ++ else > ++ AR="$AR $plugin_option" > + fi > +-fi > +-test -z "$AR_FLAGS" && AR_FLAGS=cru > ++ rm -f conftest.* > ++: ${AR=ar} > ++: ${AR_FLAGS=cru} > + > -+# 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 > - > -@@ -14495,6 +15186,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 > ++ > ++ > ++ > ++ > ++ > ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 > ++$as_echo_n "checking for archiver @FILE support... " >&6; } > ++if ${lt_cv_ar_at_file+:} false; 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 () > ++{ > > -@@ -14504,6 +15201,9 @@ MAGIC_CMD=$MAGIC_CMD > - # Must we lock files when doing compilation? > - need_locks=$lt_need_locks > ++ ; > ++ 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 > > -+# Manifest tool. > -+MANIFEST_TOOL=$lt_MANIFEST_TOOL > -+ > - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. > - DSYMUTIL=$lt_DSYMUTIL > ++fi > ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext > > -@@ -14618,12 +15318,12 @@ with_gcc=$GCC > - # Compiler flag to turn off builtin functions. > - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag > ++fi > ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 > ++$as_echo "$lt_cv_ar_at_file" >&6; } > > --# 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 > ++if test "x$lt_cv_ar_at_file" = xno; then > ++ archiver_list_spec= > ++else > ++ archiver_list_spec=$lt_cv_ar_at_file > ++fi > + > + > + > +@@ -7291,8 +7605,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= > +@@ -7328,6 +7642,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 > +@@ -7369,6 +7684,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 > +@@ -7380,7 +7707,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; > + } > +@@ -7406,8 +7733,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 > +@@ -7417,8 +7744,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 > +@@ -7455,6 +7782,14 @@ else > + $as_echo "ok" >&6; } > + fi > > -+# How to pass a linker flag through the compiler. > -+wl=$lt_lt_prog_compiler_wl > ++# 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 > ++ > + > - # Compiler flag to prevent dynamic linking. > - link_static_flag=$lt_lt_prog_compiler_static > > -@@ -14710,9 +15410,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 > > -@@ -14728,6 +15425,9 @@ include_expsyms=$lt_include_expsyms > - # Commands necessary for linking programs (against libraries) with templates. > - prelink_cmds=$lt_prelink_cmds > +@@ -7473,6 +7808,47 @@ fi > + > > -+# Commands necessary for finishing linking programs. > -+postlink_cmds=$lt_postlink_cmds > -+ > - # Specify filename containing input files. > - file_list_spec=$lt_file_list_spec > > -@@ -14760,210 +15460,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=: > + > ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 > ++$as_echo_n "checking for sysroot... " >&6; } > + > -+ 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=: > ++# 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 > + > + > -+ 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=: > ++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; } > + > -+ 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=: > + > + > + > + > +@@ -7682,6 +8058,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 ${ac_cv_prog_MANIFEST_TOOL+:} false; 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 as_fn_executable_p "$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 > + > -+ 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=: > ++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 > + > + > -+ 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=: > ++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 ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; 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 as_fn_executable_p "$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 ${lt_cv_path_mainfest_tool+:} false; 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 > + > + > -+ 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=: > + > ++ > ++ > + > + case $host_os in > + rhapsody* | darwin*) > +@@ -8245,6 +8738,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 > +@@ -9499,8 +9994,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,' > +@@ -9666,6 +10159,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) > +@@ -9728,7 +10227,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,';; > +@@ -9785,13 +10284,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 ${lt_cv_prog_compiler_pic+:} false; 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. > +@@ -9852,6 +10355,11 @@ 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=: > + # > + # Check to make sure the static flag actually works. > + # > +@@ -10202,7 +10710,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' > +@@ -10301,12 +10810,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 > +@@ -10320,8 +10829,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 > + ;; > + > +@@ -10339,8 +10848,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 > +@@ -10386,8 +10895,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 > +@@ -10517,7 +11026,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 > -+ # 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 ${lt_cv_aix_libpath_+:} false; then : > ++ $as_echo_n "(cached) " >&6 > ++else > ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext > + /* end confdefs.h. */ > + > + int > +@@ -10530,22 +11045,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 > + > -+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/sim/Makefile.in b/sim/Makefile.in > -index dbbaa84224a..f819bbe0bdd 100644 > ---- a/sim/Makefile.in > -+++ b/sim/Makefile.in > -@@ -744,6 +744,7 @@ C_DIALECT = @C_DIALECT@ > - DATADIRNAME = @DATADIRNAME@ > - DEFS = @DEFS@ > - DEPDIR = @DEPDIR@ > -+DLLTOOL = @DLLTOOL@ > - DSYMUTIL = @DSYMUTIL@ > - DTC = @DTC@ > - DUMPBIN = @DUMPBIN@ > -@@ -809,6 +810,7 @@ LN_S = @LN_S@ > - LTLIBOBJS = @LTLIBOBJS@ > - MAINT = @MAINT@ > - MAKEINFO = @MAKEINFO@ > -+MANIFEST_TOOL = @MANIFEST_TOOL@ > - MKDIR_P = @MKDIR_P@ > - NM = @NM@ > - NMEDIT = @NMEDIT@ > -@@ -859,6 +861,7 @@ abs_builddir = @abs_builddir@ > - abs_srcdir = @abs_srcdir@ > - abs_top_builddir = @abs_top_builddir@ > - abs_top_srcdir = @abs_top_srcdir@ > -+ac_ct_AR = @ac_ct_AR@ > - ac_ct_CC = @ac_ct_CC@ > - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ > - am__include = @am__include@ > -diff --git a/zlib/Makefile.in b/zlib/Makefile.in > -index c7584492a65..0605835c14f 100644 > ---- a/zlib/Makefile.in > -+++ b/zlib/Makefile.in > -@@ -1,7 +1,7 @@ > --# Makefile.in generated by automake 1.16.5 from Makefile.am. > -+# Makefile.in generated by automake 1.15.1 from Makefile.am. > - # @configure_input@ > - > --# Copyright (C) 1994-2021 Free Software Foundation, Inc. > -+# Copyright (C) 1994-2017 Free Software Foundation, Inc. > ++ aix_libpath=$lt_cv_aix_libpath_ > ++fi > > - # This Makefile.in is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -138,7 +138,6 @@ am__uninstall_files_from_dir = { \ > - } > - am__installdirs = "$(DESTDIR)$(toolexeclibdir)" > - LIBRARIES = $(toolexeclib_LIBRARIES) > --LTLIBRARIES = $(noinst_LTLIBRARIES) > - ARFLAGS = cru > - AM_V_AR = $(am__v_AR_@AM_V@) > - am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) > -@@ -161,6 +160,7 @@ am__objects_1 = libz_a-adler32.$(OBJEXT) libz_a-compress.$(OBJEXT) \ > - libz_a-zutil.$(OBJEXT) > - @TARGET_LIBRARY_FALSE@am_libz_a_OBJECTS = $(am__objects_1) > - libz_a_OBJECTS = $(am_libz_a_OBJECTS) > -+LTLIBRARIES = $(noinst_LTLIBRARIES) > - libzgcj_convenience_la_LIBADD = > - am__libzgcj_convenience_la_SOURCES_DIST = adler32.c compress.c crc32.c \ > - crc32.h deflate.c deflate.h gzguts.h gzread.c gzclose.c \ > -@@ -192,22 +192,7 @@ am__v_at_0 = @ > - am__v_at_1 = > - DEFAULT_INCLUDES = -I.@am__isrc@ > - depcomp = $(SHELL) $(top_srcdir)/../depcomp > --am__maybe_remake_depfiles = depfiles > --am__depfiles_remade = ./$(DEPDIR)/adler32.Plo ./$(DEPDIR)/compress.Plo \ > -- ./$(DEPDIR)/crc32.Plo ./$(DEPDIR)/deflate.Plo \ > -- ./$(DEPDIR)/gzclose.Plo ./$(DEPDIR)/gzlib.Plo \ > -- ./$(DEPDIR)/gzread.Plo ./$(DEPDIR)/gzwrite.Plo \ > -- ./$(DEPDIR)/infback.Plo ./$(DEPDIR)/inffast.Plo \ > -- ./$(DEPDIR)/inflate.Plo ./$(DEPDIR)/inftrees.Plo \ > -- ./$(DEPDIR)/libz_a-adler32.Po ./$(DEPDIR)/libz_a-compress.Po \ > -- ./$(DEPDIR)/libz_a-crc32.Po ./$(DEPDIR)/libz_a-deflate.Po \ > -- ./$(DEPDIR)/libz_a-gzclose.Po ./$(DEPDIR)/libz_a-gzlib.Po \ > -- ./$(DEPDIR)/libz_a-gzread.Po ./$(DEPDIR)/libz_a-gzwrite.Po \ > -- ./$(DEPDIR)/libz_a-infback.Po ./$(DEPDIR)/libz_a-inffast.Po \ > -- ./$(DEPDIR)/libz_a-inflate.Po ./$(DEPDIR)/libz_a-inftrees.Po \ > -- ./$(DEPDIR)/libz_a-trees.Po ./$(DEPDIR)/libz_a-uncompr.Po \ > -- ./$(DEPDIR)/libz_a-zutil.Po ./$(DEPDIR)/trees.Plo \ > -- ./$(DEPDIR)/uncompr.Plo ./$(DEPDIR)/zutil.Plo > -+am__depfiles_maybe = depfiles > - am__mv = mv -f > - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ > - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) > -@@ -252,6 +237,9 @@ am__define_uniq_tagged_files = \ > - unique=`for i in $$list; do \ > - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ > - done | $(am__uniquify_input)` > -+ETAGS = etags > -+CTAGS = ctags > -+CSCOPE = cscope > - AM_RECURSIVE_TARGETS = cscope > - am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/../compile \ > - $(top_srcdir)/../config.guess $(top_srcdir)/../config.sub \ > -@@ -272,8 +260,6 @@ am__post_remove_distdir = $(am__remove_distdir) > - DIST_ARCHIVES = $(distdir).tar.gz > - GZIP_ENV = --best > - DIST_TARGETS = dist-gzip > --# Exists only to be overridden by the user if desired. > --AM_DISTCHECK_DVI_TARGET = dvi > - distuninstallcheck_listfiles = find . -type f -print > - am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ > - | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' > -@@ -292,18 +278,16 @@ CFLAGS = @CFLAGS@ > - COMPPATH = @COMPPATH@ > - CPP = @CPP@ > - CPPFLAGS = @CPPFLAGS@ > --CSCOPE = @CSCOPE@ > --CTAGS = @CTAGS@ > - CYGPATH_W = @CYGPATH_W@ > - DEFS = @DEFS@ > - DEPDIR = @DEPDIR@ > -+DLLTOOL = @DLLTOOL@ > - DSYMUTIL = @DSYMUTIL@ > - DUMPBIN = @DUMPBIN@ > - ECHO_C = @ECHO_C@ > - ECHO_N = @ECHO_N@ > - ECHO_T = @ECHO_T@ > - EGREP = @EGREP@ > --ETAGS = @ETAGS@ > - EXEEXT = @EXEEXT@ > - FGREP = @FGREP@ > - GREP = @GREP@ > -@@ -322,6 +306,7 @@ LN_S = @LN_S@ > - LTLIBOBJS = @LTLIBOBJS@ > - MAINT = @MAINT@ > - MAKEINFO = @MAKEINFO@ > -+MANIFEST_TOOL = @MANIFEST_TOOL@ > - MKDIR_P = @MKDIR_P@ > - NM = @NM@ > - NMEDIT = @NMEDIT@ > -@@ -348,6 +333,7 @@ abs_builddir = @abs_builddir@ > - abs_srcdir = @abs_srcdir@ > - abs_top_builddir = @abs_top_builddir@ > - abs_top_srcdir = @abs_top_srcdir@ > -+ac_ct_AR = @ac_ct_AR@ > - ac_ct_CC = @ac_ct_CC@ > - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ > - am__include = @am__include@ > -@@ -491,8 +477,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status > - echo ' $(SHELL) ./config.status'; \ > - $(SHELL) ./config.status;; \ > - *) \ > -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ > -- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ > -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ > -+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ > - esac; > - $(top_srcdir)/../multilib.am $(am__empty): > - > -@@ -536,6 +522,11 @@ uninstall-toolexeclibLIBRARIES: > - clean-toolexeclibLIBRARIES: > - -test -z "$(toolexeclib_LIBRARIES)" || rm -f $(toolexeclib_LIBRARIES) > - > -+libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES) $(EXTRA_libz_a_DEPENDENCIES) > -+ $(AM_V_at)-rm -f libz.a > -+ $(AM_V_AR)$(libz_a_AR) libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD) > -+ $(AM_V_at)$(RANLIB) libz.a > -+ > - clean-noinstLTLIBRARIES: > - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) > - @list='$(noinst_LTLIBRARIES)'; \ > -@@ -547,11 +538,6 @@ clean-noinstLTLIBRARIES: > - rm -f $${locs}; \ > - } > + 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" > +@@ -10557,7 +11079,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 ${lt_cv_aix_libpath_+:} false; then : > ++ $as_echo_n "(cached) " >&6 > ++else > ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext > + /* end confdefs.h. */ > > --libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES) $(EXTRA_libz_a_DEPENDENCIES) > -- $(AM_V_at)-rm -f libz.a > -- $(AM_V_AR)$(libz_a_AR) libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD) > -- $(AM_V_at)$(RANLIB) libz.a > -- > - libzgcj_convenience.la: $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_DEPENDENCIES) $(EXTRA_libzgcj_convenience_la_DEPENDENCIES) > - $(AM_V_CCLD)$(LINK) $(am_libzgcj_convenience_la_rpath) $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_LIBADD) $(LIBS) > + int > +@@ -10570,22 +11098,29 @@ main () > + _ACEOF > + if ac_fn_c_try_link "$LINENO"; then : > > -@@ -561,42 +547,36 @@ mostlyclean-compile: > - distclean-compile: > - -rm -f *.tab.c > +-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, > +@@ -10630,20 +11165,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 > + ;; > > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adler32.Plo@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc32.Plo@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deflate.Plo@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzclose.Plo@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzlib.Plo@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzread.Plo@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzwrite.Plo@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infback.Plo@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inffast.Plo@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflate.Plo@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inftrees.Plo@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-adler32.Po@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-compress.Po@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-crc32.Po@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-deflate.Po@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzclose.Po@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzlib.Po@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzread.Po@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzwrite.Po@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-infback.Po@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inffast.Po@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inflate.Po@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inftrees.Po@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-trees.Po@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-uncompr.Po@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-zutil.Po@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trees.Plo@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uncompr.Plo@am__quote@ # am--include-marker > --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zutil.Plo@am__quote@ # am--include-marker > -- > --$(am__depfiles_remade): > -- @$(MKDIR_P) $(@D) > -- @echo '# dummy' >$@-t && $(am__mv) $@-t $@ > -- > --am--depfiles: $(am__depfiles_remade) > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adler32.Plo@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc32.Plo@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deflate.Plo@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzclose.Plo@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzlib.Plo@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzread.Plo@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzwrite.Plo@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infback.Plo@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inffast.Plo@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflate.Plo@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inftrees.Plo@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-adler32.Po@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-compress.Po@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-crc32.Po@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-deflate.Po@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzclose.Po@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzlib.Po@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzread.Po@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzwrite.Po@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-infback.Po@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inffast.Po@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inflate.Po@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inftrees.Po@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-trees.Po@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-uncompr.Po@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-zutil.Po@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trees.Plo@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uncompr.Plo@am__quote@ > -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zutil.Plo@am__quote@ > + darwin* | rhapsody*) > +@@ -10704,7 +11282,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > - .c.o: > - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< > -@@ -896,10 +876,8 @@ cscopelist-am: $(am__tagged_files) > - distclean-tags: > - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags > - -rm -f cscope.out cscope.in.out cscope.po.out cscope.files > --distdir: $(BUILT_SOURCES) > -- $(MAKE) $(AM_MAKEFLAGS) distdir-am > - > --distdir-am: $(DISTFILES) > -+distdir: $(DISTFILES) > - $(am__remove_distdir) > - test -d "$(distdir)" || mkdir "$(distdir)" > - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ > -@@ -954,10 +932,6 @@ dist-xz: distdir > - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz > - $(am__post_remove_distdir) > + # 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 > +@@ -10712,7 +11290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > --dist-zstd: distdir > -- tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst > -- $(am__post_remove_distdir) > -- > - dist-tarZ: distdir > - @echo WARNING: "Support for distribution archives compressed with" \ > - "legacy program 'compress' is deprecated." >&2 > -@@ -1000,8 +974,6 @@ distcheck: dist > - eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ > - *.zip*) \ > - unzip $(distdir).zip ;;\ > -- *.tar.zst*) \ > -- zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ > + 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 > +@@ -10728,7 +11306,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 > +@@ -10752,10 +11330,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 > - chmod -R a-w $(distdir) > - chmod u+w $(distdir) > -@@ -1017,7 +989,7 @@ distcheck: dist > - $(DISTCHECK_CONFIGURE_FLAGS) \ > - --srcdir=../.. --prefix="$$dc_install_base" \ > - && $(MAKE) $(AM_MAKEFLAGS) \ > -- && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ > -+ && $(MAKE) $(AM_MAKEFLAGS) dvi \ > - && $(MAKE) $(AM_MAKEFLAGS) check \ > - && $(MAKE) $(AM_MAKEFLAGS) install \ > - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ > -@@ -1113,36 +1085,7 @@ clean-am: clean-generic clean-libtool clean-local \ > + else > +@@ -10834,23 +11412,36 @@ fi > > - distclean: distclean-am > - -rm -f $(am__CONFIG_DISTCLEAN_FILES) > -- -rm -f ./$(DEPDIR)/adler32.Plo > -- -rm -f ./$(DEPDIR)/compress.Plo > -- -rm -f ./$(DEPDIR)/crc32.Plo > -- -rm -f ./$(DEPDIR)/deflate.Plo > -- -rm -f ./$(DEPDIR)/gzclose.Plo > -- -rm -f ./$(DEPDIR)/gzlib.Plo > -- -rm -f ./$(DEPDIR)/gzread.Plo > -- -rm -f ./$(DEPDIR)/gzwrite.Plo > -- -rm -f ./$(DEPDIR)/infback.Plo > -- -rm -f ./$(DEPDIR)/inffast.Plo > -- -rm -f ./$(DEPDIR)/inflate.Plo > -- -rm -f ./$(DEPDIR)/inftrees.Plo > -- -rm -f ./$(DEPDIR)/libz_a-adler32.Po > -- -rm -f ./$(DEPDIR)/libz_a-compress.Po > -- -rm -f ./$(DEPDIR)/libz_a-crc32.Po > -- -rm -f ./$(DEPDIR)/libz_a-deflate.Po > -- -rm -f ./$(DEPDIR)/libz_a-gzclose.Po > -- -rm -f ./$(DEPDIR)/libz_a-gzlib.Po > -- -rm -f ./$(DEPDIR)/libz_a-gzread.Po > -- -rm -f ./$(DEPDIR)/libz_a-gzwrite.Po > -- -rm -f ./$(DEPDIR)/libz_a-infback.Po > -- -rm -f ./$(DEPDIR)/libz_a-inffast.Po > -- -rm -f ./$(DEPDIR)/libz_a-inflate.Po > -- -rm -f ./$(DEPDIR)/libz_a-inftrees.Po > -- -rm -f ./$(DEPDIR)/libz_a-trees.Po > -- -rm -f ./$(DEPDIR)/libz_a-uncompr.Po > -- -rm -f ./$(DEPDIR)/libz_a-zutil.Po > -- -rm -f ./$(DEPDIR)/trees.Plo > -- -rm -f ./$(DEPDIR)/uncompr.Plo > -- -rm -f ./$(DEPDIR)/zutil.Plo > -+ -rm -rf ./$(DEPDIR) > - -rm -f Makefile > - distclean-am: clean-am distclean-compile distclean-generic \ > - distclean-libtool distclean-local distclean-tags > -@@ -1190,36 +1133,7 @@ installcheck-am: > - maintainer-clean: maintainer-clean-am > - -rm -f $(am__CONFIG_DISTCLEAN_FILES) > - -rm -rf $(top_srcdir)/autom4te.cache > -- -rm -f ./$(DEPDIR)/adler32.Plo > -- -rm -f ./$(DEPDIR)/compress.Plo > -- -rm -f ./$(DEPDIR)/crc32.Plo > -- -rm -f ./$(DEPDIR)/deflate.Plo > -- -rm -f ./$(DEPDIR)/gzclose.Plo > -- -rm -f ./$(DEPDIR)/gzlib.Plo > -- -rm -f ./$(DEPDIR)/gzread.Plo > -- -rm -f ./$(DEPDIR)/gzwrite.Plo > -- -rm -f ./$(DEPDIR)/infback.Plo > -- -rm -f ./$(DEPDIR)/inffast.Plo > -- -rm -f ./$(DEPDIR)/inflate.Plo > -- -rm -f ./$(DEPDIR)/inftrees.Plo > -- -rm -f ./$(DEPDIR)/libz_a-adler32.Po > -- -rm -f ./$(DEPDIR)/libz_a-compress.Po > -- -rm -f ./$(DEPDIR)/libz_a-crc32.Po > -- -rm -f ./$(DEPDIR)/libz_a-deflate.Po > -- -rm -f ./$(DEPDIR)/libz_a-gzclose.Po > -- -rm -f ./$(DEPDIR)/libz_a-gzlib.Po > -- -rm -f ./$(DEPDIR)/libz_a-gzread.Po > -- -rm -f ./$(DEPDIR)/libz_a-gzwrite.Po > -- -rm -f ./$(DEPDIR)/libz_a-infback.Po > -- -rm -f ./$(DEPDIR)/libz_a-inffast.Po > -- -rm -f ./$(DEPDIR)/libz_a-inflate.Po > -- -rm -f ./$(DEPDIR)/libz_a-inftrees.Po > -- -rm -f ./$(DEPDIR)/libz_a-trees.Po > -- -rm -f ./$(DEPDIR)/libz_a-uncompr.Po > -- -rm -f ./$(DEPDIR)/libz_a-zutil.Po > -- -rm -f ./$(DEPDIR)/trees.Plo > -- -rm -f ./$(DEPDIR)/uncompr.Plo > -- -rm -f ./$(DEPDIR)/zutil.Plo > -+ -rm -rf ./$(DEPDIR) > - -rm -f Makefile > - maintainer-clean-am: distclean-am maintainer-clean-generic \ > - maintainer-clean-local > -@@ -1241,17 +1155,17 @@ uninstall-am: uninstall-toolexeclibLIBRARIES > - > - .MAKE: install-am install-strip > - > --.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles am--refresh \ > -- check check-am clean clean-cscope clean-generic clean-libtool \ > -+.PHONY: CTAGS GTAGS TAGS all all-am all-local am--refresh check \ > -+ check-am clean clean-cscope clean-generic clean-libtool \ > - clean-local clean-noinstLTLIBRARIES clean-toolexeclibLIBRARIES \ > - cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ > - dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ > -- dist-zstd distcheck distclean distclean-compile \ > -- distclean-generic distclean-libtool distclean-local \ > -- distclean-tags distcleancheck distdir distuninstallcheck dvi \ > -- dvi-am html html-am info info-am install install-am \ > -- install-data install-data-am install-dvi install-dvi-am \ > -- install-exec install-exec-am install-exec-local install-html \ > -+ distcheck distclean distclean-compile distclean-generic \ > -+ distclean-libtool distclean-local distclean-tags \ > -+ distcleancheck distdir distuninstallcheck dvi dvi-am html \ > -+ html-am info info-am install install-am install-data \ > -+ install-data-am install-dvi install-dvi-am install-exec \ > -+ install-exec-am install-exec-local install-html \ > - install-html-am install-info install-info-am install-man \ > - install-pdf install-pdf-am install-ps install-ps-am \ > - install-strip install-toolexeclibLIBRARIES installcheck \ > -diff --git a/zlib/aclocal.m4 b/zlib/aclocal.m4 > -index 3538b0f0aea..e5eed57bd68 100644 > ---- a/zlib/aclocal.m4 > -+++ b/zlib/aclocal.m4 > -@@ -1,6 +1,6 @@ > --# generated automatically by aclocal 1.16.5 -*- Autoconf -*- > -+# generated automatically by aclocal 1.15.1 -*- Autoconf -*- > + 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 ${lt_cv_irix_exported_symbol+:} false; 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' > +@@ -10935,7 +11526,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 \*' > +@@ -10954,9 +11545,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"*) > +@@ -11532,8 +12123,9 @@ cygwin* | mingw* | pw32* | cegcc*) > + need_version=no > + need_lib_prefix=no > > --# Copyright (C) 1996-2021 Free Software Foundation, Inc. > -+# Copyright (C) 1996-2017 Free Software Foundation, Inc. > +- 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}`~ > +@@ -11566,13 +12158,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' > + ;; > > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. > - If you have problems, you may need to regenerate the build system entirely. > - To do so, use the procedure documented by the package, typically 'autoreconf'.])]) > + *) > ++ # 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 > + ;; > +@@ -12450,7 +13100,7 @@ else > + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > + lt_status=$lt_dlunknown > + cat > conftest.$ac_ext <<_LT_EOF > +-#line 12453 "configure" > ++#line $LINENO "configure" > + #include "confdefs.h" > > --# Copyright (C) 2002-2021 Free Software Foundation, Inc. > -+# Copyright (C) 2002-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) > - # generated from the m4 files accompanying Automake X.Y. > - # (This private macro should not be called outside this file.) > - AC_DEFUN([AM_AUTOMAKE_VERSION], > --[am__api_version='1.16' > -+[am__api_version='1.15' > - dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to > - dnl require some minimum version. Point them to the right macro. > --m4_if([$1], [1.16.5], [], > -+m4_if([$1], [1.15.1], [], > - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl > - ]) > + #if HAVE_DLFCN_H > +@@ -12494,10 +13144,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 > > -@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) > - # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. > - # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. > - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], > --[AM_AUTOMAKE_VERSION([1.16.5])dnl > -+[AM_AUTOMAKE_VERSION([1.15.1])dnl > - m4_ifndef([AC_AUTOCONF_VERSION], > - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl > - _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) > +-void fnord () { int i=42; } > ++int fnord () { return 42; } > + int main () > + { > + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > +@@ -12556,7 +13206,7 @@ else > + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > + lt_status=$lt_dlunknown > + cat > conftest.$ac_ext <<_LT_EOF > +-#line 12559 "configure" > ++#line $LINENO "configure" > + #include "confdefs.h" > > - # AM_AUX_DIR_EXPAND -*- Autoconf -*- > + #if HAVE_DLFCN_H > +@@ -12600,10 +13250,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 > > --# Copyright (C) 2001-2021 Free Software Foundation, Inc. > -+# Copyright (C) 2001-2017 Free Software Foundation, Inc. > +-void fnord () { int i=42; } > ++int fnord () { return 42; } > + int main () > + { > + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > +@@ -17596,13 +18246,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"`' > +@@ -17617,14 +18274,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"`' > +@@ -17657,12 +18317,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"`' > +@@ -17717,8 +18377,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 \ > +@@ -17728,12 +18393,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 \ > +@@ -17749,7 +18416,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 \ > +@@ -17785,6 +18451,7 @@ module_cmds \ > + module_expsym_cmds \ > + export_symbols_cmds \ > + prelink_cmds \ > ++postlink_cmds \ > + postinstall_cmds \ > + postuninstall_cmds \ > + finish_cmds \ > +@@ -18610,7 +19277,8 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} > + # NOTE: Changes made to this file will be lost: look at ltmain.sh. > # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` > + # 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. > +@@ -18713,19 +19381,42 @@ SP2NL=$lt_lt_SP2NL > + # turn newlines into spaces. > + NL2SP=$lt_lt_NL2SP > > - # AM_CONDITIONAL -*- Autoconf -*- > ++# 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 > > --# Copyright (C) 1997-2021 Free Software Foundation, Inc. > -+# Copyright (C) 1997-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE( > - Usually this means the macro was only invoked conditionally.]]) > - fi])]) > +-# 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 > > --# Copyright (C) 1999-2021 Free Software Foundation, Inc. > -+# Copyright (C) 1999-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -332,12 +332,13 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl > ++# 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 > > - # Generate code to set up dependency tracking. -*- Autoconf -*- > ++# How to feed a file listing to the archiver. > ++archiver_list_spec=$lt_archiver_list_spec > ++ > + # A symbol stripping program. > + STRIP=$lt_STRIP > > --# Copyright (C) 1999-2021 Free Software Foundation, Inc. > -+# Copyright (C) 1999-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > - # with or without modifications, as long as this notice is preserved. > +@@ -18755,6 +19446,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 > + > - # _AM_OUTPUT_DEPENDENCY_COMMANDS > - # ------------------------------ > - AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], > -@@ -345,43 +346,49 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], > - # Older Autoconf quotes --file arguments for eval, but not when files > - # are listed without --file. Let's play safe and only enable the eval > - # if we detect the quoting. > -- # TODO: see whether this extra hack can be removed once we start > -- # requiring Autoconf 2.70 or later. > -- AS_CASE([$CONFIG_FILES], > -- [*\'*], [eval set x "$CONFIG_FILES"], > -- [*], [set x $CONFIG_FILES]) > -+ case $CONFIG_FILES in > -+ *\'*) eval set x "$CONFIG_FILES" ;; > -+ *) set x $CONFIG_FILES ;; > -+ esac > - shift > -- # Used to flag and report bootstrapping failures. > -- am_rc=0 > -- for am_mf > -+ for mf > - do > - # Strip MF so we end up with the name of the file. > -- am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` > -- # Check whether this is an Automake generated Makefile which includes > -- # dependency-tracking related rules and includes. > -- # Grep'ing the whole file directly is not great: AIX grep has a line > -+ mf=`echo "$mf" | sed -e 's/:.*$//'` > -+ # Check whether this is an Automake generated Makefile or not. > -+ # We used to match only the files named 'Makefile.in', but > -+ # some people rename them; so instead we look at the file content. > -+ # Grep'ing the first line is not enough: some people post-process > -+ # each Makefile.in and add a new line on top of each file to say so. > -+ # Grep'ing the whole file is not good either: AIX grep has a line > - # limit of 2048, but all sed's we know have understand at least 4000. > -- sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ > -- || continue > -- am_dirpart=`AS_DIRNAME(["$am_mf"])` > -- am_filepart=`AS_BASENAME(["$am_mf"])` > -- AM_RUN_LOG([cd "$am_dirpart" \ > -- && sed -e '/# am--include-marker/d' "$am_filepart" \ > -- | $MAKE -f - am--depfiles]) || am_rc=$? > -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then > -+ dirpart=`AS_DIRNAME("$mf")` > -+ else > -+ continue > -+ fi > -+ # Extract the definition of DEPDIR, am__include, and am__quote > -+ # from the Makefile without running 'make'. > -+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` > -+ test -z "$DEPDIR" && continue > -+ am__include=`sed -n 's/^am__include = //p' < "$mf"` > -+ test -z "$am__include" && continue > -+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` > -+ # Find all dependency output files, they are included files with > -+ # $(DEPDIR) in their names. We invoke sed twice because it is the > -+ # simplest approach to changing $(DEPDIR) to its actual value in the > -+ # expansion. > -+ for file in `sed -n " > -+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ > -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do > -+ # Make sure the directory exists. > -+ test -f "$dirpart/$file" && continue > -+ fdir=`AS_DIRNAME(["$file"])` > -+ AS_MKDIR_P([$dirpart/$fdir]) > -+ # echo "creating $dirpart/$file" > -+ echo '# dummy' > "$dirpart/$file" > -+ done > - done > -- if test $am_rc -ne 0; then > -- AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments > -- for automatic dependency tracking. If GNU make was not used, consider > -- re-running the configure script with MAKE="gmake" (or whatever is > -- necessary). You can also try re-running configure with the > -- '--disable-dependency-tracking' option to at least be able to build > -- the package (albeit without support for automatic dependency tracking).]) > -- fi > -- AS_UNSET([am_dirpart]) > -- AS_UNSET([am_filepart]) > -- AS_UNSET([am_mf]) > -- AS_UNSET([am_rc]) > -- rm -f conftest-deps.mk > - } > - ])# _AM_OUTPUT_DEPENDENCY_COMMANDS > ++# 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 > > -@@ -390,17 +397,18 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], > - # ----------------------------- > - # This macro should only be invoked once -- use via AC_REQUIRE. > - # > --# This code is only required when automatic dependency tracking is enabled. > --# This creates each '.Po' and '.Plo' makefile fragment that we'll need in > --# order to bootstrap the dependency handling code. > -+# This code is only required when automatic dependency tracking > -+# is enabled. FIXME. This creates each '.P' file that we will > -+# need in order to bootstrap the dependency handling code. > - AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], > - [AC_CONFIG_COMMANDS([depfiles], > - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], > -- [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) > -+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) > -+]) > +@@ -18764,6 +19461,9 @@ MAGIC_CMD=$MAGIC_CMD > + # Must we lock files when doing compilation? > + need_locks=$lt_need_locks > > - # Do all the work for Automake. -*- Autoconf -*- > ++# Manifest tool. > ++MANIFEST_TOOL=$lt_MANIFEST_TOOL > ++ > + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. > + DSYMUTIL=$lt_DSYMUTIL > > --# Copyright (C) 1996-2021 Free Software Foundation, Inc. > -+# Copyright (C) 1996-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -428,10 +436,6 @@ m4_defn([AC_PROG_CC]) > - # release and drop the old call support. > - AC_DEFUN([AM_INIT_AUTOMAKE], > - [AC_PREREQ([2.65])dnl > --m4_ifdef([_$0_ALREADY_INIT], > -- [m4_fatal([$0 expanded multiple times > --]m4_defn([_$0_ALREADY_INIT]))], > -- [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl > - dnl Autoconf wants to disallow AM_ names. We explicitly allow > - dnl the ones we care about. > - m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl > -@@ -468,7 +472,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl > - [_AM_SET_OPTIONS([$1])dnl > - dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. > - m4_if( > -- m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), > -+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), > - [ok:ok],, > - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl > - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl > -@@ -491,8 +495,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl > - AC_REQUIRE([AC_PROG_MKDIR_P])dnl > - # For better backward compatibility. To be removed once Automake 1.9.x > - # dies out for good. For more background, see: > --# > --# > -+# > -+# > - AC_SUBST([mkdir_p], ['$(MKDIR_P)']) > - # We need awk for the "check" target (and possibly the TAP driver). The > - # system "awk" is bad on some platforms. > -@@ -520,20 +524,6 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], > - [m4_define([AC_PROG_OBJCXX], > - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl > - ]) > --# Variables for tags utilities; see am/tags.am > --if test -z "$CTAGS"; then > -- CTAGS=ctags > --fi > --AC_SUBST([CTAGS]) > --if test -z "$ETAGS"; then > -- ETAGS=etags > --fi > --AC_SUBST([ETAGS]) > --if test -z "$CSCOPE"; then > -- CSCOPE=cscope > --fi > --AC_SUBST([CSCOPE]) > -- > - AC_REQUIRE([AM_SILENT_RULES])dnl > - dnl The testsuite driver may need to know about EXEEXT, so add the > - dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This > -@@ -573,7 +563,7 @@ END > - Aborting the configuration process, to ensure you take notice of the issue. > +@@ -18878,12 +19578,12 @@ with_gcc=$GCC > + # Compiler flag to turn off builtin functions. > + no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag > > - You can download and install GNU coreutils to get an 'rm' implementation > --that behaves properly: . > -+that behaves properly: . > +-# 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 > > - If you want to complete the configuration process using your problematic > - 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM > -@@ -615,7 +605,7 @@ for _am_header in $config_headers :; do > - done > - echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) > ++# 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 > > --# Copyright (C) 2001-2021 Free Software Foundation, Inc. > -+# Copyright (C) 2001-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -639,7 +629,7 @@ AC_SUBST([install_sh])]) > - # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- > - # From Jim Meyering > +@@ -18970,9 +19670,6 @@ inherit_rpath=$inherit_rpath > + # Whether libtool must link a program against all its dependency libraries. > + link_all_deplibs=$link_all_deplibs > > --# Copyright (C) 1996-2021 Free Software Foundation, Inc. > -+# Copyright (C) 1996-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -674,7 +664,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) > +-# 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 > > - # Check to see how 'make' treats includes. -*- Autoconf -*- > +@@ -18988,6 +19685,9 @@ include_expsyms=$lt_include_expsyms > + # Commands necessary for linking programs (against libraries) with templates. > + prelink_cmds=$lt_prelink_cmds > > --# Copyright (C) 2001-2021 Free Software Foundation, Inc. > -+# Copyright (C) 2001-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -682,42 +672,49 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) > ++# Commands necessary for finishing linking programs. > ++postlink_cmds=$lt_postlink_cmds > ++ > + # Specify filename containing input files. > + file_list_spec=$lt_file_list_spec > > - # AM_MAKE_INCLUDE() > - # ----------------- > --# Check whether make has an 'include' directive that can support all > --# the idioms we need for our automatic dependency tracking code. > -+# Check to see how make treats includes. > - AC_DEFUN([AM_MAKE_INCLUDE], > --[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) > --cat > confinc.mk << 'END' > -+[am_make=${MAKE-make} > -+cat > confinc << 'END' > - am__doit: > -- @echo this is the am__doit target >confinc.out > -+ @echo this is the am__doit target > - .PHONY: am__doit > - END > -+# If we don't find an include directive, just comment out the code. > -+AC_MSG_CHECKING([for style of include used by $am_make]) > - am__include="#" > - am__quote= > --# BSD make does it like this. > --echo '.include "confinc.mk" # ignored' > confmf.BSD > --# Other make implementations (GNU, Solaris 10, AIX) do it like this. > --echo 'include confinc.mk # ignored' > confmf.GNU > --_am_result=no > --for s in GNU BSD; do > -- AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) > -- AS_CASE([$?:`cat confinc.out 2>/dev/null`], > -- ['0:this is the am__doit target'], > -- [AS_CASE([$s], > -- [BSD], [am__include='.include' am__quote='"'], > -- [am__include='include' am__quote=''])]) > -- if test "$am__include" != "#"; then > -- _am_result="yes ($s style)" > -- break > +@@ -19020,210 +19720,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 > --done > --rm -f confinc.* confmf.* > --AC_MSG_RESULT([${_am_result}]) > --AC_SUBST([am__include])]) > --AC_SUBST([am__quote])]) > -+_am_result=none > -+# First try GNU make style include. > -+echo "include confinc" > confmf > -+# Ignore all kinds of additional output from 'make'. > -+case `$am_make -s -f confmf 2> /dev/null` in #( > -+*the\ am__doit\ target*) > -+ am__include=include > -+ am__quote= > -+ _am_result=GNU > -+ ;; > -+esac > -+# Now try BSD make style include. > -+if test "$am__include" = "#"; then > -+ echo '.include "confinc"' > confmf > -+ case `$am_make -s -f confmf 2> /dev/null` in #( > -+ *the\ am__doit\ target*) > -+ am__include=.include > -+ am__quote="\"" > -+ _am_result=BSD > -+ ;; > -+ esac > +-} > +- > +-# 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 > -+AC_SUBST([am__include]) > -+AC_SUBST([am__quote]) > -+AC_MSG_RESULT([$_am_result]) > -+rm -f confinc confmf > -+]) > - > - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- > - > --# Copyright (C) 1997-2021 Free Software Foundation, Inc. > -+# Copyright (C) 1997-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -738,7 +735,12 @@ AC_DEFUN([AM_MISSING_HAS_RUN], > - [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl > - AC_REQUIRE_AUX_FILE([missing])dnl > - if test x"${MISSING+set}" != xset; then > -- MISSING="\${SHELL} '$am_aux_dir/missing'" > -+ case $am_aux_dir in > -+ *\ * | *\ *) > -+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; > -+ *) > -+ MISSING="\${SHELL} $am_aux_dir/missing" ;; > -+ esac > - fi > - # Use eval to expand $SHELL > - if eval "$MISSING --is-lightweight"; then > -@@ -751,7 +753,7 @@ fi > - > - # Helper functions for option handling. -*- Autoconf -*- > - > --# Copyright (C) 2001-2021 Free Software Foundation, Inc. > -+# Copyright (C) 2001-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -780,7 +782,7 @@ AC_DEFUN([_AM_SET_OPTIONS], > - AC_DEFUN([_AM_IF_OPTION], > - [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) > - > --# Copyright (C) 1999-2021 Free Software Foundation, Inc. > -+# Copyright (C) 1999-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -827,7 +829,7 @@ AC_LANG_POP([C])]) > - # For backward compatibility. > - AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) > - > --# Copyright (C) 2001-2021 Free Software Foundation, Inc. > -+# Copyright (C) 2001-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -846,7 +848,7 @@ AC_DEFUN([AM_RUN_LOG], > - > - # Check to make sure that the build environment is sane. -*- Autoconf -*- > - > --# Copyright (C) 1996-2021 Free Software Foundation, Inc. > -+# Copyright (C) 1996-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -927,7 +929,7 @@ AC_CONFIG_COMMANDS_PRE( > - rm -f conftest.file > - ]) > - > --# Copyright (C) 2009-2021 Free Software Foundation, Inc. > -+# Copyright (C) 2009-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -987,7 +989,7 @@ AC_SUBST([AM_BACKSLASH])dnl > - _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl > - ]) > - > --# Copyright (C) 2001-2021 Free Software Foundation, Inc. > -+# Copyright (C) 2001-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -1015,7 +1017,7 @@ fi > - INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" > - AC_SUBST([INSTALL_STRIP_PROGRAM])]) > - > --# Copyright (C) 2006-2021 Free Software Foundation, Inc. > -+# Copyright (C) 2006-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > -@@ -1034,7 +1036,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) > - > - # Check how to create a tarball. -*- Autoconf -*- > ++ > ++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" > > --# Copyright (C) 2004-2021 Free Software Foundation, Inc. > -+# Copyright (C) 2004-2017 Free Software Foundation, Inc. > - # > - # This file is free software; the Free Software Foundation > - # gives unlimited permission to copy and/or distribute it, > +diff --git a/zlib/Makefile.in b/zlib/Makefile.in > +index 855c23eea23..0605835c14f 100644 > +--- a/zlib/Makefile.in > ++++ b/zlib/Makefile.in > +@@ -281,6 +281,7 @@ CPPFLAGS = @CPPFLAGS@ > + CYGPATH_W = @CYGPATH_W@ > + DEFS = @DEFS@ > + DEPDIR = @DEPDIR@ > ++DLLTOOL = @DLLTOOL@ > + DSYMUTIL = @DSYMUTIL@ > + DUMPBIN = @DUMPBIN@ > + ECHO_C = @ECHO_C@ > +@@ -305,6 +306,7 @@ LN_S = @LN_S@ > + LTLIBOBJS = @LTLIBOBJS@ > + MAINT = @MAINT@ > + MAKEINFO = @MAKEINFO@ > ++MANIFEST_TOOL = @MANIFEST_TOOL@ > + MKDIR_P = @MKDIR_P@ > + NM = @NM@ > + NMEDIT = @NMEDIT@ > +@@ -331,6 +333,7 @@ abs_builddir = @abs_builddir@ > + abs_srcdir = @abs_srcdir@ > + abs_top_builddir = @abs_top_builddir@ > + abs_top_srcdir = @abs_top_srcdir@ > ++ac_ct_AR = @ac_ct_AR@ > + ac_ct_CC = @ac_ct_CC@ > + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ > + am__include = @am__include@ > diff --git a/zlib/configure b/zlib/configure > -index 0a9ad9e8ccb..35b44e2819c 100755 > +index e65ade3badd..35b44e2819c 100755 > --- a/zlib/configure > +++ b/zlib/configure > @@ -646,8 +646,11 @@ OTOOL > @@ -29508,35 +33800,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > OBJDUMP > LN_S > NM > -@@ -666,6 +669,7 @@ am__nodep > - AMDEPBACKSLASH > - AMDEP_FALSE > - AMDEP_TRUE > -+am__quote > - am__include > - DEPDIR > - OBJEXT > -@@ -683,9 +687,6 @@ AM_BACKSLASH > - AM_DEFAULT_VERBOSITY > - AM_DEFAULT_V > - AM_V > --CSCOPE > --ETAGS > --CTAGS > - am__untar > - am__tar > - AMTAR > -@@ -760,8 +761,7 @@ PACKAGE_VERSION > - PACKAGE_TARNAME > - PACKAGE_NAME > - PATH_SEPARATOR > --SHELL > --am__quote' > -+SHELL' > - ac_subst_files='' > - ac_user_opts=' > - enable_option_checking > -@@ -777,6 +777,7 @@ enable_static > +@@ -774,6 +777,7 @@ enable_static > with_pic > enable_fast_install > with_gnu_ld > @@ -29544,7 +33808,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > enable_libtool_lock > enable_host_shared > ' > -@@ -1431,6 +1432,8 @@ Optional Packages: > +@@ -1428,6 +1432,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] > @@ -29553,150 +33817,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > > Some influential environment variables: > CC C compiler command > -@@ -2417,7 +2420,7 @@ test -n "$target_alias" && > - mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" > - > - > --am__api_version='1.16' > -+am__api_version='1.15' > - > - # Find a good install program. We prefer a C program (faster), > - # so one script is as good as another. But avoid the broken or > -@@ -2593,7 +2596,12 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` > - am_aux_dir=`cd "$ac_aux_dir" && pwd` > - > - if test x"${MISSING+set}" != xset; then > -- MISSING="\${SHELL} '$am_aux_dir/missing'" > -+ case $am_aux_dir in > -+ *\ * | *\ *) > -+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; > -+ *) > -+ MISSING="\${SHELL} $am_aux_dir/missing" ;; > -+ esac > - fi > - # Use eval to expand $SHELL > - if eval "$MISSING --is-lightweight"; then > -@@ -2928,8 +2936,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} > - > - # For better backward compatibility. To be removed once Automake 1.9.x > - # dies out for good. For more background, see: > --# > --# > -+# > -+# > - mkdir_p='$(MKDIR_P)' > - > - # We need awk for the "check" target (and possibly the TAP driver). The > -@@ -2948,20 +2956,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' > - > - > - > --# Variables for tags utilities; see am/tags.am > --if test -z "$CTAGS"; then > -- CTAGS=ctags > --fi > -- > --if test -z "$ETAGS"; then > -- ETAGS=etags > --fi > -- > --if test -z "$CSCOPE"; then > -- CSCOPE=cscope > --fi > -- > -- > - > - # POSIX will say in a future version that running "rm -f" with no argument > - # is OK; and we want to be able to make that assumption in our Makefile > -@@ -2994,7 +2988,7 @@ END > - Aborting the configuration process, to ensure you take notice of the issue. > - > - You can download and install GNU coreutils to get an 'rm' implementation > --that behaves properly: . > -+that behaves properly: . > - > - If you want to complete the configuration process using your problematic > - 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM > -@@ -3998,45 +3992,45 @@ DEPDIR="${am__leading_dot}deps" > - > - ac_config_commands="$ac_config_commands depfiles" > - > --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 > --$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } > --cat > confinc.mk << 'END' > -+ > -+am_make=${MAKE-make} > -+cat > confinc << 'END' > - am__doit: > -- @echo this is the am__doit target >confinc.out > -+ @echo this is the am__doit target > - .PHONY: am__doit > - END > -+# If we don't find an include directive, just comment out the code. > -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 > -+$as_echo_n "checking for style of include used by $am_make... " >&6; } > - am__include="#" > - am__quote= > --# BSD make does it like this. > --echo '.include "confinc.mk" # ignored' > confmf.BSD > --# Other make implementations (GNU, Solaris 10, AIX) do it like this. > --echo 'include confinc.mk # ignored' > confmf.GNU > --_am_result=no > --for s in GNU BSD; do > -- { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 > -- (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 > -- ac_status=$? > -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 > -- (exit $ac_status); } > -- case $?:`cat confinc.out 2>/dev/null` in #( > -- '0:this is the am__doit target') : > -- case $s in #( > -- BSD) : > -- am__include='.include' am__quote='"' ;; #( > -- *) : > -- am__include='include' am__quote='' ;; > --esac ;; #( > -- *) : > -- ;; > -+_am_result=none > -+# First try GNU make style include. > -+echo "include confinc" > confmf > -+# Ignore all kinds of additional output from 'make'. > -+case `$am_make -s -f confmf 2> /dev/null` in #( > -+*the\ am__doit\ target*) > -+ am__include=include > -+ am__quote= > -+ _am_result=GNU > -+ ;; > - esac > -- if test "$am__include" != "#"; then > -- _am_result="yes ($s style)" > -- break > -- fi > --done > --rm -f confinc.* confmf.* > --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 > --$as_echo "${_am_result}" >&6; } > -+# Now try BSD make style include. > -+if test "$am__include" = "#"; then > -+ echo '.include "confinc"' > confmf > -+ case `$am_make -s -f confmf 2> /dev/null` in #( > -+ *the\ am__doit\ target*) > -+ am__include=.include > -+ am__quote="\"" > -+ _am_result=BSD > -+ ;; > -+ esac > -+fi > -+ > -+ > -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 > -+$as_echo "$_am_result" >&6; } > -+rm -f confinc confmf > - > - # Check whether --enable-dependency-tracking was given. > - if test "${enable_dependency_tracking+set}" = set; then : > -@@ -4198,8 +4192,8 @@ esac > +@@ -4186,8 +4192,8 @@ esac > > > > @@ -29707,7 +33828,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > > > > -@@ -4239,7 +4233,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO > +@@ -4227,7 +4233,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. > @@ -29716,7 +33837,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > 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 > -@@ -5062,8 +5056,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; > +@@ -5050,8 +5056,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" > @@ -29727,7 +33848,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > && eval 'test $(( 1 + 1 )) -eq 2 \ > && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ > && xsi_shell=yes > -@@ -5112,6 +5106,80 @@ esac > +@@ -5100,6 +5106,80 @@ esac > > > > @@ -29808,7 +33929,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > { $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 ${lt_cv_ld_reload_flag+:} false; then : > -@@ -5128,6 +5196,11 @@ case $reload_flag in > +@@ -5116,6 +5196,11 @@ case $reload_flag in > esac > reload_cmds='$LD$reload_flag -o $output$reload_objs' > case $host_os in > @@ -29820,7 +33941,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > darwin*) > if test "$GCC" = yes; then > reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' > -@@ -5296,7 +5369,8 @@ mingw* | pw32*) > +@@ -5284,7 +5369,8 @@ mingw* | pw32*) > lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' > lt_cv_file_magic_cmd='func_win32_libid' > else > @@ -29830,7 +33951,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > lt_cv_file_magic_cmd='$OBJDUMP -f' > fi > ;; > -@@ -5450,6 +5524,21 @@ esac > +@@ -5438,6 +5524,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; } > @@ -29852,7 +33973,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > 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 > -@@ -5465,6 +5554,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown > +@@ -5453,6 +5554,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown > > > > @@ -30011,7 +34132,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > plugin_option= > plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" > for plugin in $plugin_names; do > -@@ -5479,8 +5720,10 @@ for plugin in $plugin_names; do > +@@ -5467,8 +5720,10 @@ for plugin in $plugin_names; do > done > > if test -n "$ac_tool_prefix"; then > @@ -30024,7 +34145,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 > $as_echo_n "checking for $ac_word... " >&6; } > if ${ac_cv_prog_AR+:} false; then : > -@@ -5496,7 +5739,7 @@ do > +@@ -5484,7 +5739,7 @@ do > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > @@ -30033,7 +34154,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > fi > -@@ -5516,11 +5759,15 @@ $as_echo "no" >&6; } > +@@ -5504,11 +5759,15 @@ $as_echo "no" >&6; } > fi > > > @@ -30052,7 +34173,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 > $as_echo_n "checking for $ac_word... " >&6; } > if ${ac_cv_prog_ac_ct_AR+:} false; then : > -@@ -5536,7 +5783,7 @@ do > +@@ -5524,7 +5783,7 @@ do > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > @@ -30061,7 +34182,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > fi > -@@ -5555,6 +5802,10 @@ else > +@@ -5543,6 +5802,10 @@ else > $as_echo "no" >&6; } > fi > > @@ -30072,7 +34193,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > if test "x$ac_ct_AR" = x; then > AR="false" > else > -@@ -5566,25 +5817,22 @@ ac_tool_warned=yes ;; > +@@ -5554,25 +5817,19 @@ ac_tool_warned=yes ;; > esac > AR=$ac_ct_AR > fi > @@ -30104,13 +34225,10 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > + rm -f conftest.* > +: ${AR=ar} > +: ${AR_FLAGS=cru} > -+ > -+ > -+ > > > > -@@ -5593,6 +5841,61 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru > +@@ -5584,6 +5841,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru > > > > @@ -30169,10 +34287,13 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > + > + > + > - > - > - > -@@ -5935,8 +6238,8 @@ esac > ++ > ++ > ++ > + 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 > +@@ -5923,8 +6238,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 > @@ -30183,7 +34304,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > > # Handle CRLF in mingw tool chain > opt_cr= > -@@ -5972,6 +6275,7 @@ for ac_symprfx in "" "_"; do > +@@ -5960,6 +6275,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 > @@ -30191,7 +34312,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > > # Check to see that the pipe works correctly. > pipe_works=no > -@@ -6013,6 +6317,18 @@ _LT_EOF > +@@ -6001,6 +6317,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 > @@ -30210,7 +34331,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > #ifdef __cplusplus > extern "C" { > #endif > -@@ -6024,7 +6340,7 @@ _LT_EOF > +@@ -6012,7 +6340,7 @@ _LT_EOF > cat <<_LT_EOF >> conftest.$ac_ext > > /* The mapping between symbol names and symbols. */ > @@ -30219,7 +34340,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > const char *name; > void *address; > } > -@@ -6050,8 +6366,8 @@ static const void *lt_preloaded_setup() { > +@@ -6038,8 +6366,8 @@ static const void *lt_preloaded_setup() { > _LT_EOF > # Now try linking the two files. > mv conftest.$ac_objext conftstm.$ac_objext > @@ -30230,7 +34351,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > LIBS="conftstm.$ac_objext" > CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" > if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 > -@@ -6061,8 +6377,8 @@ _LT_EOF > +@@ -6049,8 +6377,8 @@ _LT_EOF > test $ac_status = 0; } && test -s conftest${ac_exeext}; then > pipe_works=yes > fi > @@ -30241,7 +34362,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > else > echo "cannot find nm_test_func in $nlist" >&5 > fi > -@@ -6099,6 +6415,16 @@ else > +@@ -6087,6 +6415,17 @@ else > $as_echo "ok" >&6; } > fi > > @@ -30255,10 +34376,11 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > + > + > + > ++ > > > > -@@ -6116,6 +6442,44 @@ fi > +@@ -6104,6 +6443,43 @@ fi > > > > @@ -30267,7 +34389,6 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > + > + > + > -+ > +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 > +$as_echo_n "checking for sysroot... " >&6; } > + > @@ -30303,18 +34424,10 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > > > > -@@ -6324,11 +6688,128 @@ sparc*-*solaris*) > - ;; > - esac > - fi > -- rm -rf conftest* > -- ;; > -+ rm -rf conftest* > -+ ;; > -+esac > -+ > -+need_locks="$enable_libtool_lock" > -+ > +@@ -6318,6 +6694,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 > @@ -30400,7 +34513,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > +{ $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 > ++esac > + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL > + fi > +else > @@ -30430,12 +34543,12 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > + > + > + > - > --need_locks="$enable_libtool_lock" > - > ++ > ++ > > case $host_os in > -@@ -6896,6 +7377,8 @@ _LT_EOF > + rhapsody* | darwin*) > +@@ -6884,6 +7377,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 > @@ -30444,7 +34557,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > cat > conftest.c << _LT_EOF > int main() { return 0;} > _LT_EOF > -@@ -7745,8 +8228,6 @@ fi > +@@ -7733,8 +8228,6 @@ fi > lt_prog_compiler_pic= > lt_prog_compiler_static= > > @@ -30453,7 +34566,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > > if test "$GCC" = yes; then > lt_prog_compiler_wl='-Wl,' > -@@ -7912,6 +8393,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > +@@ -7900,6 +8393,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > lt_prog_compiler_pic='--shared' > lt_prog_compiler_static='--static' > ;; > @@ -30466,7 +34579,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) > # Portland Group compilers (*not* the Pentium gcc compiler, > # which looks to be a dead project) > -@@ -7974,7 +8461,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } > +@@ -7962,7 +8461,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 > @@ -30475,7 +34588,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > lt_prog_compiler_wl='-Qoption ld ';; > *) > lt_prog_compiler_wl='-Wl,';; > -@@ -8031,13 +8518,17 @@ case $host_os in > +@@ -8019,13 +8518,17 @@ case $host_os in > lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" > ;; > esac > @@ -30499,7 +34612,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > > # > # Check to make sure the PIC flag actually works. > -@@ -8098,6 +8589,11 @@ fi > +@@ -8086,6 +8589,11 @@ fi > > > > @@ -30511,7 +34624,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > # > # Check to make sure the static flag actually works. > # > -@@ -8448,7 +8944,8 @@ _LT_EOF > +@@ -8436,7 +8944,8 @@ _LT_EOF > allow_undefined_flag=unsupported > always_export_symbols=no > enable_shared_with_static_runtimes=yes > @@ -30521,7 +34634,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > > 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' > -@@ -8547,12 +9044,12 @@ _LT_EOF > +@@ -8535,12 +9044,12 @@ _LT_EOF > whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' > hardcode_libdir_flag_spec= > hardcode_libdir_flag_spec_ld='-rpath $libdir' > @@ -30536,7 +34649,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > fi > ;; > esac > -@@ -8566,8 +9063,8 @@ _LT_EOF > +@@ -8554,8 +9063,8 @@ _LT_EOF > archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' > wlarc= > else > @@ -30547,7 +34660,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > fi > ;; > > -@@ -8585,8 +9082,8 @@ _LT_EOF > +@@ -8573,8 +9082,8 @@ _LT_EOF > > _LT_EOF > elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then > @@ -30558,7 +34671,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > else > ld_shlibs=no > fi > -@@ -8632,8 +9129,8 @@ _LT_EOF > +@@ -8620,8 +9129,8 @@ _LT_EOF > > *) > if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then > @@ -30569,7 +34682,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > else > ld_shlibs=no > fi > -@@ -8763,7 +9260,13 @@ _LT_EOF > +@@ -8751,7 +9260,13 @@ _LT_EOF > allow_undefined_flag='-berok' > # Determine the default libpath from the value encoded in an > # empty executable. > @@ -30584,7 +34697,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 > fi > cat confdefs.h - <<_ACEOF >conftest.$ac_ext > -@@ -8779,22 +9282,29 @@ main () > +@@ -8767,22 +9282,29 @@ main () > _ACEOF > if ac_fn_c_try_link "$LINENO"; then : > > @@ -30627,7 +34740,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > > 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" > -@@ -8806,7 +9316,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -8794,7 +9316,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. > @@ -30642,7 +34755,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 > fi > cat confdefs.h - <<_ACEOF >conftest.$ac_ext > -@@ -8822,22 +9338,29 @@ main () > +@@ -8810,22 +9338,29 @@ main () > _ACEOF > if ac_fn_c_try_link "$LINENO"; then : > > @@ -30685,7 +34798,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > > hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" > # Warning - without using the other run time loading flags, > -@@ -8882,20 +9405,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -8870,20 +9405,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. > @@ -30763,7 +34876,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > ;; > > darwin* | rhapsody*) > -@@ -8956,7 +9522,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -8944,7 +9522,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*) > @@ -30772,7 +34885,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > hardcode_libdir_flag_spec='-R$libdir' > hardcode_direct=yes > hardcode_shlibpath_var=no > -@@ -8964,7 +9530,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -8952,7 +9530,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > hpux9*) > if test "$GCC" = yes; then > @@ -30781,7 +34894,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > 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 > -@@ -8980,7 +9546,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -8968,7 +9546,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > > hpux10*) > if test "$GCC" = yes && test "$with_gnu_ld" = no; then > @@ -30790,7 +34903,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > else > archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' > fi > -@@ -9004,10 +9570,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi > +@@ -8992,10 +9570,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*) > @@ -30803,7 +34916,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > ;; > esac > else > -@@ -9086,26 +9652,39 @@ fi > +@@ -9074,26 +9652,39 @@ fi > > irix5* | irix6* | nonstopux*) > if test "$GCC" = yes; then > @@ -30851,7 +34964,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > 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' > -@@ -9190,7 +9769,7 @@ rm -f core conftest.err conftest.$ac_objext \ > +@@ -9178,7 +9769,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}\*' > @@ -30860,7 +34973,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' > else > allow_undefined_flag=' -expect_unresolved \*' > -@@ -9209,9 +9788,9 @@ rm -f core conftest.err conftest.$ac_objext \ > +@@ -9197,9 +9788,9 @@ rm -f core conftest.err conftest.$ac_objext \ > no_undefined_flag=' -z defs' > if test "$GCC" = yes; then > wlarc='${wl}' > @@ -30872,7 +34985,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > else > case `$CC -V 2>&1` in > *"Compilers 5.0"*) > -@@ -9787,8 +10366,9 @@ cygwin* | mingw* | pw32* | cegcc*) > +@@ -9775,8 +10366,9 @@ cygwin* | mingw* | pw32* | cegcc*) > need_version=no > need_lib_prefix=no > > @@ -30884,7 +34997,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > library_names_spec='$libname.dll.a' > # DLL is installed to $(libdir)/../bin by postinstall_cmds > postinstall_cmds='base_file=`basename \${file}`~ > -@@ -9821,13 +10401,71 @@ cygwin* | mingw* | pw32* | cegcc*) > +@@ -9809,13 +10401,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 > @@ -30957,16 +35070,16 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > # FIXME: first we should search . and the directory the executable is in > shlibpath_var=PATH > ;; > -@@ -10723,7 +11361,7 @@ else > +@@ -10711,7 +11361,7 @@ else > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF > --#line 10726 "configure" > +-#line 10714 "configure" > +#line $LINENO "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > -@@ -10767,10 +11405,10 @@ else > +@@ -10755,10 +11405,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)) > @@ -30979,16 +35092,16 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > int main () > { > void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > -@@ -10829,7 +11467,7 @@ else > +@@ -10817,7 +11467,7 @@ else > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF > --#line 10832 "configure" > +-#line 10820 "configure" > +#line $LINENO "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > -@@ -10873,10 +11511,10 @@ else > +@@ -10861,10 +11511,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)) > @@ -31001,16 +35114,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > int main () > { > void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); > -@@ -12308,7 +12946,7 @@ CC="$CC" > - CXX="$CXX" > - GFORTRAN="$GFORTRAN" > - GDC="$GDC" > --AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" > -+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" > - > - > - # The HP-UX ksh and POSIX shell print the target directory to stdout > -@@ -12346,13 +12984,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' > +@@ -12334,13 +12984,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"`' > @@ -31031,7 +35135,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > 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"`' > -@@ -12367,14 +13012,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de > +@@ -12355,14 +13012,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"`' > @@ -31050,7 +35154,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' > NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' > LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' > -@@ -12407,12 +13055,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q > +@@ -12395,12 +13055,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"`' > @@ -31064,7 +35168,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > 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"`' > -@@ -12467,8 +13115,13 @@ reload_flag \ > +@@ -12455,8 +13115,13 @@ reload_flag \ > OBJDUMP \ > deplibs_check_method \ > file_magic_cmd \ > @@ -31078,7 +35182,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > STRIP \ > RANLIB \ > CC \ > -@@ -12478,12 +13131,14 @@ lt_cv_sys_global_symbol_pipe \ > +@@ -12466,12 +13131,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 \ > @@ -31094,7 +35198,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > DSYMUTIL \ > NMEDIT \ > LIPO \ > -@@ -12499,7 +13154,6 @@ no_undefined_flag \ > +@@ -12487,7 +13154,6 @@ no_undefined_flag \ > hardcode_libdir_flag_spec \ > hardcode_libdir_flag_spec_ld \ > hardcode_libdir_separator \ > @@ -31102,7 +35206,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > exclude_expsyms \ > include_expsyms \ > file_list_spec \ > -@@ -12535,6 +13189,7 @@ module_cmds \ > +@@ -12523,6 +13189,7 @@ module_cmds \ > module_expsym_cmds \ > export_symbols_cmds \ > prelink_cmds \ > @@ -31110,149 +35214,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > postinstall_cmds \ > postuninstall_cmds \ > finish_cmds \ > -@@ -13023,35 +13678,29 @@ esac ;; > - # Older Autoconf quotes --file arguments for eval, but not when files > - # are listed without --file. Let's play safe and only enable the eval > - # if we detect the quoting. > -- # TODO: see whether this extra hack can be removed once we start > -- # requiring Autoconf 2.70 or later. > -- case $CONFIG_FILES in #( > -- *\'*) : > -- eval set x "$CONFIG_FILES" ;; #( > -- *) : > -- set x $CONFIG_FILES ;; #( > -- *) : > -- ;; > --esac > -+ case $CONFIG_FILES in > -+ *\'*) eval set x "$CONFIG_FILES" ;; > -+ *) set x $CONFIG_FILES ;; > -+ esac > - shift > -- # Used to flag and report bootstrapping failures. > -- am_rc=0 > -- for am_mf > -+ for mf > - do > - # Strip MF so we end up with the name of the file. > -- am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` > -- # Check whether this is an Automake generated Makefile which includes > -- # dependency-tracking related rules and includes. > -- # Grep'ing the whole file directly is not great: AIX grep has a line > -+ mf=`echo "$mf" | sed -e 's/:.*$//'` > -+ # Check whether this is an Automake generated Makefile or not. > -+ # We used to match only the files named 'Makefile.in', but > -+ # some people rename them; so instead we look at the file content. > -+ # Grep'ing the first line is not enough: some people post-process > -+ # each Makefile.in and add a new line on top of each file to say so. > -+ # Grep'ing the whole file is not good either: AIX grep has a line > - # limit of 2048, but all sed's we know have understand at least 4000. > -- sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ > -- || continue > -- am_dirpart=`$as_dirname -- "$am_mf" || > --$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ > -- X"$am_mf" : 'X\(//\)[^/]' \| \ > -- X"$am_mf" : 'X\(//\)$' \| \ > -- X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || > --$as_echo X"$am_mf" | > -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then > -+ dirpart=`$as_dirname -- "$mf" || > -+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ > -+ X"$mf" : 'X\(//\)[^/]' \| \ > -+ X"$mf" : 'X\(//\)$' \| \ > -+ X"$mf" : 'X\(/\)' \| . 2>/dev/null || > -+$as_echo X"$mf" | > - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ > - s//\1/ > - q > -@@ -13069,50 +13718,53 @@ $as_echo X"$am_mf" | > - q > - } > - s/.*/./; q'` > -- am_filepart=`$as_basename -- "$am_mf" || > --$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ > -- X"$am_mf" : 'X\(//\)$' \| \ > -- X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || > --$as_echo X/"$am_mf" | > -- sed '/^.*\/\([^/][^/]*\)\/*$/{ > -+ else > -+ continue > -+ fi > -+ # Extract the definition of DEPDIR, am__include, and am__quote > -+ # from the Makefile without running 'make'. > -+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` > -+ test -z "$DEPDIR" && continue > -+ am__include=`sed -n 's/^am__include = //p' < "$mf"` > -+ test -z "$am__include" && continue > -+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` > -+ # Find all dependency output files, they are included files with > -+ # $(DEPDIR) in their names. We invoke sed twice because it is the > -+ # simplest approach to changing $(DEPDIR) to its actual value in the > -+ # expansion. > -+ for file in `sed -n " > -+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ > -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do > -+ # Make sure the directory exists. > -+ test -f "$dirpart/$file" && continue > -+ fdir=`$as_dirname -- "$file" || > -+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ > -+ X"$file" : 'X\(//\)[^/]' \| \ > -+ X"$file" : 'X\(//\)$' \| \ > -+ X"$file" : 'X\(/\)' \| . 2>/dev/null || > -+$as_echo X"$file" | > -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ > - s//\1/ > - q > - } > -- /^X\/\(\/\/\)$/{ > -+ /^X\(\/\/\)[^/].*/{ > - s//\1/ > - q > - } > -- /^X\/\(\/\).*/{ > -+ /^X\(\/\/\)$/{ > -+ s//\1/ > -+ q > -+ } > -+ /^X\(\/\).*/{ > - s//\1/ > - q > - } > - s/.*/./; q'` > -- { echo "$as_me:$LINENO: cd "$am_dirpart" \ > -- && sed -e '/# am--include-marker/d' "$am_filepart" \ > -- | $MAKE -f - am--depfiles" >&5 > -- (cd "$am_dirpart" \ > -- && sed -e '/# am--include-marker/d' "$am_filepart" \ > -- | $MAKE -f - am--depfiles) >&5 2>&5 > -- ac_status=$? > -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 > -- (exit $ac_status); } || am_rc=$? > -+ as_dir=$dirpart/$fdir; as_fn_mkdir_p > -+ # echo "creating $dirpart/$file" > -+ echo '# dummy' > "$dirpart/$file" > -+ done > - done > -- if test $am_rc -ne 0; then > -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 > --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} > --as_fn_error $? "Something went wrong bootstrapping makefile fragments > -- for automatic dependency tracking. If GNU make was not used, consider > -- re-running the configure script with MAKE=\"gmake\" (or whatever is > -- necessary). You can also try re-running configure with the > -- '--disable-dependency-tracking' option to at least be able to build > -- the package (albeit without support for automatic dependency tracking). > --See \`config.log' for more details" "$LINENO" 5; } > -- fi > -- { am_dirpart=; unset am_dirpart;} > -- { am_filepart=; unset am_filepart;} > -- { am_mf=; unset am_mf;} > -- { am_rc=; unset am_rc;} > -- rm -f conftest-deps.mk > - } > - ;; > - "libtool":C) > -@@ -13136,7 +13788,8 @@ See \`config.log' for more details" "$LINENO" 5; } > +@@ -13121,7 +13788,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, > @@ -31262,7 +35224,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > # Written by Gordon Matzigkeit, 1996 > # > # This file is part of GNU Libtool. > -@@ -13239,19 +13892,42 @@ SP2NL=$lt_lt_SP2NL > +@@ -13224,19 +13892,42 @@ SP2NL=$lt_lt_SP2NL > # turn newlines into spaces. > NL2SP=$lt_lt_NL2SP > > @@ -31306,7 +35268,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > # A symbol stripping program. > STRIP=$lt_STRIP > > -@@ -13281,6 +13957,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address > +@@ -13266,6 +13957,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 > > @@ -31319,7 +35281,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > # The name of the directory that contains temporary libtool files. > objdir=$objdir > > -@@ -13290,6 +13972,9 @@ MAGIC_CMD=$MAGIC_CMD > +@@ -13275,6 +13972,9 @@ MAGIC_CMD=$MAGIC_CMD > # Must we lock files when doing compilation? > need_locks=$lt_need_locks > > @@ -31329,7 +35291,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > # Tool to manipulate archived DWARF debug symbol files on Mac OS X. > DSYMUTIL=$lt_DSYMUTIL > > -@@ -13404,12 +14089,12 @@ with_gcc=$GCC > +@@ -13389,12 +14089,12 @@ with_gcc=$GCC > # Compiler flag to turn off builtin functions. > no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag > > @@ -31345,7 +35307,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > # Compiler flag to prevent dynamic linking. > link_static_flag=$lt_lt_prog_compiler_static > > -@@ -13496,9 +14181,6 @@ inherit_rpath=$inherit_rpath > +@@ -13481,9 +14181,6 @@ inherit_rpath=$inherit_rpath > # Whether libtool must link a program against all its dependency libraries. > link_all_deplibs=$link_all_deplibs > > @@ -31355,7 +35317,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > # Set to "yes" if exported symbols are required. > always_export_symbols=$always_export_symbols > > -@@ -13514,6 +14196,9 @@ include_expsyms=$lt_include_expsyms > +@@ -13499,6 +14196,9 @@ include_expsyms=$lt_include_expsyms > # Commands necessary for linking programs (against libraries) with templates. > prelink_cmds=$lt_prelink_cmds > > @@ -31365,7 +35327,7 @@ index 0a9ad9e8ccb..35b44e2819c 100755 > # Specify filename containing input files. > file_list_spec=$lt_file_list_spec > > -@@ -13546,210 +14231,169 @@ ltmain="$ac_aux_dir/ltmain.sh" > +@@ -13531,210 +14231,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? > diff --git a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch > index 2c4ffec4e6..ce795b7522 100644 > --- a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch > +++ b/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch > @@ -1,4 +1,4 @@ > -From 98410efc334e31ccfbdc0080fb293b0e06885454 Mon Sep 17 00:00:00 2001 > +From d6f4f62fda4fde10b805b06d5e61792ee821449c Mon Sep 17 00:00:00 2001 > From: Khem Raj > Date: Mon, 2 Mar 2015 01:42:38 +0000 > Subject: [PATCH] Fix rpath in libtool when sysroot is enabled > diff --git a/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch > index 199aafcaee..910bd38694 100644 > --- a/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch > +++ b/meta/recipes-devtools/binutils/binutils/0010-sync-with-OE-libtool-changes.patch > @@ -1,4 +1,4 @@ > -From 84fc4ceafcbfad4c6ddc9d65f6a425bd62dd062e Mon Sep 17 00:00:00 2001 > +From 654b4ea9e28aad037e788672ca0d9ba450b3285e Mon Sep 17 00:00:00 2001 > From: Ross Burton > Date: Mon, 6 Mar 2017 23:33:27 -0800 > Subject: [PATCH] sync with OE libtool changes > diff --git a/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch b/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch > index f75ec2ee9d..a825f9c842 100644 > --- a/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch > +++ b/meta/recipes-devtools/binutils/binutils/0011-Check-for-clang-before-checking-gcc-version.patch > @@ -1,4 +1,4 @@ > -From 628c10087e6e11a7bc748437c5b695835b704aaf Mon Sep 17 00:00:00 2001 > +From 9d35ab04de550f1db5d2e74d37fdeab4ca436148 Mon Sep 17 00:00:00 2001 > From: Khem Raj > Date: Wed, 15 Apr 2020 14:17:20 -0700 > Subject: [PATCH] Check for clang before checking gcc version > @@ -18,10 +18,10 @@ Signed-off-by: Khem Raj > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > -index be433ef6d5d..7494fbd2f06 100755 > +index 417fc5a970c..bdc3583215f 100755 > --- a/configure > +++ b/configure > -@@ -5294,7 +5294,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu > +@@ -5460,7 +5460,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu > cat confdefs.h - <<_ACEOF >conftest.$ac_ext > /* end confdefs.h. */ > > @@ -31,10 +31,10 @@ index be433ef6d5d..7494fbd2f06 100755 > #endif > int main() {} > diff --git a/configure.ac b/configure.ac > -index 1651cbf3b02..2e2ecc47542 100644 > +index 3a1eb0357e5..1c00b9aec42 100644 > --- a/configure.ac > +++ b/configure.ac > -@@ -1323,7 +1323,7 @@ if test "$GCC" = yes; then > +@@ -1444,7 +1444,7 @@ if test "$GCC" = yes; then > AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) > AC_LANG_PUSH(C++) > AC_LINK_IFELSE([AC_LANG_SOURCE([ > diff --git a/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch > index c4b4198910..1871fbc799 100644 > --- a/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch > +++ b/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch > @@ -1,4 +1,4 @@ > -From 63157cb403b6aa13147840c036a8555c4ea9c166 Mon Sep 17 00:00:00 2001 > +From 9a296e537708296d32c07c1dc681f59de3d1acf9 Mon Sep 17 00:00:00 2001 > From: Khem Raj > Date: Thu, 10 Mar 2022 21:21:33 -0800 > Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty > @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj > 1 file changed, 5 insertions(+) > > diff --git a/ld/ldelf.c b/ld/ldelf.c > -index 0d61a3209ec..cd0da2013e2 100644 > +index 95787012b89..bc29909386f 100644 > --- a/ld/ldelf.c > +++ b/ld/ldelf.c > @@ -1127,6 +1127,9 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab, > diff --git a/meta/recipes-devtools/binutils/binutils/0013-CVE-2022-38533.patch b/meta/recipes-devtools/binutils/binutils/0013-CVE-2022-38533.patch > deleted file mode 100644 > index 5d9ac2cb1f..0000000000 > --- a/meta/recipes-devtools/binutils/binutils/0013-CVE-2022-38533.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -From ef186fe54aa6d281a3ff8a9528417e5cc614c797 Mon Sep 17 00:00:00 2001 > -From: Alan Modra > -Date: Sat, 13 Aug 2022 15:32:47 +0930 > -Subject: [PATCH] PR29482 - strip: heap-buffer-overflow > - > - PR 29482 > - * coffcode.h (coff_set_section_contents): Sanity check _LIB. > - > -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ef186fe54aa6d281a3ff8a9528417e5cc614c797] > - > -Signed-off-by: Pgowda > - > ---- > - bfd/coffcode.h | 7 +++++-- > - 1 file changed, 5 insertions(+), 2 deletions(-) > - > -diff --git a/bfd/coffcode.h b/bfd/coffcode.h > -index 67aaf158ca1..52027981c3f 100644 > ---- a/bfd/coffcode.h > -+++ b/bfd/coffcode.h > -@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd, > - > - rec = (bfd_byte *) location; > - recend = rec + count; > -- while (rec < recend) > -+ while (recend - rec >= 4) > - { > -+ size_t len = bfd_get_32 (abfd, rec); > -+ if (len == 0 || len > (size_t) (recend - rec) / 4) > -+ break; > -+ rec += len * 4; > - ++section->lma; > -- rec += bfd_get_32 (abfd, rec) * 4; > - } > - > - BFD_ASSERT (rec == recend); > diff --git a/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch b/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch > new file mode 100644 > index 0000000000..91ac606f78 > --- /dev/null > +++ b/meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch > @@ -0,0 +1,48 @@ > +From 5fb47367d885a4a32625f09138b306d36ec3769f Mon Sep 17 00:00:00 2001 > +From: Khem Raj > +Date: Sun, 15 Jan 2023 00:16:25 -0800 > +Subject: [PATCH] Define alignof using _Alignof when using C11 or newer > + > +WG14 N2350 made very clear that it is an UB having type definitions > +within "offsetof" [1]. This patch enhances the implementation of macro > +alignof to use builtin "_Alignof" to avoid undefined behavior on > +when using std=c11 or newer > + > +clang 16+ has started to flag this [2] > + > +Fixes build when using -std >= gnu11 and using clang16+ > + > +Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it > +may support C11, exclude those compilers too > + > +[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm > +[2] https://reviews.llvm.org/D133574 > + > +Upstream-Status: Pending > +Signed-off-by: Khem Raj > +--- > + libiberty/sha1.c | 10 ++++++++++ > + 1 file changed, 10 insertions(+) > + > +diff --git a/libiberty/sha1.c b/libiberty/sha1.c > +index 6c71e3ebb41..a2caf947d31 100644 > +--- a/libiberty/sha1.c > ++++ b/libiberty/sha1.c > +@@ -229,7 +229,17 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) > + if (len >= 64) > + { > + #if !_STRING_ARCH_unaligned > ++/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 > ++ . > ++ clang versions < 8.0.0 have the same bug. */ > ++#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ > ++ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ > ++ && !defined __clang__) \ > ++ || (defined __clang__ && __clang_major__ < 8)) > + # define alignof(type) offsetof (struct { char c; type x; }, x) > ++#else > ++# define alignof(type) _Alignof(type) > ++#endif > + # define UNALIGNED_P(p) (((size_t) p) % alignof (sha1_uint32) != 0) > + if (UNALIGNED_P (buffer)) > + while (len > 64) > diff --git a/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-1.patch b/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-1.patch > deleted file mode 100644 > index 0a490d86b3..0000000000 > --- a/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-1.patch > +++ /dev/null > @@ -1,350 +0,0 @@ > -From f07c08e115e27cddf5a0030dc6332bbee1bd9c6a Mon Sep 17 00:00:00 2001 > -From: Alan Modra > -Date: Thu, 21 Jul 2022 08:38:14 +0930 > -Subject: [PATCH] binutils/dwarf.c: abbrev caching > - > -I'm inclined to think that abbrev caching is counter-productive. The > -time taken to search the list of abbrevs converted to internal form is > -non-zero, and it's easy to decode the raw abbrevs. It's especially > -silly to cache empty lists of decoded abbrevs (happens with zero > -padding in .debug_abbrev), or abbrevs as they are displayed when there > -is no further use of those abbrevs. This patch stops caching in those > -cases. > - > - * dwarf.c (record_abbrev_list_for_cu): Add free_list param. > - Put abbrevs on abbrev_lists here. > - (new_abbrev_list): Delete function. > - (process_abbrev_set): Return newly allocated list. Move > - abbrev base, offset and size checking to.. > - (find_and_process_abbrev_set): ..here, new function. Handle > - lookup of cached abbrevs here, and calculate start and end > - for process_abbrev_set. Return free_list if newly alloc'd. > - (process_debug_info): Consolidate cached list lookup, new list > - alloc and processing into find_and_process_abbrev_set call. > - Free list when not cached. > - (display_debug_abbrev): Similarly. > - > -Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=f07c08e115e27cddf5a0030dc6332bbee1bd9c6a] > - > -Signed-off-by: Pgowda > ---- > - binutils/dwarf.c | 208 +++++++++++++++++++++++++---------------------- > - 1 file changed, 110 insertions(+), 98 deletions(-) > - > -diff --git a/binutils/dwarf.c b/binutils/dwarf.c > -index 267ed3bb382..2fc352f74c5 100644 > ---- a/binutils/dwarf.c > -+++ b/binutils/dwarf.c > -@@ -882,8 +882,15 @@ static unsigned long next_free_abbrev_m > - #define ABBREV_MAP_ENTRIES_INCREMENT 8 > - > - static void > --record_abbrev_list_for_cu (dwarf_vma start, dwarf_vma end, abbrev_list * list) > -+record_abbrev_list_for_cu (dwarf_vma start, dwarf_vma end, > -+ abbrev_list *list, abbrev_list *free_list) > - { > -+ if (free_list != NULL) > -+ { > -+ list->next = abbrev_lists; > -+ abbrev_lists = list; > -+ } > -+ > - if (cu_abbrev_map == NULL) > - { > - num_abbrev_map_entries = INITIAL_NUM_ABBREV_MAP_ENTRIES; > -@@ -936,20 +943,6 @@ free_all_abbrevs (void) > - } > - > - static abbrev_list * > --new_abbrev_list (dwarf_vma abbrev_base, dwarf_vma abbrev_offset) > --{ > -- abbrev_list * list = (abbrev_list *) xcalloc (sizeof * list, 1); > -- > -- list->abbrev_base = abbrev_base; > -- list->abbrev_offset = abbrev_offset; > -- > -- list->next = abbrev_lists; > -- abbrev_lists = list; > -- > -- return list; > --} > -- > --static abbrev_list * > - find_abbrev_list_by_abbrev_offset (dwarf_vma abbrev_base, > - dwarf_vma abbrev_offset) > - { > -@@ -966,7 +959,7 @@ find_abbrev_list_by_abbrev_offset (dwarf > - /* Find the abbreviation map for the CU that includes OFFSET. > - OFFSET is an absolute offset from the start of the .debug_info section. */ > - /* FIXME: This function is going to slow down readelf & objdump. > -- Consider using a better algorithm to mitigate this effect. */ > -+ Not caching abbrevs is likely the answer. */ > - > - static abbrev_map * > - find_abbrev_map_by_offset (dwarf_vma offset) > -@@ -1033,40 +1026,18 @@ add_abbrev_attr (unsigned long attrib > - list->last_abbrev->last_attr = attr; > - } > - > --/* Processes the (partial) contents of a .debug_abbrev section. > -- Returns NULL if the end of the section was encountered. > -- Returns the address after the last byte read if the end of > -- an abbreviation set was found. */ > -+/* Return processed (partial) contents of a .debug_abbrev section. > -+ Returns NULL on errors. */ > - > --static unsigned char * > -+static abbrev_list * > - process_abbrev_set (struct dwarf_section *section, > -- dwarf_vma abbrev_base, > -- dwarf_vma abbrev_size, > -- dwarf_vma abbrev_offset, > -- abbrev_list *list) > -+ unsigned char *start, > -+ unsigned char *end) > - { > -- if (abbrev_base >= section->size > -- || abbrev_size > section->size - abbrev_base) > -- { > -- /* PR 17531: file:4bcd9ce9. */ > -- warn (_("Debug info is corrupted, abbrev size (%lx) is larger than " > -- "abbrev section size (%lx)\n"), > -- (unsigned long) (abbrev_base + abbrev_size), > -- (unsigned long) section->size); > -- return NULL; > -- } > -- if (abbrev_offset >= abbrev_size) > -- { > -- warn (_("Debug info is corrupted, abbrev offset (%lx) is larger than " > -- "abbrev section size (%lx)\n"), > -- (unsigned long) abbrev_offset, > -- (unsigned long) abbrev_size); > -- return NULL; > -- } > -+ abbrev_list *list = xmalloc (sizeof (*list)); > -+ list->first_abbrev = NULL; > -+ list->last_abbrev = NULL; > - > -- unsigned char *start = section->start + abbrev_base; > -- unsigned char *end = start + abbrev_size; > -- start += abbrev_offset; > - while (start < end) > - { > - unsigned long entry; > -@@ -1079,14 +1050,18 @@ process_abbrev_set (struct dwarf_section > - /* A single zero is supposed to end the set according > - to the standard. If there's more, then signal that to > - the caller. */ > -- if (start == end) > -- return NULL; > -- if (entry == 0) > -- return start; > -+ if (start == end || entry == 0) > -+ { > -+ list->start_of_next_abbrevs = start != end ? start : NULL; > -+ return list; > -+ } > - > - READ_ULEB (tag, start, end); > - if (start == end) > -- return NULL; > -+ { > -+ free (list); > -+ return NULL; > -+ } > - > - children = *start++; > - > -@@ -1121,9 +1096,67 @@ process_abbrev_set (struct dwarf_section > - /* Report the missing single zero which ends the section. */ > - error (_(".debug_abbrev section not zero terminated\n")); > - > -+ free (list); > - return NULL; > - } > - > -+/* Return a sequence of abbrevs in SECTION starting at ABBREV_BASE > -+ plus ABBREV_OFFSET and finishing at ABBREV_BASE + ABBREV_SIZE. > -+ If FREE_LIST is non-NULL search the already decoded abbrevs on > -+ abbrev_lists first and if found set *FREE_LIST to NULL. If > -+ searching doesn't find a matching abbrev, set *FREE_LIST to the > -+ newly allocated list. If FREE_LIST is NULL, no search is done and > -+ the returned abbrev_list is always newly allocated. */ > -+ > -+static abbrev_list * > -+find_and_process_abbrev_set (struct dwarf_section *section, > -+ dwarf_vma abbrev_base, > -+ dwarf_vma abbrev_size, > -+ dwarf_vma abbrev_offset, > -+ abbrev_list **free_list) > -+{ > -+ if (free_list) > -+ *free_list = NULL; > -+ > -+ if (abbrev_base >= section->size > -+ || abbrev_size > section->size - abbrev_base) > -+ { > -+ /* PR 17531: file:4bcd9ce9. */ > -+ warn (_("Debug info is corrupted, abbrev size (%lx) is larger than " > -+ "abbrev section size (%lx)\n"), > -+ (unsigned long) (abbrev_base + abbrev_size), > -+ (unsigned long) section->size); > -+ return NULL; > -+ } > -+ if (abbrev_offset >= abbrev_size) > -+ { > -+ warn (_("Debug info is corrupted, abbrev offset (%lx) is larger than " > -+ "abbrev section size (%lx)\n"), > -+ (unsigned long) abbrev_offset, > -+ (unsigned long) abbrev_size); > -+ return NULL; > -+ } > -+ > -+ unsigned char *start = section->start + abbrev_base + abbrev_offset; > -+ unsigned char *end = section->start + abbrev_base + abbrev_size; > -+ abbrev_list *list = NULL; > -+ if (free_list) > -+ list = find_abbrev_list_by_abbrev_offset (abbrev_base, abbrev_offset); > -+ if (list == NULL) > -+ { > -+ list = process_abbrev_set (section, start, end); > -+ if (list) > -+ { > -+ list->abbrev_base = abbrev_base; > -+ list->abbrev_offset = abbrev_offset; > -+ list->next = NULL; > -+ } > -+ if (free_list) > -+ *free_list = list; > -+ } > -+ return list; > -+} > -+ > - static const char * > - get_TAG_name (unsigned long tag) > - { > -@@ -3670,7 +3703,6 @@ process_debug_info (struct dwarf_section > - dwarf_vma cu_offset; > - unsigned int offset_size; > - struct cu_tu_set * this_set; > -- abbrev_list * list; > - unsigned char *end_cu; > - > - hdrptr = start; > -@@ -3726,22 +3758,18 @@ process_debug_info (struct dwarf_section > - abbrev_size = this_set->section_sizes [DW_SECT_ABBREV]; > - } > - > -- list = find_abbrev_list_by_abbrev_offset (abbrev_base, > -- compunit.cu_abbrev_offset); > -- if (list == NULL) > -- { > -- unsigned char * next; > -- > -- list = new_abbrev_list (abbrev_base, > -- compunit.cu_abbrev_offset); > -- next = process_abbrev_set (&debug_displays[abbrev_sec].section, > -- abbrev_base, abbrev_size, > -- compunit.cu_abbrev_offset, list); > -- list->start_of_next_abbrevs = next; > -- } > -- > -+ abbrev_list *list; > -+ abbrev_list *free_list; > -+ list = find_and_process_abbrev_set (&debug_displays[abbrev_sec].section, > -+ abbrev_base, abbrev_size, > -+ compunit.cu_abbrev_offset, > -+ &free_list); > - start = end_cu; > -- record_abbrev_list_for_cu (cu_offset, start - section_begin, list); > -+ if (list != NULL && list->first_abbrev != NULL) > -+ record_abbrev_list_for_cu (cu_offset, start - section_begin, > -+ list, free_list); > -+ else if (free_list != NULL) > -+ free_abbrev_list (free_list); > - } > - > - for (start = section_begin, unit = 0; start < end; unit++) > -@@ -3757,7 +3785,6 @@ process_debug_info (struct dwarf_section > - struct cu_tu_set *this_set; > - dwarf_vma abbrev_base; > - size_t abbrev_size; > -- abbrev_list * list = NULL; > - unsigned char *end_cu; > - > - hdrptr = start; > -@@ -3936,20 +3963,10 @@ process_debug_info (struct dwarf_section > - } > - > - /* Process the abbrevs used by this compilation unit. */ > -- list = find_abbrev_list_by_abbrev_offset (abbrev_base, > -- compunit.cu_abbrev_offset); > -- if (list == NULL) > -- { > -- unsigned char *next; > -- > -- list = new_abbrev_list (abbrev_base, > -- compunit.cu_abbrev_offset); > -- next = process_abbrev_set (&debug_displays[abbrev_sec].section, > -- abbrev_base, abbrev_size, > -- compunit.cu_abbrev_offset, list); > -- list->start_of_next_abbrevs = next; > -- } > -- > -+ abbrev_list *list; > -+ list = find_and_process_abbrev_set (&debug_displays[abbrev_sec].section, > -+ abbrev_base, abbrev_size, > -+ compunit.cu_abbrev_offset, NULL); > - level = 0; > - last_level = level; > - saved_level = -1; > -@@ -4128,6 +4145,8 @@ process_debug_info (struct dwarf_section > - if (entry->children) > - ++level; > - } > -+ if (list != NULL) > -+ free_abbrev_list (list); > - } > - > - /* Set num_debug_info_entries here so that it can be used to check if > -@@ -6353,24 +6372,15 @@ display_debug_abbrev (struct dwarf_secti > - > - do > - { > -- abbrev_list * list; > -- dwarf_vma offset; > -- > -- offset = start - section->start; > -- list = find_abbrev_list_by_abbrev_offset (0, offset); > -+ dwarf_vma offset = start - section->start; > -+ abbrev_list *list = find_and_process_abbrev_set (section, 0, > -+ section->size, offset, > -+ NULL); > - if (list == NULL) > -- { > -- list = new_abbrev_list (0, offset); > -- start = process_abbrev_set (section, 0, section->size, offset, list); > -- list->start_of_next_abbrevs = start; > -- } > -- else > -- start = list->start_of_next_abbrevs; > -- > -- if (list->first_abbrev == NULL) > -- continue; > -+ break; > - > -- printf (_(" Number TAG (0x%lx)\n"), (long) offset); > -+ if (list->first_abbrev) > -+ printf (_(" Number TAG (0x%lx)\n"), (long) offset); > - > - for (entry = list->first_abbrev; entry; entry = entry->next) > - { > -@@ -6391,6 +6401,8 @@ display_debug_abbrev (struct dwarf_secti > - putchar ('\n'); > - } > - } > -+ start = list->start_of_next_abbrevs; > -+ free_abbrev_list (list); > - } > - while (start); > - > diff --git a/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-2.patch b/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-2.patch > deleted file mode 100644 > index e30b4d86e1..0000000000 > --- a/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-2.patch > +++ /dev/null > @@ -1,536 +0,0 @@ > -From 175b91507b83ad42607d2f6dadaf55b7b511bdbe Mon Sep 17 00:00:00 2001 > -From: Alan Modra > -Date: Wed, 20 Jul 2022 18:28:50 +0930 > -Subject: [PATCH] miscellaneous dwarf.c tidies > - > - * dwarf.c: Leading and trailing whitespace fixes. > - (free_abbrev_list): New function. > - (free_all_abbrevs): Use the above. Free cu_abbrev_map here too. > - (process_abbrev_set): Print actual section name on error. > - (get_type_abbrev_from_form): Add overflow check. > - (free_debug_memory): Don't free cu_abbrev_map here.. > - (process_debug_info): ..or here. Warn on another case of not > - finding a neeeded abbrev. > - > -Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=175b91507b83ad42607d2f6dadaf55b7b511bdbe] > - > -Signed-off-by: Pgowda > ---- > - binutils/dwarf.c | 216 +++++++++++++++++++++++------------------------ > - 1 file changed, 106 insertions(+), 110 deletions(-) > - > -diff --git a/binutils/dwarf.c b/binutils/dwarf.c > -index 2b1eec49422..267ed3bb382 100644 > ---- a/binutils/dwarf.c > -+++ b/binutils/dwarf.c > -@@ -806,7 +806,7 @@ fetch_indexed_value (dwarf_vma idx, > - pointer_size = 4; > - bias = 12; > - } > -- > -+ > - dwarf_vma offset = idx * pointer_size; > - > - /* Offsets are biased by the size of the section header > -@@ -908,38 +908,41 @@ record_abbrev_list_for_cu (dwarf_vma sta > - next_free_abbrev_map_entry ++; > - } > - > --static void > --free_all_abbrevs (void) > -+static abbrev_list * > -+free_abbrev_list (abbrev_list *list) > - { > -- abbrev_list * list; > -+ abbrev_entry *abbrv = list->first_abbrev; > - > -- for (list = abbrev_lists; list != NULL;) > -+ while (abbrv) > - { > -- abbrev_list * next = list->next; > -- abbrev_entry * abbrv; > -+ abbrev_attr *attr = abbrv->first_attr; > - > -- for (abbrv = list->first_abbrev; abbrv != NULL;) > -+ while (attr) > - { > -- abbrev_entry * next_abbrev = abbrv->next; > -- abbrev_attr * attr; > -- > -- for (attr = abbrv->first_attr; attr;) > -- { > -- abbrev_attr *next_attr = attr->next; > -- > -- free (attr); > -- attr = next_attr; > -- } > -- > -- free (abbrv); > -- abbrv = next_abbrev; > -+ abbrev_attr *next_attr = attr->next; > -+ free (attr); > -+ attr = next_attr; > - } > - > -- free (list); > -- list = next; > -+ abbrev_entry *next_abbrev = abbrv->next; > -+ free (abbrv); > -+ abbrv = next_abbrev; > - } > - > -- abbrev_lists = NULL; > -+ abbrev_list *next = list->next; > -+ free (list); > -+ return next; > -+} > -+ > -+static void > -+free_all_abbrevs (void) > -+{ > -+ while (abbrev_lists) > -+ abbrev_lists = free_abbrev_list (abbrev_lists); > -+ > -+ free (cu_abbrev_map); > -+ cu_abbrev_map = NULL; > -+ next_free_abbrev_map_entry = 0; > - } > - > - static abbrev_list * > -@@ -971,7 +974,7 @@ find_abbrev_map_by_offset (dwarf_vma off > - && cu_abbrev_map[i].end > offset) > - return cu_abbrev_map + i; > - > -- return NULL; > -+ return NULL; > - } > - > - static void > -@@ -1094,7 +1097,7 @@ process_abbrev_set (struct dwarf_section > - } > - > - /* Report the missing single zero which ends the section. */ > -- error (_(".debug_abbrev section not zero terminated\n")); > -+ error (_("%s section not zero terminated\n"), section->name); > - > - free (list); > - return NULL; > -@@ -1875,7 +1878,7 @@ fetch_alt_indirect_string (dwarf_vma off > - dwarf_vmatoa ("x", offset)); > - return _(""); > - } > -- > -+ > - static const char * > - get_AT_name (unsigned long attribute) > - { > -@@ -2157,7 +2160,8 @@ get_type_abbrev_from_form (unsigned long > - case DW_FORM_ref4: > - case DW_FORM_ref8: > - case DW_FORM_ref_udata: > -- if (uvalue + cu_offset > (size_t) (cu_end - section->start)) > -+ if (uvalue + cu_offset < uvalue > -+ || uvalue + cu_offset > (size_t) (cu_end - section->start)) > - { > - warn (_("Unable to resolve ref form: uvalue %lx + cu_offset %lx > CU size %lx\n"), > - uvalue, (long) cu_offset, (long) (cu_end - section->start)); > -@@ -2194,7 +2198,7 @@ get_type_abbrev_from_form (unsigned long > - else > - *map_return = NULL; > - } > -- > -+ > - READ_ULEB (abbrev_number, data, section->start + section->size); > - > - for (entry = map->list->first_abbrev; entry != NULL; entry = entry->next) > -@@ -2783,10 +2787,10 @@ read_and_display_attr_value (unsigned lo > - if (form == DW_FORM_loclistx) > - { > - if (dwo) > -- { > -- index = fetch_indexed_value (uvalue, loclists_dwo, 0); > -- index += (offset_size == 8) ? 20 : 12; > -- } > -+ { > -+ index = fetch_indexed_value (uvalue, loclists_dwo, 0); > -+ index += (offset_size == 8) ? 20 : 12; > -+ } > - else if (debug_info_p == NULL) > - { > - index = fetch_indexed_value (uvalue, loclists, 0); > -@@ -2804,21 +2808,21 @@ read_and_display_attr_value (unsigned lo > - else if (form == DW_FORM_rnglistx) > - { > - if (dwo) > -- { > -- index = fetch_indexed_value (uvalue, rnglists_dwo, 0); > -- index += (offset_size == 8) ? 20 : 12; > -- } > -+ { > -+ index = fetch_indexed_value (uvalue, rnglists_dwo, 0); > -+ index += (offset_size == 8) ? 20 : 12; > -+ } > - else > -- { > -- if (debug_info_p == NULL) > -- base = 0; > -- else > -- base = debug_info_p->rnglists_base; > -- /* We do not have a cached value this time, so we perform the > -- computation manually. */ > -- index = fetch_indexed_value (uvalue, rnglists, base); > -- index += base; > -- } > -+ { > -+ if (debug_info_p == NULL) > -+ base = 0; > -+ else > -+ base = debug_info_p->rnglists_base; > -+ /* We do not have a cached value this time, so we perform the > -+ computation manually. */ > -+ index = fetch_indexed_value (uvalue, rnglists, base); > -+ index += base; > -+ } > - } > - else > - { > -@@ -2844,7 +2848,7 @@ read_and_display_attr_value (unsigned lo > - if (!do_loc) > - printf ("%c<0x%s>", delimiter, dwarf_vmatoa ("x", uvalue + cu_offset)); > - break; > -- > -+ > - default: > - warn (_("Unrecognized form: 0x%lx\n"), form); > - /* What to do? Consume a byte maybe? */ > -@@ -2869,9 +2873,9 @@ read_and_display_attr_value (unsigned lo > - case DW_AT_rnglists_base: > - if (debug_info_p->rnglists_base) > - warn (_("CU @ 0x%s has multiple rnglists_base values (0x%s and 0x%s)"), > -- dwarf_vmatoa ("x", debug_info_p->cu_offset), > -- dwarf_vmatoa ("x", debug_info_p->rnglists_base), > -- dwarf_vmatoa ("x", uvalue)); > -+ dwarf_vmatoa ("x", debug_info_p->cu_offset), > -+ dwarf_vmatoa ("x", debug_info_p->rnglists_base), > -+ dwarf_vmatoa ("x", uvalue)); > - debug_info_p->rnglists_base = uvalue; > - break; > - case DW_AT_str_offsets_base: > -@@ -3021,7 +3025,7 @@ read_and_display_attr_value (unsigned lo > - case DW_FORM_strx3: > - case DW_FORM_strx4: > - add_dwo_name (fetch_indexed_string (uvalue, this_set, offset_size, false, > -- debug_info_p->str_offsets_base), > -+ debug_info_p->str_offsets_base), > - cu_offset); > - break; > - case DW_FORM_string: > -@@ -3055,7 +3059,7 @@ read_and_display_attr_value (unsigned lo > - case DW_FORM_strx3: > - case DW_FORM_strx4: > - add_dwo_dir (fetch_indexed_string (uvalue, this_set, offset_size, false, > -- debug_info_p->str_offsets_base), > -+ debug_info_p->str_offsets_base), > - cu_offset); > - break; > - case DW_FORM_string: > -@@ -3686,11 +3690,8 @@ process_debug_info (struct dwarf_section > - introduce (section, false); > - > - free_all_abbrevs (); > -- free (cu_abbrev_map); > -- cu_abbrev_map = NULL; > -- next_free_abbrev_map_entry = 0; > - > -- /* In order to be able to resolve DW_FORM_ref_attr forms we need > -+ /* In order to be able to resolve DW_FORM_ref_addr forms we need > - to load *all* of the abbrevs for all CUs in this .debug_info > - section. This does effectively mean that we (partially) read > - every CU header twice. */ > -@@ -4045,12 +4046,11 @@ process_debug_info (struct dwarf_section > - > - /* Scan through the abbreviation list until we reach the > - correct entry. */ > -- if (list == NULL) > -- continue; > -- > -- for (entry = list->first_abbrev; entry != NULL; entry = entry->next) > -- if (entry->number == abbrev_number) > -- break; > -+ entry = NULL; > -+ if (list != NULL) > -+ for (entry = list->first_abbrev; entry != NULL; entry = entry->next) > -+ if (entry->number == abbrev_number) > -+ break; > - > - if (entry == NULL) > - { > -@@ -4074,7 +4074,7 @@ process_debug_info (struct dwarf_section > - break; > - case DW_TAG_compile_unit: > - case DW_TAG_skeleton_unit: > -- need_base_address = 1; > -+ need_base_address = 1; > - need_dwo_info = do_loc; > - break; > - case DW_TAG_entry_point: > -@@ -4459,7 +4459,7 @@ display_debug_sup (struct dwarf_section > - > - SAFE_BYTE_GET_AND_INC (is_supplementary, start, 1, end); > - if (is_supplementary != 0 && is_supplementary != 1) > -- warn (_("corrupt .debug_sup section: is_supplementary not 0 or 1\n")); > -+ warn (_("corrupt .debug_sup section: is_supplementary not 0 or 1\n")); > - > - sup_filename = start; > - if (is_supplementary && sup_filename[0] != 0) > -@@ -5638,7 +5638,7 @@ display_debug_lines_decoded (struct dwar > - printf ("%s %11d %#18" DWARF_VMA_FMT "x", > - newFileName, state_machine_regs.line, > - state_machine_regs.address); > -- } > -+ } > - else > - { > - if (xop == -DW_LNE_end_sequence) > -@@ -6092,7 +6092,7 @@ display_debug_macro (struct dwarf_sectio > - load_debug_section_with_follow (str, file); > - load_debug_section_with_follow (line, file); > - load_debug_section_with_follow (str_index, file); > -- > -+ > - introduce (section, false); > - > - while (curr < end) > -@@ -6537,7 +6537,7 @@ display_loc_list (struct dwarf_section * > - > - /* Check base address specifiers. */ > - if (is_max_address (begin, pointer_size) > -- && !is_max_address (end, pointer_size)) > -+ && !is_max_address (end, pointer_size)) > - { > - base_address = end; > - print_dwarf_vma (begin, pointer_size); > -@@ -6715,7 +6715,7 @@ display_loclists_list (struct dwarf_sect > - case DW_LLE_default_location: > - begin = end = 0; > - break; > -- > -+ > - case DW_LLE_offset_pair: > - READ_ULEB (begin, start, section_end); > - begin += base_address; > -@@ -7011,7 +7011,7 @@ display_offset_entry_loclists (struct dw > - unsigned char * start = section->start; > - unsigned char * const end = start + section->size; > - > -- introduce (section, false); > -+ introduce (section, false); > - > - do > - { > -@@ -7060,14 +7060,14 @@ display_offset_entry_loclists (struct dw > - section->name, segment_selector_size); > - return 0; > - } > -- > -+ > - if (offset_entry_count == 0) > - { > - warn (_("The %s section contains a table without offset\n"), > - section->name); > - return 0; > - } > -- > -+ > - printf (_("\n Offset Entries starting at 0x%lx:\n"), > - (long)(start - section->start)); > - > -@@ -8229,7 +8229,7 @@ display_debug_rnglists (struct dwarf_sec > - start = display_debug_rnglists_list > - (start, end, address_size, offset, 0, offset_size); > - if (start >= end) > -- break; > -+ break; > - } > - > - start = end; > -@@ -8347,12 +8347,12 @@ display_debug_ranges (struct dwarf_secti > - next = section_begin + offset + debug_info_p->rnglists_base; > - > - /* If multiple DWARF entities reference the same range then we will > -- have multiple entries in the `range_entries' list for the same > -- offset. Thanks to the sort above these will all be consecutive in > -- the `range_entries' list, so we can easily ignore duplicates > -- here. */ > -+ have multiple entries in the `range_entries' list for the same > -+ offset. Thanks to the sort above these will all be consecutive in > -+ the `range_entries' list, so we can easily ignore duplicates > -+ here. */ > - if (i > 0 && last_offset == offset) > -- continue; > -+ continue; > - last_offset = offset; > - > - if (dwarf_check != 0 && i > 0) > -@@ -10286,7 +10286,7 @@ display_debug_names (struct dwarf_sectio > - printf (_("Out of %lu items there are %zu bucket clashes" > - " (longest of %zu entries).\n"), > - (unsigned long) name_count, hash_clash_count, longest_clash); > -- > -+ > - if (name_count != buckets_filled + hash_clash_count) > - warn (_("The name_count (%lu) is not the same as the used bucket_count (%lu) + the hash clash count (%lu)"), > - (unsigned long) name_count, > -@@ -10390,7 +10390,7 @@ display_debug_names (struct dwarf_sectio > - break; > - if (tagno >= 0) > - printf ("%s<%lu>", > -- (tagno == 0 && second_abbrev_tag == 0 ? " " : "\n\t"), > -+ (tagno == 0 && second_abbrev_tag == 0 ? " " : "\n\t"), > - (unsigned long) abbrev_tag); > - > - for (entry = abbrev_lookup; > -@@ -10919,7 +10919,7 @@ process_cu_tu_index (struct dwarf_sectio > - Check for integer overflow (can occur when size_t is 32-bit) > - with overlarge ncols or nused values. */ > - if (nused == -1u > -- || _mul_overflow ((size_t) ncols, 4, &temp) > -+ || _mul_overflow ((size_t) ncols, 4, &temp) > - || _mul_overflow ((size_t) nused + 1, temp, &total) > - || total > (size_t) (limit - ppool)) > - { > -@@ -10927,7 +10927,7 @@ process_cu_tu_index (struct dwarf_sectio > - section->name); > - return 0; > - } > -- > -+ > - if (do_display) > - { > - printf (_(" Offset table\n")); > -@@ -11431,8 +11431,8 @@ add_separate_debug_file (const char * fi > - > - static bool > - debuginfod_fetch_separate_debug_info (struct dwarf_section * section, > -- char ** filename, > -- void * file) > -+ char ** filename, > -+ void * file) > - { > - size_t build_id_len; > - unsigned char * build_id; > -@@ -11450,14 +11450,14 @@ debuginfod_fetch_separate_debug_info (st > - > - filelen = strnlen ((const char *)section->start, section->size); > - if (filelen == section->size) > -- /* Corrupt debugaltlink. */ > -- return false; > -+ /* Corrupt debugaltlink. */ > -+ return false; > - > - build_id = section->start + filelen + 1; > - build_id_len = section->size - (filelen + 1); > - > - if (build_id_len == 0) > -- return false; > -+ return false; > - } > - else > - return false; > -@@ -11469,25 +11469,25 @@ debuginfod_fetch_separate_debug_info (st > - > - client = debuginfod_begin (); > - if (client == NULL) > -- return false; > -+ return false; > - > - /* Query debuginfod servers for the target file. If found its path > -- will be stored in filename. */ > -+ will be stored in filename. */ > - fd = debuginfod_find_debuginfo (client, build_id, build_id_len, filename); > - debuginfod_end (client); > - > - /* Only free build_id if we allocated space for a hex string > -- in get_build_id (). */ > -+ in get_build_id (). */ > - if (build_id_len == 0) > -- free (build_id); > -+ free (build_id); > - > - if (fd >= 0) > -- { > -- /* File successfully retrieved. Close fd since we want to > -- use open_debug_file () on filename instead. */ > -- close (fd); > -- return true; > -- } > -+ { > -+ /* File successfully retrieved. Close fd since we want to > -+ use open_debug_file () on filename instead. */ > -+ close (fd); > -+ return true; > -+ } > - } > - > - return false; > -@@ -11500,7 +11500,7 @@ load_separate_debug_info (const char * > - parse_func_type parse_func, > - check_func_type check_func, > - void * func_data, > -- void * file ATTRIBUTE_UNUSED) > -+ void * file ATTRIBUTE_UNUSED) > - { > - const char * separate_filename; > - char * debug_filename; > -@@ -11616,11 +11616,11 @@ load_separate_debug_info (const char * > - & tmp_filename, > - file)) > - { > -- /* File successfully downloaded from server, replace > -- debug_filename with the file's path. */ > -- free (debug_filename); > -- debug_filename = tmp_filename; > -- goto found; > -+ /* File successfully downloaded from server, replace > -+ debug_filename with the file's path. */ > -+ free (debug_filename); > -+ debug_filename = tmp_filename; > -+ goto found; > - } > - } > - #endif > -@@ -11787,12 +11787,12 @@ load_build_id_debug_file (const char * m > - /* In theory we should extract the contents of the section into > - a note structure and then check the fields. For now though > - just use hard coded offsets instead: > -- > -+ > - Field Bytes Contents > - NSize 0...3 4 > - DSize 4...7 8+ > - Type 8..11 3 (NT_GNU_BUILD_ID) > -- Name 12.15 GNU\0 > -+ Name 12.15 GNU\0 > - Data 16.... */ > - > - /* FIXME: Check the name size, name and type fields. */ > -@@ -11804,7 +11804,7 @@ load_build_id_debug_file (const char * m > - warn (_(".note.gnu.build-id data size is too small\n")); > - return; > - } > -- > -+ > - if (build_id_size > (section->size - 16)) > - { > - warn (_(".note.gnu.build-id data size is too bug\n")); > -@@ -12100,10 +12100,6 @@ free_debug_memory (void) > - > - free_all_abbrevs (); > - > -- free (cu_abbrev_map); > -- cu_abbrev_map = NULL; > -- next_free_abbrev_map_entry = 0; > -- > - free (shndx_pool); > - shndx_pool = NULL; > - shndx_pool_size = 0; > diff --git a/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-3.patch b/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-3.patch > deleted file mode 100644 > index 04d06ed6b6..0000000000 > --- a/meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-3.patch > +++ /dev/null > @@ -1,95 +0,0 @@ > -From 695c6dfe7e85006b98c8b746f3fd5f913c94ebff Mon Sep 17 00:00:00 2001 > -From: Alan Modra > -Date: Thu, 21 Jul 2022 09:56:15 +0930 > -Subject: [PATCH] PR29370, infinite loop in display_debug_abbrev > - > -The PR29370 testcase is a fuzzed object file with multiple > -.trace_abbrev sections. Multiple .trace_abbrev or .debug_abbrev > -sections are not a violation of the DWARF standard. The DWARF5 > -standard even gives an example of multiple .debug_abbrev sections > -contained in groups. Caching and lookup of processed abbrevs thus > -needs to be done by section and offset rather than base and offset. > -(Why base anyway?) Or, since section contents are kept, by a pointer > -into the contents. > - > - PR 29370 > - * dwarf.c (struct abbrev_list): Replace abbrev_base and > - abbrev_offset with raw field. > - (find_abbrev_list_by_abbrev_offset): Delete. > - (find_abbrev_list_by_raw_abbrev): New function. > - (process_abbrev_set): Set list->raw and list->next. > - (find_and_process_abbrev_set): Replace abbrev list lookup with > - new function. Don't set list abbrev_base, abbrev_offset or next. > - > -Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=695c6dfe7e85006b98c8b746f3fd5f913c94ebff] > - > -Signed-off-by: Pgowda > ---- > - binutils/dwarf.c | 19 ++++++------------- > - 1 file changed, 6 insertions(+), 13 deletions(-) > - > -diff --git a/binutils/dwarf.c b/binutils/dwarf.c > -index 2fc352f74c5..99fb3566994 100644 > ---- a/binutils/dwarf.c > -+++ b/binutils/dwarf.c > -@@ -856,8 +856,7 @@ typedef struct abbrev_list > - { > - abbrev_entry * first_abbrev; > - abbrev_entry * last_abbrev; > -- dwarf_vma abbrev_base; > -- dwarf_vma abbrev_offset; > -+ unsigned char * raw; > - struct abbrev_list * next; > - unsigned char * start_of_next_abbrevs; > - } > -@@ -946,14 +945,12 @@ free_all_abbrevs (void) > - } > - > - static abbrev_list * > --find_abbrev_list_by_abbrev_offset (dwarf_vma abbrev_base, > -- dwarf_vma abbrev_offset) > -+find_abbrev_list_by_raw_abbrev (unsigned char *raw) > - { > - abbrev_list * list; > - > - for (list = abbrev_lists; list != NULL; list = list->next) > -- if (list->abbrev_base == abbrev_base > -- && list->abbrev_offset == abbrev_offset) > -+ if (list->raw == raw) > - return list; > - > - return NULL; > -@@ -1040,6 +1037,7 @@ process_abbrev_set (struct dwarf_section > - abbrev_list *list = xmalloc (sizeof (*list)); > - list->first_abbrev = NULL; > - list->last_abbrev = NULL; > -+ list->raw = start; > - > - while (start < end) > - { > -@@ -1055,6 +1053,7 @@ process_abbrev_set (struct dwarf_section > - the caller. */ > - if (start == end || entry == 0) > - { > -+ list->next = NULL; > - list->start_of_next_abbrevs = start != end ? start : NULL; > - return list; > - } > -@@ -1144,16 +1143,10 @@ find_and_process_abbrev_set (struct dwar > - unsigned char *end = section->start + abbrev_base + abbrev_size; > - abbrev_list *list = NULL; > - if (free_list) > -- list = find_abbrev_list_by_abbrev_offset (abbrev_base, abbrev_offset); > -+ list = find_abbrev_list_by_raw_abbrev (start); > - if (list == NULL) > - { > - list = process_abbrev_set (section, start, end); > -- if (list) > -- { > -- list->abbrev_base = abbrev_base; > -- list->abbrev_offset = abbrev_offset; > -- list->next = NULL; > -- } > - if (free_list) > - *free_list = list; > - } > diff --git a/meta/recipes-devtools/binutils/binutils/0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch b/meta/recipes-devtools/binutils/binutils/0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch > new file mode 100644 > index 0000000000..04c1310cbe > --- /dev/null > +++ b/meta/recipes-devtools/binutils/binutils/0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch > @@ -0,0 +1,56 @@ > +From 518c167116ab7aa6bb84a97200aeda2c4289e064 Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= > +Date: Tue, 3 Jan 2023 14:24:43 +0100 > +Subject: [PATCH] configure: remove dependencies on gmp and mpfr when gdb is > + disabled > + > +Since 991180627851801f1999d1ebbc0e569a17e47c74, the configure checks > +about GMP and MPFR for gdb builds have been moved to the toplevel > +configure. > +However, it doesn't take into account the --disable-gdb option. Meaning > +that a build without gdb will require these libraries even if not > +needed. > + > +ChangeLog: > + > + * configure.ac: Skip GMP and MPFR when --disable-gdb is > + provided. > + * configure: Regenerate. > + > +Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=5fb0e308577143ceb313fde5538dc9ecb038f29f] > +Signed-off-by: Khem Raj > +--- > + configure | 4 +++- > + configure.ac | 4 +++- > + 2 files changed, 6 insertions(+), 2 deletions(-) > + > +diff --git a/configure b/configure > +index bdc3583215f..b63b5cd3de0 100755 > +--- a/configure > ++++ b/configure > +@@ -8032,7 +8032,9 @@ if test -d ${srcdir}/gcc ; then > + require_mpc=yes > + fi > + if test -d ${srcdir}/gdb ; then > +- require_gmp=yes > ++ if test "x$enable_gdb" != xno; then > ++ require_gmp=yes > ++ fi > + fi > + > + gmplibs="-lmpfr -lgmp" > +diff --git a/configure.ac b/configure.ac > +index 1c00b9aec42..2df870b86af 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -1585,7 +1585,9 @@ if test -d ${srcdir}/gcc ; then > + require_mpc=yes > + fi > + if test -d ${srcdir}/gdb ; then > +- require_gmp=yes > ++ if test "x$enable_gdb" != xno; then > ++ require_gmp=yes > ++ fi > + fi > + > + gmplibs="-lmpfr -lgmp" > diff --git a/meta/recipes-devtools/binutils/binutils/0015-CVE-2022-4285.patch b/meta/recipes-devtools/binutils/binutils/0015-CVE-2022-4285.patch > deleted file mode 100644 > index 46ec0b15a3..0000000000 > --- a/meta/recipes-devtools/binutils/binutils/0015-CVE-2022-4285.patch > +++ /dev/null > @@ -1,37 +0,0 @@ > -From 5c831a3c7f3ca98d6aba1200353311e1a1f84c70 Mon Sep 17 00:00:00 2001 > -From: Nick Clifton > -Date: Wed, 19 Oct 2022 15:09:12 +0100 > -Subject: [PATCH] Fix an illegal memory access when parsing an ELF file > - containing corrupt symbol version information. > - > - PR 29699 > - * elf.c (_bfd_elf_slurp_version_tables): Fail if the sh_info field > - of the section header is zero. > - > -Upstream-Status: Backport > -[https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5c831a3c7f3ca98d6aba1200353311e1a1f84c70] > - > -Signed-off-by: Pgowda > ---- > - bfd/ChangeLog | 6 ++++++ > - bfd/elf.c | 4 +++- > - 2 files changed, 9 insertions(+), 1 deletion(-) > - > -diff --git a/bfd/elf.c b/bfd/elf.c > -index fe00e0f9189..7cd7febcf95 100644 > ---- a/bfd/elf.c > -+++ b/bfd/elf.c > -@@ -8918,7 +8918,9 @@ _bfd_elf_slurp_version_tables (bfd *abfd, bool default_imported_symver) > - bfd_set_error (bfd_error_file_too_big); > - goto error_return_verref; > - } > -- elf_tdata (abfd)->verref = (Elf_Internal_Verneed *) bfd_alloc (abfd, amt); > -+ if (amt == 0) > -+ goto error_return_verref; > -+ elf_tdata (abfd)->verref = (Elf_Internal_Verneed *) bfd_zalloc (abfd, amt); > - if (elf_tdata (abfd)->verref == NULL) > - goto error_return_verref; > - > --- > -2.31.1 > - > diff --git a/meta/recipes-devtools/binutils/binutils/0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch b/meta/recipes-devtools/binutils/binutils/0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch > new file mode 100644 > index 0000000000..f57f65ce72 > --- /dev/null > +++ b/meta/recipes-devtools/binutils/binutils/0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch > @@ -0,0 +1,32 @@ > +From 9599d7d48913fca4c2bf0d0012f9655353ca6f6c Mon Sep 17 00:00:00 2001 > +From: Khem Raj > +Date: Wed, 18 Jan 2023 19:35:07 -0800 > +Subject: [PATCH] Remove duplicate pe-dll.o entry deom targ_extra_ofiles > + > +Commit c60b3806799abf1d7f6cf5108a1b0e733a950b13 added support for > +aarch64-pe which introduced wrapper over pep-dll.c for x86_64 as well as > +aarch64, on x86_64 it was added but the old object pe-dll.o needs to be > +removed too, otherwise build fails with duplicate symbols from pe-dll.o > +and pep-dll-x86_64.o > + > +Upstream-Status: Submitted [https://sourceware.org/pipermail/binutils/2023-January/125739.html] > +Signed-off-by: Khem Raj > +Cc: Jedidiah Thompson > +Cc: Zac Walker > +--- > + ld/configure.tgt | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/ld/configure.tgt b/ld/configure.tgt > +index de04a44b812..f80c84ab13c 100644 > +--- a/ld/configure.tgt > ++++ b/ld/configure.tgt > +@@ -1056,7 +1056,7 @@ x86_64-*-cygwin) targ_emul=i386pep ; > + ;; > + x86_64-*-mingw*) targ_emul=i386pep ; > + targ_extra_emuls=i386pe > +- targ_extra_ofiles="deffilep.o pdb.o pep-dll.o pe-dll.o" > ++ targ_extra_ofiles="deffilep.o pdb.o pe-dll.o" > + ;; > + x86_64-*-gnu*) targ_emul=elf_x86_64 > + targ_extra_emuls="elf32_x86_64 elf_iamcu elf_i386" > diff --git a/meta/recipes-devtools/binutils/binutils_2.39.bb b/meta/recipes-devtools/binutils/binutils_2.40.bb > similarity index 100% > rename from meta/recipes-devtools/binutils/binutils_2.39.bb > rename to meta/recipes-devtools/binutils/binutils_2.40.bb > -- > 2.39.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#176174): https://lists.openembedded.org/g/openembedded-core/message/176174 > Mute This Topic: https://lists.openembedded.org/mt/96390083/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com