From 296a1bbd496710ee9bcdbcc1ff22bfe9f3da42d0 Mon Sep 17 00:00:00 2001
From: Damian Alvarez <swmanage@juwels02.ib.juwels.fzj.de>
Date: Thu, 16 Jul 2020 13:24:42 +0200
Subject: [PATCH] First 2020 packages, from scratch up to GCC+ParaStationMPI
---
Custom_EasyBlocks/generic/systembundle.py | 57 +
Custom_EasyBlocks/mpich.py | 172 +
Custom_EasyBlocks/nvidia_driver.py | 122 +
Custom_EasyBlocks/psmpi.py | 284 +
Golden_Repo/README.md | 25 +
Golden_Repo/a/Autoconf/Autoconf-2.69.eb | 35 +
Golden_Repo/a/Automake/Automake-1.16.2.eb | 38 +
Golden_Repo/a/Autotools/Autotools-20200321.eb | 21 +
.../b/Bison/Bison-3.6.4-GCCcore-9.3.0.eb | 30 +
Golden_Repo/b/Bison/Bison-3.6.4.eb | 25 +
Golden_Repo/b/binutils/binutils-2.32.eb | 32 +
.../b/binutils/binutils-2.34-GCCcore-9.3.0.eb | 42 +
Golden_Repo/b/binutils/binutils-2.34.eb | 37 +
Golden_Repo/c/CUDA/CUDA-11.0.207.eb | 39 +
.../f/flex/flex-2.6.4-GCCcore-9.3.0.eb | 24 +
Golden_Repo/f/flex/flex-2.6.4.eb | 26 +
Golden_Repo/g/GCC/GCC-9.3.0.eb | 31 +
Golden_Repo/g/GCCcore/GCCcore-10.1.0.eb | 79 +
Golden_Repo/g/GCCcore/GCCcore-9.3.0.eb | 58 +
.../g/GCCcore/gcc_9.3.0_remove_sm_30.patch | 51 +
Golden_Repo/g/gettext/gettext-0.20.2.eb | 35 +
Golden_Repo/l/libtool/libtool-2.4.6.eb | 26 +
.../l/libxml2/libxml2-2.9.10-GCCcore-9.3.0.eb | 30 +
Golden_Repo/m/M4/M4-1.4.18-GCCcore-9.3.0.eb | 29 +
Golden_Repo/m/M4/M4-1.4.18.eb | 27 +
Golden_Repo/n/ncurses/ncurses-6.2.eb | 46 +
Golden_Repo/n/numactl/numactl-2.0.13.eb | 36 +
.../n/nvidia-driver/nvidia-driver-default.eb | 32 +
.../n/nvptx-tools/nvptx-tools-20180301.eb | 30 +
.../nvptx-tools-20180301_sm_30_to_sm_35.patch | 12 +
Golden_Repo/p/pkg-config/pkg-config-0.29.2.eb | 32 +
Golden_Repo/p/popt/popt-1.16.eb | 22 +
Golden_Repo/p/pscom/pscom-5.4-default.eb | 47 +
.../psmpi-settings-5.4-default.eb | 18 +
.../p/psmpi/psmpi-5.4.6-1-GCC-9.3.0.eb | 50 +
Golden_Repo/p/psmpi/psmpi-5.4.6-1_ime.patch | 47206 ++++++++++++++++
Golden_Repo/p/psmpi/psmpi_shebang.patch | 36 +
Golden_Repo/u/UCX/UCX-1.8.1.eb | 70 +
Golden_Repo/x/XZ/XZ-5.2.5-GCCcore-9.3.0.eb | 35 +
.../z/zlib/zlib-1.2.11-GCCcore-9.3.0.eb | 28 +
Golden_Repo/z/zlib/zlib-1.2.11.eb | 28 +
README.md | 2 +-
42 files changed, 49104 insertions(+), 1 deletion(-)
create mode 100644 Custom_EasyBlocks/generic/systembundle.py
create mode 100644 Custom_EasyBlocks/mpich.py
create mode 100644 Custom_EasyBlocks/nvidia_driver.py
create mode 100644 Custom_EasyBlocks/psmpi.py
create mode 100644 Golden_Repo/README.md
create mode 100644 Golden_Repo/a/Autoconf/Autoconf-2.69.eb
create mode 100644 Golden_Repo/a/Automake/Automake-1.16.2.eb
create mode 100644 Golden_Repo/a/Autotools/Autotools-20200321.eb
create mode 100644 Golden_Repo/b/Bison/Bison-3.6.4-GCCcore-9.3.0.eb
create mode 100644 Golden_Repo/b/Bison/Bison-3.6.4.eb
create mode 100644 Golden_Repo/b/binutils/binutils-2.32.eb
create mode 100644 Golden_Repo/b/binutils/binutils-2.34-GCCcore-9.3.0.eb
create mode 100644 Golden_Repo/b/binutils/binutils-2.34.eb
create mode 100644 Golden_Repo/c/CUDA/CUDA-11.0.207.eb
create mode 100644 Golden_Repo/f/flex/flex-2.6.4-GCCcore-9.3.0.eb
create mode 100644 Golden_Repo/f/flex/flex-2.6.4.eb
create mode 100644 Golden_Repo/g/GCC/GCC-9.3.0.eb
create mode 100644 Golden_Repo/g/GCCcore/GCCcore-10.1.0.eb
create mode 100644 Golden_Repo/g/GCCcore/GCCcore-9.3.0.eb
create mode 100644 Golden_Repo/g/GCCcore/gcc_9.3.0_remove_sm_30.patch
create mode 100644 Golden_Repo/g/gettext/gettext-0.20.2.eb
create mode 100644 Golden_Repo/l/libtool/libtool-2.4.6.eb
create mode 100644 Golden_Repo/l/libxml2/libxml2-2.9.10-GCCcore-9.3.0.eb
create mode 100644 Golden_Repo/m/M4/M4-1.4.18-GCCcore-9.3.0.eb
create mode 100644 Golden_Repo/m/M4/M4-1.4.18.eb
create mode 100644 Golden_Repo/n/ncurses/ncurses-6.2.eb
create mode 100644 Golden_Repo/n/numactl/numactl-2.0.13.eb
create mode 100644 Golden_Repo/n/nvidia-driver/nvidia-driver-default.eb
create mode 100644 Golden_Repo/n/nvptx-tools/nvptx-tools-20180301.eb
create mode 100644 Golden_Repo/n/nvptx-tools/nvptx-tools-20180301_sm_30_to_sm_35.patch
create mode 100644 Golden_Repo/p/pkg-config/pkg-config-0.29.2.eb
create mode 100644 Golden_Repo/p/popt/popt-1.16.eb
create mode 100644 Golden_Repo/p/pscom/pscom-5.4-default.eb
create mode 100644 Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-default.eb
create mode 100644 Golden_Repo/p/psmpi/psmpi-5.4.6-1-GCC-9.3.0.eb
create mode 100644 Golden_Repo/p/psmpi/psmpi-5.4.6-1_ime.patch
create mode 100644 Golden_Repo/p/psmpi/psmpi_shebang.patch
create mode 100644 Golden_Repo/u/UCX/UCX-1.8.1.eb
create mode 100644 Golden_Repo/x/XZ/XZ-5.2.5-GCCcore-9.3.0.eb
create mode 100644 Golden_Repo/z/zlib/zlib-1.2.11-GCCcore-9.3.0.eb
create mode 100644 Golden_Repo/z/zlib/zlib-1.2.11.eb
diff --git a/Custom_EasyBlocks/generic/systembundle.py b/Custom_EasyBlocks/generic/systembundle.py
new file mode 100644
index 000000000..d7e769b15
--- /dev/null
+++ b/Custom_EasyBlocks/generic/systembundle.py
@@ -0,0 +1,57 @@
+##
+# Copyright 2017 Forschungszentrum Juelich GmbH
+#
+# This file is part of EasyBuild,
+# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
+# with support of Ghent University (http://ugent.be/hpc),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
+# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
+# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
+#
+# http://github.com/hpcugent/easybuild
+#
+# EasyBuild is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation v2.
+#
+# EasyBuild is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with EasyBuild. If not, see <http://www.gnu.org/licenses/>.
+##
+"""
+@author: Damian Alvarez (Forschungszentrum Juelich GmbH)
+"""
+
+from easybuild.easyblocks.generic.bundle import Bundle
+
+class SystemBundle(Bundle):
+ """
+ Support for creating a bundle that allows to prepend absolute paths in LD_LIBRARY_PATH
+ """
+
+ def make_module_extra(self):
+ """Prepend variables allowing absolute paths, and proceed as normal"""
+
+ lines = ['']
+ modextrapaths = self.cfg['modextrapaths']
+
+ for (key, value) in self.cfg['modextrapaths'].items():
+ if isinstance(value, basestring):
+ value = [value]
+ elif not isinstance(value, (tuple, list)):
+ raise EasyBuildError("modextrapaths dict value %s (type: %s) is not a list or tuple",
+ value, type(value))
+ lines.append(self.module_generator.prepend_paths(key, value, allow_abs=True))
+
+ self.cfg['modextrapaths'] = {}
+
+ txt = super(SystemBundle, self).make_module_extra()
+ self.cfg['modextrapaths'] = modextrapaths
+
+ txt += ''.join(lines)
+
+ return txt
diff --git a/Custom_EasyBlocks/mpich.py b/Custom_EasyBlocks/mpich.py
new file mode 100644
index 000000000..7e1cae6ae
--- /dev/null
+++ b/Custom_EasyBlocks/mpich.py
@@ -0,0 +1,172 @@
+##
+# Copyright 2009-2019 Ghent University, Forschungszentrum Juelich
+#
+# This file is part of EasyBuild,
+# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
+# with support of Ghent University (http://ugent.be/hpc),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
+# the Hercules foundation (http://www.herculesstichting.be/in_English)
+# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
+#
+# https://github.com/easybuilders/easybuild
+#
+# EasyBuild is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation v2.
+#
+# EasyBuild is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with EasyBuild. If not, see <http://www.gnu.org/licenses/>.
+##
+"""
+EasyBuild support for building and installing the MPICH MPI library and derivatives, implemented as an easyblock
+
+@author: Stijn De Weirdt (Ghent University)
+@author: Dries Verdegem (Ghent University)
+@author: Kenneth Hoste (Ghent University)
+@author: Pieter De Baets (Ghent University)
+@author: Jens Timmerman (Ghent University)
+@author: Damian Alvarez (Forschungszentrum Juelich)
+@author: Xavier Besseron (University of Luxembourg)
+"""
+import os
+from distutils.version import LooseVersion
+
+import easybuild.tools.environment as env
+from easybuild.easyblocks.generic.configuremake import ConfigureMake
+from easybuild.framework.easyconfig import CUSTOM
+from easybuild.tools.build_log import EasyBuildError
+from easybuild.tools.systemtools import get_shared_lib_ext
+
+
+class EB_MPICH(ConfigureMake):
+ """
+ Support for building the MPICH MPI library and derivatives.
+ - basically redefinition of environment variables
+ """
+
+ @staticmethod
+ def extra_options(extra_vars=None):
+ """Define custom easyconfig parameters specific to MPICH."""
+ extra_vars = ConfigureMake.extra_options(extra_vars)
+ extra_vars.update({
+ 'debug': [False, "Enable debug build (which is slower)", CUSTOM],
+ })
+ return extra_vars
+
+ # MPICH configure script complains when F90 or F90FLAGS are set,
+ # they should be replaced with FC/FCFLAGS instead.
+ # Additionally, there are a set of variables (FCFLAGS among them) that should not be set at configure time,
+ # or they will leak in the mpix wrappers.
+ # Specific variables to be included in the wrapper exists, but they changed between MPICH 3.1.4 and MPICH 3.2
+ # and in a typical scenario we probably don't want them.
+ def correct_mpich_build_env(self):
+ """
+ Method to correctly set the environment for MPICH and derivatives
+ """
+ env_vars = ['CFLAGS', 'CPPFLAGS', 'CXXFLAGS', 'FCFLAGS', 'FFLAGS', 'LDFLAGS', 'LIBS']
+ vars_to_unset = ['F90', 'F90FLAGS']
+ for envvar in env_vars:
+ envvar_val = os.getenv(envvar)
+ if envvar_val:
+ new_envvar = 'MPICHLIB_%s' % envvar
+ new_envvar_val = os.getenv(new_envvar)
+ vars_to_unset.append(envvar)
+ if envvar_val == new_envvar_val:
+ self.log.debug("$%s == $%s, just defined $%s as empty", envvar, new_envvar, envvar)
+ elif new_envvar_val is None:
+ env.setvar(new_envvar, envvar_val)
+ else:
+ raise EasyBuildError("Both $%s and $%s set, can I overwrite $%s with $%s (%s) ?",
+ envvar, new_envvar, new_envvar, envvar, envvar_val)
+ env.unset_env_vars(vars_to_unset)
+
+ def add_mpich_configopts(self):
+ """
+ Method to add common configure options for MPICH-based MPI libraries
+ """
+ # additional configuration options
+ add_configopts = []
+
+ # use POSIX threads
+ add_configopts.append('--with-thread-package=pthreads')
+
+ if self.cfg['debug']:
+ # debug build, with error checking, timing and debug info
+ # note: this will affect performance
+ add_configopts.append('--enable-fast=none')
+ else:
+ # optimized build, no error checking, timing or debug info
+ add_configopts.append('--enable-fast')
+
+ # enable shared libraries, using GCC and GNU ld options
+ add_configopts.extend(['--enable-shared', '--enable-sharedlibs=gcc'])
+ # enable static libraries
+ add_configopts.extend(['--enable-static'])
+ # enable Fortran 77/90 and C++ bindings
+ add_configopts.extend(['--enable-f77', '--enable-fc', '--enable-cxx'])
+
+ self.cfg.update('configopts', ' '.join(add_configopts))
+
+ def configure_step(self, add_mpich_configopts=True):
+ """
+ Custom configuration procedure for MPICH
+
+ * add common configure options for MPICH-based MPI libraries
+ * unset environment variables that leak into mpi* wrappers, and define $MPICHLIB_* equivalents instead
+ """
+
+ # things might go wrong if a previous install dir is present, so let's get rid of it
+ if not self.cfg['keeppreviousinstall']:
+ self.log.info("Making sure any old installation is removed before we start the build...")
+ super(EB_MPICH, self).make_dir(self.installdir, True, dontcreateinstalldir=True)
+
+ if add_mpich_configopts:
+ self.add_mpich_configopts()
+
+ self.correct_mpich_build_env()
+
+ super(EB_MPICH, self).configure_step()
+
+ # make and make install are default
+
+ def sanity_check_step(self, custom_paths=None, use_new_libnames=None, check_launchers=True, check_static_libs=True):
+ """
+ Custom sanity check for MPICH
+ """
+ shlib_ext = get_shared_lib_ext()
+ if custom_paths is None:
+ custom_paths = {}
+
+ if use_new_libnames is None:
+ # cfr. http://git.mpich.org/mpich.git/blob_plain/v3.1.1:/CHANGES
+ # MPICH changed its library names sinceversion 3.1.1
+ use_new_libnames = LooseVersion(self.version) >= LooseVersion('3.1.1')
+
+ # Starting MPICH 3.1.1, libraries have been renamed
+ # cf http://git.mpich.org/mpich.git/blob_plain/v3.1.1:/CHANGES
+ if use_new_libnames:
+ libnames = ['mpi', 'mpicxx', 'mpifort']
+ else:
+ libnames = ['fmpich', 'mpichcxx', 'mpichf90', 'mpich', 'mpl', 'opa']
+
+ binaries = ['mpicc', 'mpicxx', 'mpif77', 'mpif90']
+ if check_launchers:
+ binaries.extend(['mpiexec', 'mpiexec.hydra', 'mpirun'])
+
+ bins = [os.path.join('bin', x) for x in binaries]
+ headers = [os.path.join('include', x) for x in ['mpi.h', 'mpicxx.h', 'mpif.h']]
+ lib_exts = [shlib_ext]
+ if check_static_libs:
+ lib_exts.append('a')
+ libs_fn = ['lib%s.%s' % (l, e) for l in libnames for e in lib_exts]
+ libs = [(os.path.join('lib', l), os.path.join('lib64', l)) for l in libs_fn]
+
+ custom_paths.setdefault('dirs', []).extend(['bin', 'include', ('lib', 'lib64')])
+ custom_paths.setdefault('files', []).extend(bins + headers + libs)
+
+ super(EB_MPICH, self).sanity_check_step(custom_paths=custom_paths)
diff --git a/Custom_EasyBlocks/nvidia_driver.py b/Custom_EasyBlocks/nvidia_driver.py
new file mode 100644
index 000000000..f64c1ccc0
--- /dev/null
+++ b/Custom_EasyBlocks/nvidia_driver.py
@@ -0,0 +1,122 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
+#
+# Copyright:: Copyright 2019 Forschungszentrum Juelich GmbH
+# Authors:: Damian Alvarez
+# License:: MIT/GPL
+# $Id$
+##
+"""
+EasyBuild support for NVIDIA libs, implemented as an easyblock
+
+@author: Damian Alvarez (Forschungszentrum Juelich)
+"""
+import os
+
+from distutils.version import LooseVersion
+
+from easybuild.easyblocks.generic.binary import Binary
+from easybuild.framework.easyconfig import CUSTOM
+from easybuild.tools.filetools import copy, expand_glob_paths, mkdir
+from easybuild.tools.run import run_cmd
+from easybuild.tools.systemtools import get_shared_lib_ext
+
+class EB_nvidia_minus_driver(Binary):
+ """
+ Support for installing NVIDIA libs.
+ """
+ @staticmethod
+ def extra_options():
+ """Support for generic 'default' modules with specific real versions"""
+ extra_vars = {
+ 'realversion': [None, "Real version to be used when version = 'default'", CUSTOM],
+ }
+ return extra_vars
+
+ def extract_step(self):
+ """Extract installer to have more control, e.g. options, patching Perl scripts, etc."""
+
+ if self.cfg['realversion']:
+ version = self.cfg['realversion']
+ else:
+ version = self.version
+
+ if LooseVersion(version) < LooseVersion('400.00'):
+ run_files_dir = 'run_files'
+ else:
+ run_files_dir = 'builds'
+
+ # Source comes from the nvidia drivers
+ if self.src[0]['name'].lower().startswith("nvidia"):
+ execpath = self.src[0]['path']
+ # Source comes from the CUDA toolkit
+ else:
+ # Decompress initial file
+ execpath = self.src[0]['path']
+ run_cmd("/bin/sh " + execpath + " --noexec --nox11 --target " + self.builddir)
+ execpath = os.path.join(self.builddir, run_files_dir, 'NVIDIA-Linux-x86_64-%s.run' % version)
+
+ # Decompress file containing libraries
+ self.libsdir = os.path.join(self.builddir, "nvidia-libs")
+ run_cmd("/bin/sh " + execpath + " -x --target " + self.libsdir)
+
+ def install_step(self):
+ "Install NVIDIA libs simply by copying files. We can't user the installer because it requires root privileges."
+
+ # list of libs
+ libs = expand_glob_paths([os.path.join(self.libsdir, 'lib*.so*')])
+ libs += expand_glob_paths([os.path.join(self.libsdir, '*.la')])
+ libs += [os.path.join(self.libsdir, 'nvidia_drv.so')]
+
+ # list of binaries
+ binaries = ['nvidia-bug-report.sh',
+ 'nvidia-cuda-mps-control',
+ 'nvidia-cuda-mps-server',
+ 'nvidia-debugdump',
+ 'nvidia-settings',
+ 'nvidia-smi',
+ 'nvidia-xconfig']
+ binaries = [os.path.join(self.libsdir, x) for x in binaries]
+
+ # list of manpages
+ manpages = ['nvidia-settings.1.gz',
+ 'nvidia-cuda-mps-control.1.gz',
+ 'nvidia-xconfig.1.gz',
+ 'nvidia-smi.1.gz']
+ manpages = [os.path.join(self.libsdir, x) for x in manpages]
+
+ copy(libs, os.path.join(self.installdir, 'lib64'))
+ copy(binaries, os.path.join(self.installdir, 'bin'))
+ copy(manpages, os.path.join(self.installdir, 'man', 'man1'))
+
+ def post_install_step(self):
+ """Generate the appropriate symlinks"""
+
+ libdir = os.path.join(self.installdir, 'lib64')
+
+ # Run ldconfig to create missing symlinks (libcuda.so.1, etc)
+ run_cmd("ldconfig -N %s" % libdir)
+
+ # Create an extra symlink for libcuda.so, otherwise PGI 19.X breaks
+ # Create an extra symlink for libnvidia-ml.so, otherwise MVAPICH2 doesn't find it if it doesn't rely on stubs
+ missing_links = ['libcuda.so', 'libnvidia-ml.so']
+ for missing_link in missing_links:
+ run_cmd("ln -s %s/%s.1 %s/%s" % (libdir, missing_link, libdir, missing_link))
+
+ super(EB_nvidia_minus_driver, self).post_install_step()
+
+ def sanity_check_step(self):
+ """Custom sanity check for NVIDIA libs."""
+
+ shlib_ext = get_shared_lib_ext()
+
+ chk_libdir = ["lib64"]
+
+ nvlibs = ["cuda", "nvidia-ml"]
+ custom_paths = {
+ 'files': [os.path.join("bin", x) for x in ["nvidia-smi"]] +
+ [os.path.join("%s", "lib%s.%s.1") % (x, y, shlib_ext) for x in chk_libdir for y in nvlibs],
+ 'dirs': [''],
+ }
+
+ super(EB_nvidia_minus_driver, self).sanity_check_step(custom_paths=custom_paths)
diff --git a/Custom_EasyBlocks/psmpi.py b/Custom_EasyBlocks/psmpi.py
new file mode 100644
index 000000000..e6a381e0b
--- /dev/null
+++ b/Custom_EasyBlocks/psmpi.py
@@ -0,0 +1,284 @@
+##
+# Copyright 2016-2018 Ghent University, Forschungszentrum Juelich
+#
+# This file is part of EasyBuild,
+# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
+# with support of Ghent University (http://ugent.be/hpc),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
+# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
+# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
+#
+# https://github.com/easybuilders/easybuild
+#
+# EasyBuild is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation v2.
+#
+# EasyBuild is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with EasyBuild. If not, see <http://www.gnu.org/licenses/>.
+##
+"""
+EasyBuild support for building and installing the ParaStationMPI library, implemented as an easyblock
+
+@author: Damian Alvarez (Forschungszentrum Juelich)
+"""
+
+import easybuild.tools.environment as env
+import easybuild.tools.toolchain as toolchain
+import os
+import re
+
+from distutils.version import LooseVersion
+from easybuild.easyblocks.mpich import EB_MPICH
+from easybuild.framework.easyconfig import CUSTOM
+from easybuild.tools.build_log import EasyBuildError, print_msg
+from easybuild.tools.filetools import mkdir, remove_dir, write_file
+from easybuild.tools.modules import get_software_root
+from easybuild.tools.run import run_cmd
+
+
+PINGPONG_PGO_TEST = """
+/****************************************
+ * Potentially buggy, ugly and extremely simple MPI ping pong.
+ * The goal is to trigger pscom internal routines to generate
+ * profiles to be used by PGO-enabled compilers.
+ *
+ * Nothing more, nothing less.
+ *
+ * We try small and large messages to walk the path for eager
+ * and rendezvous protocols
+ *
+ * author: Damian Alvarez (d.alvarez@fz-juelich.de)
+ ****************************************/
+
+#include "mpi.h"
+#define MAX_LENGTH 1048576
+#define ITERATIONS 1000
+
+int main(int argc, char *argv[]){
+ int myid, vlength, i, err, eslength;
+
+ MPI_Request requests[2];
+
+ char error_string[MPI_MAX_ERROR_STRING];
+
+ double v0[MAX_LENGTH], v1[MAX_LENGTH];
+
+ MPI_Status stat;
+
+ MPI_Init(&argc,&argv);
+
+ MPI_Comm_rank(MPI_COMM_WORLD, &myid);
+
+ // Test blocking point to point
+ for (vlength=1; vlength<=MAX_LENGTH; vlength*=2){
+ for (i=0; i<ITERATIONS; i++){
+ MPI_Barrier(MPI_COMM_WORLD);
+ // Not really needed, but it might be interesting to PGO this for benchmarking?
+ MPI_Wtime();
+
+ if (myid == 0){
+ err = MPI_Send(v0, vlength*sizeof(double), MPI_BYTE, 1, 0, MPI_COMM_WORLD);
+ MPI_Error_string(err, error_string, &eslength);
+ err = MPI_Recv(v1, vlength*sizeof(double), MPI_BYTE, 1, 0, MPI_COMM_WORLD, &stat);
+ MPI_Error_string(err, error_string, &eslength);
+ }
+ else{
+ err = MPI_Recv(v1, vlength*sizeof(double), MPI_BYTE, 0, 0, MPI_COMM_WORLD, &stat);
+ MPI_Error_string(err, error_string, &eslength);
+ err = MPI_Send(v0, vlength*sizeof(double), MPI_BYTE, 0, 0, MPI_COMM_WORLD);
+ MPI_Error_string(err, error_string, &eslength);
+ }
+ MPI_Wtime();
+ }
+ }
+
+ // Test non-blocking point to point
+ for (vlength=1; vlength<=MAX_LENGTH; vlength*=2){
+ for (i=0; i<ITERATIONS; i++){
+ if (myid == 0){
+ err = MPI_Isend(v0, vlength*sizeof(double), MPI_BYTE, 1, 0, MPI_COMM_WORLD, &requests[0]);
+ MPI_Error_string(err, error_string, &eslength);
+ err = MPI_Irecv(v1, vlength*sizeof(double), MPI_BYTE, 1, 0, MPI_COMM_WORLD, &requests[1]);
+ MPI_Error_string(err, error_string, &eslength);
+ }
+ else{
+ err = MPI_Irecv(v1, vlength*sizeof(double), MPI_BYTE, 0, 0, MPI_COMM_WORLD, &requests[1]);
+ MPI_Error_string(err, error_string, &eslength);
+ err = MPI_Isend(v0, vlength*sizeof(double), MPI_BYTE, 0, 0, MPI_COMM_WORLD, &requests[0]);
+ MPI_Error_string(err, error_string, &eslength);
+ }
+ MPI_Waitall(2, &requests[0], MPI_STATUSES_IGNORE);
+ }
+ }
+
+ MPI_Finalize();
+}
+"""
+
+
+class EB_psmpi(EB_MPICH):
+ """
+ Support for building the ParaStationMPI library.
+ * Determines the compiler to be used based on the toolchain
+ * Enables threading if required by the easyconfig
+ * Sets extra MPICH options if required by the easyconfig
+ * Generates a PGO profile and uses it if required
+ """
+
+ def __init__(self, *args, **kwargs):
+ super(EB_psmpi, self).__init__(*args, **kwargs)
+ self.profdir = os.path.join(self.builddir, 'profile')
+
+ @staticmethod
+ def extra_options(extra_vars=None):
+ """Define custom easyconfig parameters specific to ParaStationMPI."""
+ extra_vars = EB_MPICH.extra_options(extra_vars)
+
+ # ParaStationMPI doesn't offer this build option, and forcing it in the MPICH build
+ # can be potentially conflictive with other options set by psmpi configure script.
+ del extra_vars['debug']
+
+ extra_vars.update({
+ 'mpich_opts': [None, "Optional options to configure MPICH", CUSTOM],
+ 'threaded': [False, "Enable multithreaded build (which is slower)", CUSTOM],
+ 'pscom_allin_path': [None, "Enable pscom integration by giving its source path", CUSTOM],
+ 'pgo': [False, "Enable profiling guided optimizations", CUSTOM],
+ 'mpiexec_cmd': ['srun -n ', "Command to run benchmarks to generate PGO profile. With -n switch", CUSTOM],
+ 'cuda': [False, "Enable CUDA awareness", CUSTOM],
+ })
+ return extra_vars
+
+ def pgo_steps(self):
+ """
+ Set of steps to be performed after the initial installation, if PGO were enabled
+ """
+ self.log.info("Running PGO steps...")
+ # Remove old profiles
+ remove_dir(self.profdir)
+ mkdir(self.profdir)
+
+ # Clean the old build
+ run_cmd('make distclean')
+
+ # Compile and run example to generate profile
+ print_msg("generating PGO profile...")
+ (out, _) = run_cmd('%s 2 hostname' % self.cfg['mpiexec_cmd'])
+ nodes = out.split()
+ if nodes[0] == nodes[1]:
+ raise EasyBuildError("The profile is generated with 1 node! Use 2 nodes to generate a proper profile!")
+
+ write_file('pingpong.c', PINGPONG_PGO_TEST)
+ run_cmd('%s/bin/mpicc pingpong.c -o pingpong' % self.installdir)
+ run_cmd('PSP_SHM=0 %s 2 pingpong' % self.cfg['mpiexec_cmd'])
+
+ # Check that the profiles are there
+ new_profs = os.listdir(self.profdir)
+ if not new_profs:
+ raise EasyBuildError("The PGO profiles where not found in the expected directory (%s)" % self.profdir)
+
+ # Change PGO related options
+ self.cfg['pgo'] = False
+ self.cfg['configopts'] = re.sub('--with-profile=gen', '--with-profile=use', self.cfg['configopts'])
+
+ # Reconfigure
+ print_msg("configuring with PGO...")
+ self.log.info("Running configure_step with PGO...")
+ self.configure_step()
+
+ # Rebuild
+ print_msg("building with PGO...")
+ self.log.info("Running build_step with PGO...")
+ self.build_step()
+
+ # Reinstall
+ print_msg("installing with PGO...")
+ self.log.info("Running install_step with PGO...")
+ self.install_step()
+
+
+ # MPICH configure script complains when F90 or F90FLAGS are set,
+ def configure_step(self):
+ """
+ Custom configuration procedure for ParaStationMPI.
+ * Sets the correct options
+ * Calls the MPICH configure_step, disabling the default MPICH options
+ """
+
+ comp_opts = {
+ toolchain.GCC: 'gcc',
+ toolchain.INTELCOMP: 'intel',
+ toolchain.PGI: 'pgi',
+ }
+
+ # ParaStationMPI defines its environment through confsets. So these should be unset
+ env_vars = ['CFLAGS', 'CPPFLAGS', 'CXXFLAGS', 'FCFLAGS', 'FFLAGS', 'LDFLAGS', 'LIBS']
+ env.unset_env_vars(env_vars)
+ self.log.info("Unsetting the following variables: " + ' '.join(env_vars))
+
+ # Enable CUDA
+ if self.cfg['cuda']:
+ self.log.info("Enabling CUDA-Awareness...")
+ self.cfg.update('configopts', ' --with-cuda')
+
+ # Set confset
+ comp_fam = self.toolchain.comp_family()
+ if comp_fam in comp_opts:
+ self.cfg.update('configopts', ' --with-confset=%s' % comp_opts[comp_fam])
+ else:
+ raise EasyBuildError("Compiler %s not supported. Valid options are: %s",
+ comp_fam, ', '.join(comp_opts.keys()))
+
+ # Enable threading, if necessary
+ if self.cfg['threaded']:
+ self.cfg.update('configopts', ' --with-threading')
+
+ # Add extra mpich options, if any
+ if self.cfg['mpich_opts'] is not None:
+ self.cfg.update('configopts', ' --with-mpichconf="%s"' % self.cfg['mpich_opts'])
+
+ # Add PGO related options, if enabled
+ if self.cfg['pgo']:
+ self.cfg.update('configopts', ' --with-profile=gen --with-profdir=%s' % self.profdir)
+
+ # Lastly, set pscom related variables
+ if self.cfg['pscom_allin_path'] is None:
+ pscom_path = get_software_root('pscom')
+ else:
+ pscom_path = self.cfg['pscom_allin_path'].strip()
+ self.cfg.update('configopts', ' --with-pscom-allin="%s"' % pscom_path)
+
+ pscom_flags = 'export PSCOM_LDFLAGS="-L{0}/lib $PSCOM_LDFLAGS" &&'.format(pscom_path)
+ pscom_flags += ' export PSCOM_CPPFLAGS="-I{0}/include $PSCOM_CPPFLAGS" &&'.format(pscom_path)
+ self.cfg.update('preconfigopts', pscom_flags)
+
+ super(EB_psmpi, self).configure_step(add_mpich_configopts=False)
+
+ # If PGO is enabled, install, generate a profile, and start over
+ def install_step(self):
+ """
+ Custom installation procedure for ParaStationMPI.
+ * If PGO is requested, installs, generate a profile, and start over
+ """
+ super(EB_psmpi, self).install_step()
+
+ if self.cfg['pgo']:
+ self.pgo_steps()
+
+ def sanity_check_step(self):
+ """
+ Disable the checking of the launchers for ParaStationMPI
+ """
+ # cfr. http://git.mpich.org/mpich.git/blob_plain/v3.1.1:/CHANGES
+ # MPICH changed its library names sinceversion 3.1.1.
+ # cfr. https://github.com/ParaStation/psmpi2/blob/master/ChangeLog
+ # ParaStationMPI >= 5.1.1-1 is based on MPICH >= 3.1.3.
+ # ParaStationMPI < 5.1.1-1 is based on MPICH < 3.1.1.
+ use_new_libnames = LooseVersion(self.version) >= LooseVersion('5.1.1-1')
+
+ super(EB_psmpi, self).sanity_check_step(use_new_libnames=use_new_libnames, check_launchers=False, check_static_libs=False)
diff --git a/Golden_Repo/README.md b/Golden_Repo/README.md
new file mode 100644
index 000000000..57ecbce33
--- /dev/null
+++ b/Golden_Repo/README.md
@@ -0,0 +1,25 @@
+The table below shows the details of the toolchains in the 2020 stage:
+
+- Base
+
+| Toolchain name | Toolchain version | Underlying GCC | Compiler | MPI | CUDA | Math libraries | Includes software from |
+|----------------|---------------------------|----------------|------------------|------------------------|----------|----------------|---------------------------|
+| GCCcore | 10.1.0 | 10.1.0 | | | | | |
+
+- Compilers
+
+| Toolchain name | Toolchain version | Underlying GCC | Compiler | MPI | CUDA | Math libraries | Includes software from |
+|----------------|---------------------------|----------------|------------------|------------------------|----------|----------------|---------------------------|
+| GCC | 10.1.0 | 10.1.0 | GCC 10.1.0 | | | | GCCcore |
+
+- Compilers+MPI
+
+| Toolchain name | Toolchain version | Underlying GCC | Compiler | MPI | CUDA | Math libraries | Includes software from |
+|----------------|---------------------------|----------------|------------------|------------------------|----------|----------------|---------------------------|
+| gpsmpi | 2020 | 10.1.0 | GCC 10.1.0 | ParaStationMPI 5.4.X | | | GCCcore, GCC |
+
+- Compilers+MPI+Math
+
+| Toolchain name | Toolchain version | Underlying GCC | Compiler | MPI | CUDA | Math libraries | Includes software from |
+|----------------|---------------------------|----------------|------------------|------------------------|----------|----------------|---------------------------|
+| gpsmkl | 2020 | 10.1.0 | GCC 10.1.0 | ParaStationMPI 5.4.X | | MKL 2020.1.217 | GCCcore, GCC, gpsmpi |
diff --git a/Golden_Repo/a/Autoconf/Autoconf-2.69.eb b/Golden_Repo/a/Autoconf/Autoconf-2.69.eb
new file mode 100644
index 000000000..1a421adce
--- /dev/null
+++ b/Golden_Repo/a/Autoconf/Autoconf-2.69.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'Autoconf'
+version = '2.69'
+
+homepage = 'http://www.gnu.org/software/autoconf/'
+description = """Autoconf is an extensible package of M4 macros that produce shell scripts
+ to automatically configure software source code packages. These scripts can adapt the
+ packages to many kinds of UNIX-like systems without manual user intervention. Autoconf
+ creates a configuration script for a package from a template file that lists the
+ operating system features that the package can use, in the form of M4 macro calls.
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [
+ ('binutils', '2.34')
+]
+
+dependencies = [
+ ('M4', '1.4.18'),
+]
+
+sanity_check_paths = {
+ 'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", "autoscan",
+ "autoupdate", "ifnames"]],
+ 'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/a/Automake/Automake-1.16.2.eb b/Golden_Repo/a/Automake/Automake-1.16.2.eb
new file mode 100644
index 000000000..59772d5e4
--- /dev/null
+++ b/Golden_Repo/a/Automake/Automake-1.16.2.eb
@@ -0,0 +1,38 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors:: Fotis Georgatos <fotis@cern.ch>
+# License:: MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Automake'
+version = "1.16.2"
+
+homepage = 'http://www.gnu.org/software/automake/automake.html'
+description = """
+Automake: GNU Standards-compliant Makefile generator
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [('binutils', '2.34')]
+dependencies = [('Autoconf', '2.69')]
+
+sanity_check_paths = {
+ 'files': ['bin/automake', 'bin/aclocal'],
+ 'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/a/Autotools/Autotools-20200321.eb b/Golden_Repo/a/Autotools/Autotools-20200321.eb
new file mode 100644
index 000000000..d8d73804f
--- /dev/null
+++ b/Golden_Repo/a/Autotools/Autotools-20200321.eb
@@ -0,0 +1,21 @@
+easyblock = 'Bundle'
+
+name = 'Autotools'
+version = '20200321' # date of the most recent change
+
+homepage = 'http://autotools.io'
+description = """
+ This bundle collect the standard GNU build tools: Autoconf, Automake and libtool
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+dependencies = [
+ ('Autoconf', '2.69'), # 20120424
+ ('Automake', '1.16.2'), # 20200321
+ ('libtool', '2.4.6'), # 20150215
+]
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/b/Bison/Bison-3.6.4-GCCcore-9.3.0.eb b/Golden_Repo/b/Bison/Bison-3.6.4-GCCcore-9.3.0.eb
new file mode 100644
index 000000000..8f121ee9a
--- /dev/null
+++ b/Golden_Repo/b/Bison/Bison-3.6.4-GCCcore-9.3.0.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'Bison'
+version = '3.6.4'
+
+homepage = 'http://www.gnu.org/software/bison'
+description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar
+ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables.
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [
+ ('M4', '1.4.18'),
+ # use same binutils version that was used when building GCCcore toolchain
+ ('binutils', '2.34', '', True),
+]
+
+
+sanity_check_paths = {
+ 'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+ 'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/Golden_Repo/b/Bison/Bison-3.6.4.eb b/Golden_Repo/b/Bison/Bison-3.6.4.eb
new file mode 100644
index 000000000..49e84cef4
--- /dev/null
+++ b/Golden_Repo/b/Bison/Bison-3.6.4.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'Bison'
+version = '3.6.4'
+
+homepage = 'http://www.gnu.org/software/bison'
+description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar
+into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables.
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [('M4', '1.4.18')]
+
+sanity_check_paths = {
+ 'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+ 'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/Golden_Repo/b/binutils/binutils-2.32.eb b/Golden_Repo/b/binutils/binutils-2.32.eb
new file mode 100644
index 000000000..3c0954bb1
--- /dev/null
+++ b/Golden_Repo/b/binutils/binutils-2.32.eb
@@ -0,0 +1,32 @@
+name = 'binutils'
+version = '2.32'
+
+homepage = 'https://directory.fsf.org/project/binutils/'
+
+description = "binutils: GNU binary utilities"
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+patches = [
+ 'binutils-2.31.1-gold-ignore-discarded-note-relocts.patch',
+ 'binutils-2.32-readd-avx512-vmovd.patch',
+ 'binutils-2.32_gold-include-cpp-headers.patch',
+]
+
+builddependencies = [
+ ('flex', '2.6.4'),
+ ('Bison', '3.6.4'),
+ # zlib required, but being linked in statically, so not a runtime dep
+ ('zlib', '1.2.11'),
+]
+
+# avoid build failure when makeinfo command is not available
+# see https://sourceware.org/bugzilla/show_bug.cgi?id=15345
+buildopts = 'MAKEINFO=true'
+installopts = buildopts
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/b/binutils/binutils-2.34-GCCcore-9.3.0.eb b/Golden_Repo/b/binutils/binutils-2.34-GCCcore-9.3.0.eb
new file mode 100644
index 000000000..fb84befc2
--- /dev/null
+++ b/Golden_Repo/b/binutils/binutils-2.34-GCCcore-9.3.0.eb
@@ -0,0 +1,42 @@
+name = 'binutils'
+version = '2.34'
+
+homepage = 'https://directory.fsf.org/project/binutils/'
+description = "binutils: GNU binary utilities"
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+patches = [
+ 'binutils-2.31.1-gold-ignore-discarded-note-relocts.patch',
+ 'binutils-%(version)s-readd-avx512-vmovd.patch',
+]
+checksums = [
+ '53537d334820be13eeb8acb326d01c7c81418772d626715c7ae927a7d401cab3', # binutils-2.34.tar.gz
+ # binutils-2.31.1-gold-ignore-discarded-note-relocts.patch
+ '17f22cc9136d0e81cfe8cbe310328c794a78a864e7fe7ca5827ee6678f65af32',
+ '45ecf7f5d198dd446d1a2e2a4d46b2747eb6fb8f2bfa18d7d42769e710e85716', # binutils-2.34-readd-avx512-vmovd.patch
+]
+
+builddependencies = [
+ ('flex', '2.6.4'),
+ ('Bison', '3.6.4'),
+ # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
+ ('binutils', version, '', True)
+]
+
+dependencies = [
+ # zlib is a runtime dep to avoid that it gets embedded in libbfd.so,
+ # see https://github.com/easybuilders/easybuild-easyblocks/issues/1350
+ ('zlib', '1.2.11'),
+]
+
+# avoid build failure when makeinfo command is not available
+# see https://sourceware.org/bugzilla/show_bug.cgi?id=15345
+buildopts = 'MAKEINFO=true'
+installopts = buildopts
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/b/binutils/binutils-2.34.eb b/Golden_Repo/b/binutils/binutils-2.34.eb
new file mode 100644
index 000000000..a723de986
--- /dev/null
+++ b/Golden_Repo/b/binutils/binutils-2.34.eb
@@ -0,0 +1,37 @@
+name = 'binutils'
+version = '2.34'
+
+homepage = 'https://directory.fsf.org/project/binutils/'
+
+description = "binutils: GNU binary utilities"
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+patches = [
+ 'binutils-2.31.1-gold-ignore-discarded-note-relocts.patch',
+ 'binutils-2.34-readd-avx512-vmovd.patch',
+]
+checksums = [
+ '53537d334820be13eeb8acb326d01c7c81418772d626715c7ae927a7d401cab3', # binutils-2.34.tar.gz
+ # binutils-2.31.1-gold-ignore-discarded-note-relocts.patch
+ '17f22cc9136d0e81cfe8cbe310328c794a78a864e7fe7ca5827ee6678f65af32',
+ '45ecf7f5d198dd446d1a2e2a4d46b2747eb6fb8f2bfa18d7d42769e710e85716', # binutils-2.34-readd-avx512-vmovd.patch
+]
+
+builddependencies = [
+ ('flex', '2.6.4'),
+ ('Bison', '3.6.4'),
+ # zlib required, but being linked in statically, so not a runtime dep
+ ('zlib', '1.2.11'),
+]
+
+# avoid build failure when makeinfo command is not available
+# see https://sourceware.org/bugzilla/show_bug.cgi?id=15345
+buildopts = 'MAKEINFO=true'
+installopts = buildopts
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/c/CUDA/CUDA-11.0.207.eb b/Golden_Repo/c/CUDA/CUDA-11.0.207.eb
new file mode 100644
index 000000000..5a2597dfa
--- /dev/null
+++ b/Golden_Repo/c/CUDA/CUDA-11.0.207.eb
@@ -0,0 +1,39 @@
+name = 'CUDA'
+version = '11.0.207'
+local_short_version = '.'.join(version.split('.')[:2]+[version.split('.')[2][0]])
+
+homepage = 'https://developer.nvidia.com/cuda-toolkit'
+description = """CUDA (formerly Compute Unified Device Architecture) is a parallel
+ computing platform and programming model created by NVIDIA and implemented by the
+ graphics processing units (GPUs) that they produce. CUDA gives developers access
+ to the virtual instruction set and memory of the parallel computational elements
+ in CUDA GPUs.
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+source_urls = [
+ 'http://developer.download.nvidia.com/compute/cuda/%(version_major_minor)s/Prod/local_installers/',
+ 'https://developer.nvidia.com/compute/cuda/%(version_major_minor)s/prod/local_installers/',
+ 'https://developer.nvidia.com/compute/cuda/%(version_major_minor)s/Prod2/local_installers/',
+]
+
+sources = [
+ '%%(namelower)s_%s_450.51.05_linux.run' % local_short_version,
+]
+
+host_compilers = [ 'g++', 'pgc++' ]
+
+dependencies = [
+ ('nvidia-driver', 'default', '', True),
+]
+
+installopts = '--samplespath=%(installdir)s --samples'
+
+modluafooter = '''
+add_property("arch","gpu")
+'''
+
+moduleclass = 'system'
diff --git a/Golden_Repo/f/flex/flex-2.6.4-GCCcore-9.3.0.eb b/Golden_Repo/f/flex/flex-2.6.4-GCCcore-9.3.0.eb
new file mode 100644
index 000000000..5855ba6a3
--- /dev/null
+++ b/Golden_Repo/f/flex/flex-2.6.4-GCCcore-9.3.0.eb
@@ -0,0 +1,24 @@
+name = 'flex'
+version = '2.6.4'
+
+homepage = 'http://flex.sourceforge.net/'
+description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner,
+ sometimes called a tokenizer, is a program which recognizes lexical patterns in text.
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['https://github.com/westes/flex/releases/download/v%(version)s/']
+
+dependencies = [('Bison', '3.6.4')]
+
+# use same binutils version that was used when building GCC toolchain
+builddependencies = [('binutils', '2.34', '', True)]
+
+parallel = 1
+
+moduleclass = 'lang'
diff --git a/Golden_Repo/f/flex/flex-2.6.4.eb b/Golden_Repo/f/flex/flex-2.6.4.eb
new file mode 100644
index 000000000..86ae9bc3f
--- /dev/null
+++ b/Golden_Repo/f/flex/flex-2.6.4.eb
@@ -0,0 +1,26 @@
+name = 'flex'
+version = '2.6.4'
+
+homepage = 'http://flex.sourceforge.net/'
+description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner,
+ sometimes called a tokenizer, is a program which recognizes lexical patterns in text."""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['https://github.com/westes/flex/releases/download/v%(version)s/']
+
+builddependencies = [
+ ('M4', '1.4.18'),
+]
+
+dependencies = [
+ ('Bison', '3.6.4'),
+]
+
+hidden = True
+
+moduleclass = 'lang'
diff --git a/Golden_Repo/g/GCC/GCC-9.3.0.eb b/Golden_Repo/g/GCC/GCC-9.3.0.eb
new file mode 100644
index 000000000..099fe6496
--- /dev/null
+++ b/Golden_Repo/g/GCC/GCC-9.3.0.eb
@@ -0,0 +1,31 @@
+easyblock = 'Bundle'
+
+name = 'GCC'
+version = '9.3.0'
+
+homepage = 'http://gcc.gnu.org/'
+description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada,
+ as well as libraries for these languages (libstdc++, libgcj,...).
+"""
+
+site_contacts = 'Damian Alvarez <d.alvarez@fz-juelich.de>'
+
+toolchain = SYSTEM
+
+dependencies = [
+ ('GCCcore', version),
+ # binutils built on top of GCCcore, which was built on top of (dummy-built) binutils
+ ('binutils', '2.34', '', ('GCCcore', version)),
+]
+
+altroot = 'GCCcore'
+altversion = 'GCCcore'
+
+# We use a HMNS, so let's enforce a unique compiler
+modluafooter = 'family("compiler")'
+
+# Always do a recursive unload on compilers
+recursive_module_unload = True
+
+# this bundle serves as a compiler-only toolchain, so it should be marked as compiler (important for HMNS)
+moduleclass = 'compiler'
diff --git a/Golden_Repo/g/GCCcore/GCCcore-10.1.0.eb b/Golden_Repo/g/GCCcore/GCCcore-10.1.0.eb
new file mode 100644
index 000000000..802d2c31a
--- /dev/null
+++ b/Golden_Repo/g/GCCcore/GCCcore-10.1.0.eb
@@ -0,0 +1,79 @@
+easyblock = 'EB_GCC'
+
+name = 'GCCcore'
+version = '10.1.0'
+local_newlib_version = '3.3.0'
+
+homepage = 'https://gcc.gnu.org/'
+description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada,
+ as well as libraries for these languages (libstdc++, libgcj,...)."""
+
+site_contacts = 'Damian Alvarez <d.alvarez@fz-juelich.de>'
+
+toolchain = SYSTEM
+
+source_urls = [
+ 'https://ftpmirror.gnu.org/gnu/gcc/gcc-%(version)s', # GCC auto-resolving HTTP mirror
+ 'https://ftpmirror.gnu.org/gnu/gmp', # idem for GMP
+ 'https://ftpmirror.gnu.org/gnu/mpfr', # idem for MPFR
+ 'https://ftpmirror.gnu.org/gnu/mpc', # idem for MPC
+ 'ftp://gcc.gnu.org/pub/gcc/infrastructure/', # GCC dependencies
+ 'http://gcc.cybermirror.org/infrastructure/', # HTTP mirror for GCC dependencies
+ 'http://isl.gforge.inria.fr/', # original HTTP source for ISL
+ 'ftp://sourceware.org/pub/newlib/', # newlib
+]
+sources = [
+ 'gcc-%(version)s.tar.gz',
+ 'gmp-6.2.0.tar.bz2',
+ 'mpfr-4.0.2.tar.bz2',
+ 'mpc-1.1.0.tar.gz',
+ 'isl-0.22.1.tar.bz2',
+ 'newlib-%s.tar.gz' % local_newlib_version,
+]
+patches = [
+ 'GCCcore-6.2.0-fix-find-isl.patch',
+ 'GCCcore-9.3.0_gmp-c99.patch',
+]
+checksums = [
+ '954057239c89d25bc7a62bfbceb58026363ad74f079c63fdba27f95abbf60900', # gcc-10.1.0.tar.gz
+ 'f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea', # gmp-6.2.0.tar.bz2
+ 'c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc', # mpfr-4.0.2.tar.bz2
+ '6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e', # mpc-1.1.0.tar.gz
+ '1a668ef92eb181a7c021e8531a3ca89fd71aa1b3744db56f68365ab0a224c5cd', # isl-0.22.1.tar.bz2
+ '58dd9e3eaedf519360d92d84205c3deef0b3fc286685d1c562e245914ef72c66', # newlib-3.3.0.tar.gz
+ '5ad909606d17d851c6ad629b4fddb6c1621844218b8d139fed18c502a7696c68', # GCCcore-6.2.0-fix-find-isl.patch
+ '0e135e1cc7cec701beea9d7d17a61bab34cfd496b4b555930016b98db99f922e', # GCCcore-9.3.0_gmp-c99.patch
+]
+
+builddependencies = [
+ ('M4', '1.4.18'),
+ ('binutils', '2.34'),
+ ('nvptx-tools', '20180301'),
+ ('CUDA', '11.0.207'),
+]
+
+languages = ['c', 'c++', 'fortran']
+
+withisl = True
+# Disabled to support the nvptx target, enabled manually for x86_64 later
+withlto = False
+
+preconfigopts = 'ln -s %%(builddir)s/newlib-%s/newlib %%(builddir)s/gcc-%s && ' % (local_newlib_version, version)
+
+configopts = [
+ '--target=nvptx-none --enable-as-accelerator-for=x86_64-pc-linux-gnu ' +
+ '--with-build-time-tools=$EBROOTNVPTXMINTOOLS/nvptx-none/bin ' +
+ '--disable-sjlj-exceptions --enable-newlib-io-long-long '#,
+ #'--enable-lto' +
+ #'--enable-offload-targets=nvptx-none=%(installdir)s/nvptx-none' +
+ #'--with-cuda-driver=$EBROOTCUDA'
+]
+
+# Make sure we replace the system cc with gcc
+modaliases = {'cc': 'gcc'}
+
+modluafooter = '''
+add_property("arch","gpu")
+'''
+
+moduleclass = 'compiler'
diff --git a/Golden_Repo/g/GCCcore/GCCcore-9.3.0.eb b/Golden_Repo/g/GCCcore/GCCcore-9.3.0.eb
new file mode 100644
index 000000000..c557ca028
--- /dev/null
+++ b/Golden_Repo/g/GCCcore/GCCcore-9.3.0.eb
@@ -0,0 +1,58 @@
+easyblock = 'EB_GCC'
+
+name = 'GCCcore'
+version = '9.3.0'
+local_newlib_version = '3.3.0'
+
+homepage = 'https://gcc.gnu.org/'
+description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada,
+ as well as libraries for these languages (libstdc++, libgcj,...)."""
+
+site_contacts = 'Damian Alvarez <d.alvarez@fz-juelich.de>'
+
+toolchain = SYSTEM
+
+source_urls = [
+ 'https://ftpmirror.gnu.org/gnu/gcc/gcc-%(version)s', # GCC auto-resolving HTTP mirror
+ 'https://ftpmirror.gnu.org/gnu/gmp', # idem for GMP
+ 'https://ftpmirror.gnu.org/gnu/mpfr', # idem for MPFR
+ 'https://ftpmirror.gnu.org/gnu/mpc', # idem for MPC
+ 'ftp://gcc.gnu.org/pub/gcc/infrastructure/', # GCC dependencies
+ 'http://gcc.cybermirror.org/infrastructure/', # HTTP mirror for GCC dependencies
+ 'http://isl.gforge.inria.fr/', # original HTTP source for ISL
+ 'ftp://sourceware.org/pub/newlib/', # newlib
+]
+sources = [
+ 'gcc-%(version)s.tar.gz',
+ 'gmp-6.2.0.tar.bz2',
+ 'mpfr-4.0.2.tar.bz2',
+ 'mpc-1.1.0.tar.gz',
+ 'isl-0.22.1.tar.bz2',
+]
+patches = [
+ 'GCCcore-6.2.0-fix-find-isl.patch',
+ 'GCCcore-%(version)s_gmp-c99.patch',
+]
+checksums = [
+ '5258a9b6afe9463c2e56b9e8355b1a4bee125ca828b8078f910303bc2ef91fa6', # gcc-9.3.0.tar.gz
+ 'f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea', # gmp-6.2.0.tar.bz2
+ 'c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc', # mpfr-4.0.2.tar.bz2
+ '6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e', # mpc-1.1.0.tar.gz
+ '1a668ef92eb181a7c021e8531a3ca89fd71aa1b3744db56f68365ab0a224c5cd', # isl-0.22.1.tar.bz2
+ '5ad909606d17d851c6ad629b4fddb6c1621844218b8d139fed18c502a7696c68', # GCCcore-6.2.0-fix-find-isl.patch
+ '0e135e1cc7cec701beea9d7d17a61bab34cfd496b4b555930016b98db99f922e', # GCCcore-9.3.0_gmp-c99.patch
+]
+
+builddependencies = [
+ ('M4', '1.4.18'),
+ ('binutils', '2.34'),
+]
+
+languages = ['c', 'c++', 'fortran']
+
+withisl = True
+
+# Make sure we replace the system cc with gcc
+modaliases = {'cc': 'gcc'}
+
+moduleclass = 'compiler'
diff --git a/Golden_Repo/g/GCCcore/gcc_9.3.0_remove_sm_30.patch b/Golden_Repo/g/GCCcore/gcc_9.3.0_remove_sm_30.patch
new file mode 100644
index 000000000..44a15c771
--- /dev/null
+++ b/Golden_Repo/g/GCCcore/gcc_9.3.0_remove_sm_30.patch
@@ -0,0 +1,51 @@
+diff -ruN gcc-9.3.0.orig/gcc/config/nvptx/nvptx.c gcc-9.3.0/gcc/config/nvptx/nvptx.c
+--- gcc-9.3.0.orig/gcc/config/nvptx/nvptx.c 2020-07-15 23:11:53.663897096 +0200
++++ gcc-9.3.0/gcc/config/nvptx/nvptx.c 2020-07-15 23:14:56.885947516 +0200
+@@ -5192,10 +5192,7 @@
+ {
+ fputs ("// BEGIN PREAMBLE\n", asm_out_file);
+ fputs ("\t.version\t3.1\n", asm_out_file);
+- if (TARGET_SM35)
+- fputs ("\t.target\tsm_35\n", asm_out_file);
+- else
+- fputs ("\t.target\tsm_30\n", asm_out_file);
++ fputs ("\t.target\tsm_35\n", asm_out_file);
+ fprintf (asm_out_file, "\t.address_size %d\n", GET_MODE_BITSIZE (Pmode));
+ fputs ("// END PREAMBLE\n", asm_out_file);
+ }
+diff -ruN gcc-9.3.0.orig/gcc/config/nvptx/nvptx.opt gcc-9.3.0/gcc/config/nvptx/nvptx.opt
+--- gcc-9.3.0.orig/gcc/config/nvptx/nvptx.opt 2020-07-15 23:11:53.663897096 +0200
++++ gcc-9.3.0/gcc/config/nvptx/nvptx.opt 2020-07-15 23:14:24.665640891 +0200
+@@ -54,9 +54,6 @@
+ Known PTX ISA versions (for use with the -misa= option):
+
+ EnumValue
+-Enum(ptx_isa) String(sm_30) Value(PTX_ISA_SM30)
+-
+-EnumValue
+ Enum(ptx_isa) String(sm_35) Value(PTX_ISA_SM35)
+
+ misa=
+diff -ruN gcc-9.3.0.orig/gcc/testsuite/gcc.target/nvptx/atomic_fetch-2.c gcc-9.3.0/gcc/testsuite/gcc.target/nvptx/atomic_fetch-2.c
+--- gcc-9.3.0.orig/gcc/testsuite/gcc.target/nvptx/atomic_fetch-2.c 2020-07-15 23:11:58.558791537 +0200
++++ gcc-9.3.0/gcc/testsuite/gcc.target/nvptx/atomic_fetch-2.c 2020-07-15 23:25:27.883375555 +0200
+@@ -2,7 +2,7 @@
+ targets. */
+
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -misa=sm_30" } */
++/* { dg-options "-O2 -misa=sm_35" } */
+
+ int
+ main()
+diff -ruN gcc-9.3.0.orig/libgomp/testsuite/libgomp.oacc-c-c++-common/subr.ptx gcc-9.3.0/libgomp/testsuite/libgomp.oacc-c-c++-common/subr.ptx
+--- gcc-9.3.0.orig/libgomp/testsuite/libgomp.oacc-c-c++-common/subr.ptx 2020-07-15 23:11:52.778916181 +0200
++++ gcc-9.3.0/libgomp/testsuite/libgomp.oacc-c-c++-common/subr.ptx 2020-07-15 23:14:10.091955141 +0200
+@@ -1,6 +1,6 @@
+ // BEGIN PREAMBLE
+ .version 3.1
+- .target sm_30
++ .target sm_35
+ .address_size 64
+ // END PREAMBLE
+
diff --git a/Golden_Repo/g/gettext/gettext-0.20.2.eb b/Golden_Repo/g/gettext/gettext-0.20.2.eb
new file mode 100644
index 000000000..c27d115b7
--- /dev/null
+++ b/Golden_Repo/g/gettext/gettext-0.20.2.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'gettext'
+version = '0.20.2'
+
+homepage = 'https://www.gnu.org/software/gettext/'
+description = """GNU 'gettext' is an important step for the GNU Translation Project, as it is an asset on which we may
+build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
+and documentation"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+# This is a basic stripped down version of gettext without any
+# dependencies on other packages used as initial builddep for XZ
+# It is the first step in the cyclic dependency chain of
+# XZ -> libxml2 -> gettext -> XZ
+
+toolchain = SYSTEM
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+ ('ncurses', '6.2'),
+]
+
+configopts = '--without-emacs --with-included-libxml --without-xz --without-bzip2'
+
+sanity_check_paths = {
+ 'files': ['bin/gettext', 'lib/libasprintf.a', 'lib/libasprintf.%s' % SHLIB_EXT,
+ 'lib/libgettextpo.a', 'lib/libgettextpo.%s' % SHLIB_EXT],
+ 'dirs': ['include'],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/l/libtool/libtool-2.4.6.eb b/Golden_Repo/l/libtool/libtool-2.4.6.eb
new file mode 100644
index 000000000..dcb791391
--- /dev/null
+++ b/Golden_Repo/l/libtool/libtool-2.4.6.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'libtool'
+version = '2.4.6'
+
+homepage = 'http://www.gnu.org/software/libtool'
+description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
+ behind a consistent, portable interface.
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [
+ ('binutils', '2.34')
+]
+
+dependencies = [
+ ('M4', '1.4.18'),
+]
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/l/libxml2/libxml2-2.9.10-GCCcore-9.3.0.eb b/Golden_Repo/l/libxml2/libxml2-2.9.10-GCCcore-9.3.0.eb
new file mode 100644
index 000000000..3c239199d
--- /dev/null
+++ b/Golden_Repo/l/libxml2/libxml2-2.9.10-GCCcore-9.3.0.eb
@@ -0,0 +1,30 @@
+name = 'libxml2'
+version = '2.9.10'
+
+homepage = 'http://xmlsoft.org/'
+
+description = """
+ Libxml2 is the XML C parser and toolchain developed for the Gnome project
+ (but usable outside of the Gnome platform).
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+ 'http://xmlsoft.org/sources/',
+ 'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f']
+
+builddependencies = [('binutils', '2.34')]
+
+dependencies = [
+ ('XZ', '5.2.5'),
+ ('zlib', '1.2.11'),
+]
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/m/M4/M4-1.4.18-GCCcore-9.3.0.eb b/Golden_Repo/m/M4/M4-1.4.18-GCCcore-9.3.0.eb
new file mode 100644
index 000000000..ca9617dc4
--- /dev/null
+++ b/Golden_Repo/m/M4/M4-1.4.18-GCCcore-9.3.0.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'M4'
+version = '1.4.18'
+
+homepage = 'http://www.gnu.org/software/m4/m4.html'
+description = """GNU M4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 compatible
+ although it has some extensions (for example, handling more than 9 positional parameters to macros).
+ GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc.
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+# use same binutils version that was used when building GCC toolchain
+builddependencies = [('binutils', '2.34', '', True)]
+
+configopts = "--enable-cxx"
+
+sanity_check_paths = {
+ 'files': ["bin/m4"],
+ 'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/m/M4/M4-1.4.18.eb b/Golden_Repo/m/M4/M4-1.4.18.eb
new file mode 100644
index 000000000..d686b2eb0
--- /dev/null
+++ b/Golden_Repo/m/M4/M4-1.4.18.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'M4'
+version = '1.4.18'
+
+homepage = 'http://www.gnu.org/software/m4/m4.html'
+description = """GNU M4 is an implementation of the traditional Unix macro processor.
+ It is mostly SVR4 compatible although it has some extensions
+ (for example, handling more than 9 positional parameters to macros).
+ GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc.
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+configopts = "--enable-cxx"
+
+sanity_check_paths = {
+ 'files': ["bin/m4"],
+ 'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/n/ncurses/ncurses-6.2.eb b/Golden_Repo/n/ncurses/ncurses-6.2.eb
new file mode 100644
index 000000000..b7c787d09
--- /dev/null
+++ b/Golden_Repo/n/ncurses/ncurses-6.2.eb
@@ -0,0 +1,46 @@
+easyblock = 'ConfigureMake'
+
+name = 'ncurses'
+version = '6.2'
+
+homepage = 'https://www.gnu.org/software/ncurses/'
+description = """The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0,
+ and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and
+ function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses."""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+local_common_configopts = "--with-shared --enable-overwrite --without-ada --enable-symlinks "
+configopts = [
+ # default build
+ local_common_configopts,
+ # the UTF-8 enabled version (ncursesw)
+ local_common_configopts + "--enable-ext-colors --enable-widec --includedir=%(installdir)s/include/ncursesw/",
+]
+
+# need to take care of $CFLAGS ourselves with dummy toolchain
+# we need to add -fPIC, but should also include -O* option to avoid compiling with -O0 (default for GCC)
+buildopts = 'CFLAGS="-O2 -fPIC"'
+
+# Symlink libtinfo to libncurses (since it can handle the API) so it doesn't get picked up from the OS
+postinstallcmds = [
+ "ln -s %(installdir)s/lib/libncurses.so %(installdir)s/lib/libtinfo.so",
+ "ln -s %(installdir)s/lib/libncurses.a %(installdir)s/lib/libtinfo.a"
+]
+
+local_libs = ["form", "menu", "ncurses", "panel"]
+sanity_check_paths = {
+ 'files': ['bin/%s' % x for x in ["captoinfo", "clear", "infocmp", "infotocap", "ncurses%(version_major)s-config",
+ "reset", "tabs", "tic", "toe", "tput", "tset"]] +
+ ['lib/lib%s%s.a' % (x, y) for x in local_libs for y in ['', '_g', 'w', 'w_g']] +
+ ['lib/lib%s%s.%s' % (x, y, SHLIB_EXT) for x in local_libs for y in ['', 'w']] +
+ ['lib/libncurses++%s.a' % x for x in ['', 'w']],
+ 'dirs': ['include', 'include/ncursesw'],
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/n/numactl/numactl-2.0.13.eb b/Golden_Repo/n/numactl/numactl-2.0.13.eb
new file mode 100644
index 000000000..bfe039075
--- /dev/null
+++ b/Golden_Repo/n/numactl/numactl-2.0.13.eb
@@ -0,0 +1,36 @@
+easyblock = 'ConfigureMake'
+
+name = 'numactl'
+version = '2.0.13'
+
+homepage = 'https://github.com/numactl/numactl'
+
+description = """
+ The numactl program allows you to run your application program on specific
+ cpu's and memory nodes. It does this by supplying a NUMA memory policy to
+ the operating system before running your program. The libnuma library provides
+ convenient ways for you to add NUMA memory policies into your own program.
+"""
+
+site_contacts = 'Damian Alvarez <d.alvarez@fz-juelich.de>'
+
+toolchain = SYSTEM
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/numactl/numactl/archive/']
+sources = ['v%(version)s.tar.gz']
+checksums = ['97ee012b2f294903530424b4ff7f28bcaad6a356897ce8777383f87e5c2e325d']
+
+builddependencies = [
+ ('binutils', '2.34'),
+ ('Autotools', '20200321'),
+]
+
+preconfigopts = './autogen.sh && '
+
+sanity_check_paths = {
+ 'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
+ 'dirs': ['share/man', 'include']
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/n/nvidia-driver/nvidia-driver-default.eb b/Golden_Repo/n/nvidia-driver/nvidia-driver-default.eb
new file mode 100644
index 000000000..e1ce1f3fa
--- /dev/null
+++ b/Golden_Repo/n/nvidia-driver/nvidia-driver-default.eb
@@ -0,0 +1,32 @@
+name = 'nvidia-driver'
+version = 'default'
+realversion = '440.33.01'
+
+homepage = 'https://developer.nvidia.com/cuda-toolkit'
+description = """This is a set of libraries normally installed by the NVIDIA driver installer."""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+source_urls = [
+ 'http://us.download.nvidia.com/tesla/%s/' % realversion,
+ 'http://developer.download.nvidia.com/compute/cuda/%s/Prod/local_installers/' % '.'.join(realversion.split('.')[:2]),
+ 'https://developer.nvidia.com/compute/cuda/%s/prod/local_installers/' % '.'.join(realversion.split('.')[:2]),
+ 'https://developer.nvidia.com/compute/cuda/%s/Prod2/local_installers/' % '.'.join(realversion.split('.')[:2]),
+]
+
+sources = [
+ 'NVIDIA-Linux-x86_64-%s.run' % realversion
+]
+
+# Causes issues pointing to wrong directories
+postinstallcmds = [
+ 'rm %(installdir)s/lib64/libGL.la'
+]
+
+modluafooter = '''
+add_property("arch","gpu")
+'''
+
+moduleclass = 'system'
diff --git a/Golden_Repo/n/nvptx-tools/nvptx-tools-20180301.eb b/Golden_Repo/n/nvptx-tools/nvptx-tools-20180301.eb
new file mode 100644
index 000000000..bfcc9078b
--- /dev/null
+++ b/Golden_Repo/n/nvptx-tools/nvptx-tools-20180301.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'nvptx-tools'
+version = '20180301'
+
+homepage = 'https://github.com/MentorEmbedded/nvptx-tools'
+description = """nvptx-tools: a collection of tools for use with nvptx-none GCC toolchains."""
+
+site_contacts = 'd.alvarez@fz-juelich.de'
+
+toolchain = SYSTEM
+toolchainopts = {'pic': True}
+
+sources = ['5f6f343a302d620b0868edab376c00b15741e39e.zip']
+source_urls = ['https://github.com/MentorEmbedded/nvptx-tools/archive/']
+
+patches = ['nvptx-tools-20180301_sm_30_to_sm_35.patch']
+checksums = [
+ 'afcce591a9cae7babd5422724b9e85b45061fcc42d8ce55123225eb255f678ed', # 5f6f343a302d620b0868edab376c00b15741e39e.zip
+ '2d5733bed28c533f2db5eecc3670e3470ffc1dfea6789e57f9079b46f45e4f0c', # nvptx-tools-20180301_sm_30_to_sm_35.patch
+]
+
+hidden = True
+
+sanity_check_paths = {
+ 'files': ["bin/%s" % x for x in ["nvptx-none-as", "nvptx-none-ranlib", "nvptx-none-ar", "nvptx-none-ld",]],
+ 'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/n/nvptx-tools/nvptx-tools-20180301_sm_30_to_sm_35.patch b/Golden_Repo/n/nvptx-tools/nvptx-tools-20180301_sm_30_to_sm_35.patch
new file mode 100644
index 000000000..36f393aa8
--- /dev/null
+++ b/Golden_Repo/n/nvptx-tools/nvptx-tools-20180301_sm_30_to_sm_35.patch
@@ -0,0 +1,12 @@
+diff -ruN nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e.orig/nvptx-as.c nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e/nvptx-as.c
+--- nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e.orig/nvptx-as.c 2018-03-01 18:31:24.000000000 +0100
++++ nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e/nvptx-as.c 2020-07-15 23:33:06.804514239 +0200
+@@ -1047,7 +1047,7 @@
+ FILE *out = stdout;
+ bool verbose __attribute__((unused)) = false;
+ int verify = -1;
+- const char *smver = "sm_30";
++ const char *smver = "sm_35";
+
+ int o;
+ int option_index = 0;
diff --git a/Golden_Repo/p/pkg-config/pkg-config-0.29.2.eb b/Golden_Repo/p/pkg-config/pkg-config-0.29.2.eb
new file mode 100644
index 000000000..90bc8c7ab
--- /dev/null
+++ b/Golden_Repo/p/pkg-config/pkg-config-0.29.2.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'pkg-config'
+version = '0.29.2'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/pkg-config/'
+description = """pkg-config is a helper tool used when compiling applications and libraries. It helps you insert the
+ correct compiler options on the command line so an application can use
+ gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
+ for instance, rather than hard-coding values on where to find glib (or other libraries).
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://pkgconfig.freedesktop.org/releases/']
+
+builddependencies = [('binutils', '2.34')]
+
+# don't use PAX, it might break.
+tar_config_opts = True
+
+configopts = " --with-internal-glib"
+
+sanity_check_paths = {
+ 'files': ['bin/pkg-config'],
+ 'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/p/popt/popt-1.16.eb b/Golden_Repo/p/popt/popt-1.16.eb
new file mode 100644
index 000000000..26a3e9f43
--- /dev/null
+++ b/Golden_Repo/p/popt/popt-1.16.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'popt'
+version = '1.16'
+
+homepage = 'http://freecode.com/projects/popt'
+description = """Popt is a C library for parsing command line parameters.
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://rpm5.org/files/%(name)s/']
+
+sanity_check_paths = {
+ 'files': ['include/%(name)s.h', ('lib/libpopt.a', 'lib64/libpopt.a'), ('lib/libpopt.so', 'lib64/libpopt.so')],
+ 'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/p/pscom/pscom-5.4-default.eb b/Golden_Repo/p/pscom/pscom-5.4-default.eb
new file mode 100644
index 000000000..446bc7761
--- /dev/null
+++ b/Golden_Repo/p/pscom/pscom-5.4-default.eb
@@ -0,0 +1,47 @@
+easyblock = 'ConfigureMake'
+
+name = 'pscom'
+# Create drop-in replacement version that ensures over-riding behaviour
+version = "5.4-default"
+local_realversion = "5.4.6-1"
+homepage = 'http://www.par-tec.com'
+description = """ParaStation is a robust and efficient cluster middleware, consisting of a high-performance
+communication layer (MPI) and a sophisticated management layer.
+"""
+
+site_contacts = 'Damian Alvarez <d.alvarez@fz-juelich.de>'
+
+toolchain = SYSTEM
+
+source_urls = ['https://github.com/ParaStation/%(name)s/archive/']
+sources = ['%s.tar.gz' % local_realversion]
+
+builddependencies = [
+ ('binutils', '2.32'),
+ ('popt', '1.16'),
+ ('CUDA', '11.0.207'),
+]
+
+dependencies = [
+ ('UCX', '1.8.1'),
+]
+
+preconfigopts = 'export UCP_LDFLAGS="-L$EBROOTUCX/lib" && '
+preconfigopts += 'export CUDA_LDFLAGS="-L$EBROOTNVIDIA/lib64" &&'
+
+configopts = '--enable-cuda --enable-ucp'
+
+sanity_check_paths = {
+ 'files': ['include/%(name)s.h',
+ ('lib/libpscom.so', 'lib64/libpscom.so'),
+ ('lib/libpscom4ucp.so', 'lib64/libpscom4ucp.so'),
+ ('lib/libpscom4openib.so', 'lib64/libpscom4openib.so'),
+ ],
+ 'dirs': [],
+}
+
+modextravars = {
+ 'PSCOMVERSION': '%s' % local_realversion,
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-default.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-default.eb
new file mode 100644
index 000000000..de8c90a4c
--- /dev/null
+++ b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-default.eb
@@ -0,0 +1,18 @@
+easyblock = 'SystemBundle'
+
+name = 'psmpi-settings'
+version = '5.4'
+versionsuffix = 'default'
+
+homepage = ''
+description = """This is a module to load the default ParaStationMPI configuration"""
+
+site_contacts = 'd.alvarez@fz-juelich.de'
+
+toolchain = SYSTEM
+
+source_urls = []
+
+sources = []
+
+moduleclass = 'system'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.4.6-1-GCC-9.3.0.eb b/Golden_Repo/p/psmpi/psmpi-5.4.6-1-GCC-9.3.0.eb
new file mode 100644
index 000000000..f0ee2d18a
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.4.6-1-GCC-9.3.0.eb
@@ -0,0 +1,50 @@
+name = 'psmpi'
+version = '5.4.6-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'GCC', 'version': '9.3.0'}
+
+sources = ['%(version)s.tar.gz']
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+
+builddependencies = [('CUDA', '11.0.207', '', SYSTEM)]
+dependencies = [
+ ('pscom', '5.4-default', '', SYSTEM),
+ # needed due to the inclusion of hwloc
+ ('libxml2', '2.9.10')
+]
+
+patches = [
+ 'psmpi_shebang.patch',
+ 'psmpi-%(version)s_ime.patch'
+]
+
+mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = False
+
+cuda = True
+
+# use a more explicit module name to help our naming scheme
+modaltsoftname = 'ParaStationMPI'
+
+# Add a family for our naming scheme
+modluafooter = '''
+add_property("arch","gpu")
+family("mpi")
+if not ( isloaded("mpi-settings/default") ) then
+ load("mpi-settings/default")
+end
+'''
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.4.6-1_ime.patch b/Golden_Repo/p/psmpi/psmpi-5.4.6-1_ime.patch
new file mode 100644
index 000000000..20478287d
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.4.6-1_ime.patch
@@ -0,0 +1,47206 @@
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/aclocal.m4 psmpi-5.4.6-1/mpich2/src/mpi/romio/aclocal.m4
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/aclocal.m4 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/aclocal.m4 2020-07-16 11:30:46.936365369 +0200
+@@ -76,8 +76,7 @@
+ : ${AR=ar}
+
+ AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
+- [AC_LANG_PUSH([C])
+- am_cv_ar_interface=ar
++ [am_cv_ar_interface=ar
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
+ [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+ AC_TRY_EVAL([am_ar_try])
+@@ -94,7 +93,7 @@
+ fi
+ rm -f conftest.lib libconftest.a
+ ])
+- AC_LANG_POP([C])])
++ ])
+
+ case $am_cv_ar_interface in
+ ar)
+@@ -163,9 +162,10 @@
+ # configured tree to be moved without reconfiguration.
+
+ AC_DEFUN([AM_AUX_DIR_EXPAND],
+-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+-# Expand $ac_aux_dir to an absolute path.
+-am_aux_dir=`cd "$ac_aux_dir" && pwd`
++[dnl Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])dnl
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
+ ])
+
+ # AM_CONDITIONAL -*- Autoconf -*-
+@@ -467,12 +467,6 @@
+ # This macro actually does too much. Some checks are only needed if
+ # your package does certain things. But this isn't really a big deal.
+
+-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+-m4_define([AC_PROG_CC],
+-m4_defn([AC_PROG_CC])
+-[_AM_PROG_CC_C_O
+-])
+-
+ # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+ # AM_INIT_AUTOMAKE([OPTIONS])
+ # -----------------------------------------------
+@@ -548,8 +542,8 @@
+ # <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+ # <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+ 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.
++# We need awk for the "check" target. The system "awk" is bad on
++# some platforms.
+ AC_REQUIRE([AC_PROG_AWK])dnl
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+@@ -581,51 +575,6 @@
+ AC_CONFIG_COMMANDS_PRE(dnl
+ [m4_provide_if([_AM_COMPILER_EXEEXT],
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+-
+-# 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
+-# recipes. So use an aggressive probe to check that the usage we want is
+-# actually supported "in the wild" to an acceptable degree.
+-# See automake bug#10828.
+-# To make any issue more visible, cause the running configure to be aborted
+-# by default if the 'rm' program in use doesn't match our expectations; the
+-# user can still override this though.
+-if rm -f && rm -fr && rm -rf; then : OK; else
+- cat >&2 <<'END'
+-Oops!
+-
+-Your 'rm' program seems unable to run without file operands specified
+-on the command line, even when the '-f' option is present. This is contrary
+-to the behaviour of most rm programs out there, and not conforming with
+-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+-
+-Please tell bug-automake@gnu.org about your system, including the value
+-of your $PATH and any error possibly output before this message. This
+-can help us improve future automake versions.
+-
+-END
+- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+- echo 'Configuration will proceed anyway, since you have set the' >&2
+- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+- echo >&2
+- else
+- cat >&2 <<'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: <https://www.gnu.org/software/coreutils/>.
+-
+-If you want to complete the configuration process using your problematic
+-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+-to "yes", and re-run configure.
+-
+-END
+- AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+- fi
+-fi
+-dnl The trailing newline in this macro's definition is deliberate, for
+-dnl backward compatibility and to allow trailing 'dnl'-style comments
+-dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+ ])
+
+ dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+@@ -634,6 +583,7 @@
+ m4_define([_AC_COMPILER_EXEEXT],
+ m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
++
+ # When config.status generates a header, we must update the stamp-h file.
+ # This file resides in the same directory as the config header
+ # that is generated. The stamp files are numbered to have different names.
+@@ -666,7 +616,7 @@
+ # Define $install_sh.
+ AC_DEFUN([AM_PROG_INSTALL_SH],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-if test x"${install_sh+set}" != xset; then
++if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+@@ -774,6 +724,38 @@
+ AC_SUBST([am__include])])
+ AC_SUBST([am__quote])])
+
++# Copyright (C) 1999-2013 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_PROG_CC_C_O
++# --------------
++# Like AC_PROG_CC_C_O, but changed for automake.
++AC_DEFUN([AM_PROG_CC_C_O],
++[AC_REQUIRE([AC_PROG_CC_C_O])dnl
++AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++AC_REQUIRE_AUX_FILE([compile])dnl
++# FIXME: we rely on the cache variable name because
++# there is no other way.
++set dummy $CC
++am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
++if test "$am_t" != yes; then
++ # Losing compiler, so override with the script.
++ # FIXME: It is wrong to rewrite CC.
++ # But if we don't then we get into trouble of one sort or another.
++ # A longer-term fix would be to have automake use am__CC in this case,
++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
++ CC="$am_aux_dir/compile $CC"
++fi
++dnl Make sure AC_PROG_CC is never called again, or it will override our
++dnl setting of CC.
++m4_define([AC_PROG_CC],
++ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
++])
++
+ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+ # Copyright (C) 1997-2018 Free Software Foundation, Inc.
+@@ -843,71 +825,6 @@
+ # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+ AC_DEFUN([_AM_IF_OPTION],
+ [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+-
+-# Copyright (C) 1999-2018 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_PROG_CC_C_O
+-# ---------------
+-# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
+-# to automatically call this.
+-AC_DEFUN([_AM_PROG_CC_C_O],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-AC_REQUIRE_AUX_FILE([compile])dnl
+-AC_LANG_PUSH([C])dnl
+-AC_CACHE_CHECK(
+- [whether $CC understands -c and -o together],
+- [am_cv_prog_cc_c_o],
+- [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+- # Make sure it works both with $CC and with simple cc.
+- # Following AC_PROG_CC_C_O, we do the test twice because some
+- # compilers refuse to overwrite an existing .o file with -o,
+- # though they will create one.
+- am_cv_prog_cc_c_o=yes
+- for am_i in 1 2; do
+- if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+- && test -f conftest2.$ac_objext; then
+- : OK
+- else
+- am_cv_prog_cc_c_o=no
+- break
+- fi
+- done
+- rm -f core conftest*
+- unset am_i])
+-if test "$am_cv_prog_cc_c_o" != yes; then
+- # Losing compiler, so override with the script.
+- # FIXME: It is wrong to rewrite CC.
+- # But if we don't then we get into trouble of one sort or another.
+- # A longer-term fix would be to have automake use am__CC in this case,
+- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+- CC="$am_aux_dir/compile $CC"
+-fi
+-AC_LANG_POP([C])])
+-
+-# For backward compatibility.
+-AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+-
+-# Copyright (C) 2001-2018 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_RUN_LOG(COMMAND)
+-# -------------------
+-# Run COMMAND, save the exit status in ac_status, and log it.
+-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+-AC_DEFUN([AM_RUN_LOG],
+-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+- ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+- (exit $ac_status); }])
+-
+ # Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+ # Copyright (C) 1996-2018 Free Software Foundation, Inc.
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime.c psmpi-5.4.6-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime.c
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime.c 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime.c 2020-07-16 10:45:43.396074000 +0200
+@@ -13,8 +13,8 @@
+
+ struct ADIOI_Fns_struct ADIO_IME_operations = {
+ ADIOI_IME_Open, /* Open */
+- ADIOI_SCALEABLE_OpenColl, /* OpenColl */ /*XXX*/
+- ADIOI_IME_ReadContig, /* ReadContig */
++ ADIOI_GEN_OpenColl, /* OpenColl */
++ ADIOI_IME_ReadContig, /* ReadContig */
+ ADIOI_IME_WriteContig, /* WriteContig */
+ ADIOI_GEN_ReadStridedColl, /* ReadStridedColl */
+ ADIOI_GEN_WriteStridedColl, /* WriteStridedColl */
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_common.c psmpi-5.4.6-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_common.c
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_common.c 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_common.c 2020-07-16 10:45:43.398781000 +0200
+@@ -61,24 +61,38 @@
+ MPI_Attr_put(MPI_COMM_SELF, ADIOI_IME_Initialized, (void *) 0);
+ }
+
+-/* Return an IME-compatible filename (add 'ime:' prefix).
+- * New filename must be free'd by the user */
+-char *ADIOI_IME_Add_prefix(const char *filename)
++/**
++ * Return an IME-compatible filename
++ * An absolute BFS path will get added the 'ime:' prefix.
++ * A path on ime-fuse will be converted to a relative ime path,
++ * with the ime:/ prefix
++ * The returned filename must be free'd by the user
++ */
++char *ADIOI_IME_Convert_filename(const char *filename)
+ {
+- static char myname[] = "ADIOI_IME_ADD_PREFIX";
+- size_t f_len = strlen(filename) + 1;
+- char *ime_filename = ADIOI_Malloc(f_len + ADIOI_IME_PREFIX_LEN);
++ static char myname[] = "ADIOI_IME_CONVERT_FILENAME";
+
+- if (!ime_filename) {
++#if (IME_NATIVE_API_VERSION >= 131)
++ bool is_fuse = ime_native_is_fuse_path_and_convert(filename, NULL);
++ if (is_fuse) {
++ return ADIOI_Strdup(filename);
++ }
++#endif
+
++ size_t f_len = strlen(filename) + 1;
++ char *ime_filename = ADIOI_Malloc(f_len + IME_FILE_PREFIX_LEN_NO_FWD_SLASH);
++ if (!ime_filename) {
+ MPIO_Err_create_code(MPI_SUCCESS,
+ MPIR_ERR_FATAL,
+- myname, __LINE__, MPI_ERR_UNKNOWN, "Error allocating memory", 0);
++ myname, __LINE__, MPI_ERR_UNKNOWN,
++ "Error allocating memory", 0);
+
+ return NULL;
+ }
+
+- ADIOI_Strncpy(ime_filename, ADIOI_IME_PREFIX, ADIOI_IME_PREFIX_LEN);
+- ADIOI_Strncpy((ime_filename + ADIOI_IME_PREFIX_LEN), filename, f_len);
++ ADIOI_Strncpy(ime_filename, DEFAULT_IME_PREFIX_NO_FWD_SLASH,
++ IME_FILE_PREFIX_LEN_NO_FWD_SLASH);
++ ADIOI_Strncpy((ime_filename + IME_FILE_PREFIX_LEN_NO_FWD_SLASH),
++ filename, f_len);
+ return ime_filename;
+ }
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_common.h psmpi-5.4.6-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_common.h
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_common.h 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_common.h 2020-07-16 10:45:43.400059000 +0200
+@@ -20,5 +20,5 @@
+ void ADIOI_IME_End(int *error_code);
+ int ADIOI_IME_End_call(MPI_Comm comm, int keyval, void *attribute_val, void *extra_state);
+
+-char *ADIOI_IME_Add_prefix(const char *filename);
++char *ADIOI_IME_Convert_filename(const char *filename);
+ #endif /* AD_IME_COMMON_H_INCLUDED */
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_delete.c psmpi-5.4.6-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_delete.c
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_delete.c 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_delete.c 2020-07-16 10:45:43.401254000 +0200
+@@ -16,7 +16,7 @@
+ int ret;
+ static char myname[] = "ADIOI_IME_DELETE";
+
+- char *ime_filename = ADIOI_IME_Add_prefix(filename);
++ char *ime_filename = ADIOI_IME_Convert_filename(filename);
+ ret = ime_native_unlink(ime_filename);
+ ADIOI_Free(ime_filename);
+ if (ret)
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime.h psmpi-5.4.6-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime.h
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime.h 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime.h 2020-07-16 10:45:43.397428000 +0200
+@@ -10,9 +10,7 @@
+ #define AD_IME_H_INCLUDED
+
+ #include "adio.h"
+-#ifdef HAVE_IME_NATIVE_H
+ #include "ime_native.h"
+-#endif
+
+ #define ADIOI_IME_PREFIX "ime:"
+ #define ADIOI_IME_PREFIX_LEN (sizeof(ADIOI_IME_PREFIX) - 1)
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_open.c psmpi-5.4.6-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_open.c
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_open.c 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/adio/ad_ime/ad_ime_open.c 2020-07-16 10:45:43.402536000 +0200
+@@ -71,7 +71,7 @@
+ return;
+ }
+
+- ime_fs->ime_filename = ADIOI_IME_Add_prefix(fd->filename);
++ ime_fs->ime_filename = ADIOI_IME_Convert_filename(fd->filename);
+
+ /* all processes open the file */
+ ret = ime_native_open(ime_fs->ime_filename, amode, perm);
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/adio/common/ad_fstype.c psmpi-5.4.6-1/mpich2/src/mpi/romio/adio/common/ad_fstype.c
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/adio/common/ad_fstype.c 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/adio/common/ad_fstype.c 2020-07-16 10:45:51.383949936 +0200
+@@ -87,6 +87,20 @@
+ #define GPFS_SUPER_MAGIC 0x47504653
+ #endif
+
++# if defined(ROMIO_IME)
++/* fuse super magic is somehow missing in system includes */
++# if !defined(FUSE_SUPER_MAGIC)
++# define FUSE_SUPER_MAGIC 0x65735546
++# endif
++# include "ime_native.h"
++# if (IME_NATIVE_API_VERSION) >= 131
++# include "ime_ioctl.h"
++
++/* Disable auto-switching from posix to IME */
++#define IME_NO_AUTO_NATIVE "IME_NO_AUTO_NATIVE"
++# endif
++# endif /* ROMIO_IME */
++
+ #ifdef ROMIO_HAVE_STRUCT_STATVFS_WITH_F_BASETYPE
+ #ifdef HAVE_SYS_STATVFS_H
+ #include <sys/statvfs.h>
+@@ -419,6 +433,39 @@
+ }
+ #endif
+
++#ifdef FUSE_SUPER_MAGIC
++ if (fsbuf.f_type == FUSE_SUPER_MAGIC) {
++ /* fuse does not allow to override FUSE_SUPER_MAGIC
++ * Any file system that is fused based needs to hook in
++ * here and use its own ioctl.
++ */
++ #if defined ROMIO_IME && defined IM_FIOC_GET_F_TYPE
++ char *dir;
++ ADIO_FileSysType_parentdir(filename, &dir);
++ int fd = open(dir, O_RDONLY);
++ if (fd == -1)
++ {
++ /* dir should typically work, but try to fail back to
++ * filename if it somehow failed
++ */
++ fd = open(filename, O_RDONLY);
++ }
++
++ if (fd >= 0) {
++ uint32_t f_type;
++ int rc = ioctl(fd, IM_FIOC_GET_F_TYPE, &f_type);
++ close(fd);
++ if (rc == 0 && f_type == IME_SUPER_MAGIC &&
++ getenv(IME_NO_AUTO_NATIVE) == NULL) {
++ *fstype = ADIO_IME;
++ return;
++ }
++ }
++ #endif /* ROMIO_IME */
++ }
++#endif /* FUSE_SUPER_MAGIC */
++
++
+ #endif /*ROMIO_HAVE_STRUCT_STATFS_WITH_F_TYPE */
+
+ #ifdef ROMIO_UFS
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/adio/include/romioconf.h.in psmpi-5.4.6-1/mpich2/src/mpi/romio/adio/include/romioconf.h.in
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/adio/include/romioconf.h.in 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/adio/include/romioconf.h.in 2020-07-16 10:48:35.333084119 +0200
+@@ -244,7 +244,8 @@
+ /* Define if int smaller than pointer */
+ #undef INT_LT_POINTER
+
+-/* Define to the sub-directory where libtool stores uninstalled libraries. */
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++ */
+ #undef LT_OBJDIR
+
+ /* Define if using MPICH */
+@@ -292,6 +293,9 @@
+ /* Define if usleep needs a declaration */
+ #undef NEEDS_USLEEP_DECL
+
++/* Define to 1 if your C compiler doesn't accept -c and -o together. */
++#undef NO_MINUS_C_MINUS_O
++
+ /* Define if no MPI type is contig */
+ #undef NO_MPI_SGI_type_is_contig
+
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/compile psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/compile
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/compile 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/compile 2020-07-16 10:48:35.336090000 +0200
+@@ -255,8 +255,7 @@
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+- icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
++ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
+ esac
+@@ -343,6 +342,6 @@
+ # eval: (add-hook 'before-save-hook 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+-# time-stamp-time-zone: "UTC0"
++# time-stamp-time-zone: "UTC"
+ # time-stamp-end: "; # UTC"
+ # End:
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/config.guess psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/config.guess
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/config.guess 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/config.guess 2020-07-16 10:48:35.342961565 +0200
+@@ -610,9 +610,8 @@
+ else
+ IBM_ARCH=powerpc
+ fi
+- if [ -x /usr/bin/lslpp ] ; then
+- IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+- awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
++ if [ -x /usr/bin/oslevel ] ; then
++ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+ fi
+@@ -711,12 +710,12 @@
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ # => hppa64-hp-hpux11.23
+
+- if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ grep -q __LP64__
+ then
+- HP_ARCH=hppa2.0w
++ HP_ARCH="hppa2.0w"
+ else
+- HP_ARCH=hppa64
++ HP_ARCH="hppa64"
+ fi
+ fi
+ echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
+@@ -1125,7 +1124,7 @@
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i586.
+ # Note: whatever this is, it MUST be the same as what config.sub
+- # prints for the "djgpp" host, or else GDB configure will decide that
++ # prints for the "djgpp" host, or else GDB configury will decide that
+ # this is a cross-build.
+ echo i586-pc-msdosdjgpp
+ exit ;;
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/config.sub psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/config.sub
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/config.sub 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/config.sub 2020-07-16 10:48:35.348164542 +0200
+@@ -25,7 +25,7 @@
+ # of the GNU General Public License, version 3 ("GPLv3").
+
+
+-# Please send patches to <config-patches@gnu.org>.
++# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+@@ -53,7 +53,8 @@
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+ usage="\
+-Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
++Usage: $0 [OPTION] CPU-MFR-OPSYS
++ $0 [OPTION] ALIAS
+
+ Canonicalize a configuration name.
+
+@@ -116,8 +117,8 @@
+ case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+- kopensolaris*-gnu* | cloudabi*-eabi* | \
++ knetbsd*-gnu* | netbsd*-gnu* | \
++ kopensolaris*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+@@ -251,18 +252,16 @@
+ | arc | arceb \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | avr | avr32 \
+- | ba \
+ | be32 | be64 \
+ | bfin \
+- | c4x | c8051 | clipper \
++ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+- | e2k | epiphany \
+- | fido | fr30 | frv | ft32 \
++ | epiphany \
++ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
+- | i370 | i860 | i960 | ia16 | ia64 \
++ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+- | k1om \
+ | le32 | le64 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+@@ -280,10 +279,8 @@
+ | mips64vr5900 | mips64vr5900el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+- | mipsisa32r6 | mipsisa32r6el \
+ | mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
+- | mipsisa64r6 | mipsisa64r6el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
+@@ -326,10 +323,7 @@
+ c6x)
+ basic_machine=tic6x-unknown
+ ;;
+- leon|leon[3-9])
+- basic_machine=sparc-$basic_machine
+- ;;
+- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+@@ -374,20 +368,18 @@
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* | avr32-* \
+- | ba-* \
+ | be32-* | be64-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
+- | c8051-* | clipper-* | craynv-* | cydra-* \
++ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+- | e2k-* | elxsi-* \
++ | elxsi-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | hexagon-* \
+- | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
++ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
+- | k1om-* \
+ | le32-* | le64-* \
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+@@ -407,10 +399,8 @@
+ | mips64vr5900-* | mips64vr5900el-* \
+ | mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
+- | mipsisa32r6-* | mipsisa32r6el-* \
+ | mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
+- | mipsisa64r6-* | mipsisa64r6el-* \
+ | mipsisa64sb1-* | mipsisa64sb1el-* \
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipsr5900-* | mipsr5900el-* \
+@@ -422,19 +412,16 @@
+ | nios-* | nios2-* | nios2eb-* | nios2el-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
+- | or1k*-* \
+ | orion-* \
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+- | pru-* \
+ | pyramid-* \
+- | riscv32-* | riscv64-* \
+ | rl78-* | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tile*-* \
+@@ -442,8 +429,6 @@
+ | ubicom32-* \
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ | vax-* \
+- | visium-* \
+- | wasm32-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
+ | xstormy16-* | xtensa*-* \
+@@ -520,9 +505,6 @@
+ basic_machine=i386-pc
+ os=-aros
+ ;;
+- asmjs)
+- basic_machine=asmjs-unknown
+- ;;
+ aux)
+ basic_machine=m68k-apple
+ os=-aux
+@@ -816,7 +798,7 @@
+ os=-mingw64
+ ;;
+ mingw32)
+- basic_machine=i686-pc
++ basic_machine=i386-pc
+ os=-mingw32
+ ;;
+ mingw32ce)
+@@ -844,10 +826,6 @@
+ basic_machine=powerpc-unknown
+ os=-morphos
+ ;;
+- moxiebox)
+- basic_machine=moxie-unknown
+- os=-moxiebox
+- ;;
+ msdos)
+ basic_machine=i386-pc
+ os=-msdos
+@@ -856,7 +834,7 @@
+ basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
+ ;;
+ msys)
+- basic_machine=i686-pc
++ basic_machine=i386-pc
+ os=-msys
+ ;;
+ mvs)
+@@ -943,9 +921,6 @@
+ nsv-tandem)
+ basic_machine=nsv-tandem
+ ;;
+- nsx-tandem)
+- basic_machine=nsx-tandem
+- ;;
+ op50n-* | op60c-*)
+ basic_machine=hppa1.1-oki
+ os=-proelf
+@@ -1030,7 +1005,7 @@
+ ppc-* | ppcbe-*)
+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ ;;
+- ppcle | powerpclittle)
++ ppcle | powerpclittle | ppc-le | powerpc-little)
+ basic_machine=powerpcle-unknown
+ ;;
+ ppcle-* | powerpclittle-*)
+@@ -1520,8 +1495,6 @@
+ ;;
+ -nacl*)
+ ;;
+- -ios)
+- ;;
+ -none)
+ ;;
+ *)
+@@ -1562,9 +1535,6 @@
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
+- c8051-*)
+- os=-elf
+- ;;
+ hexagon-*)
+ os=-elf
+ ;;
+@@ -1608,6 +1578,9 @@
+ mips*-*)
+ os=-elf
+ ;;
++ or1k-*)
++ os=-elf
++ ;;
+ or32-*)
+ os=-coff
+ ;;
+@@ -1617,9 +1590,6 @@
+ sparc-* | *-sun)
+ os=-sunos4.1.1
+ ;;
+- pru-*)
+- os=-elf
+- ;;
+ *-be)
+ os=-beos
+ ;;
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/depcomp psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/depcomp
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/depcomp 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/depcomp 2020-07-16 10:48:35.350075712 +0200
+@@ -786,6 +786,6 @@
+ # eval: (add-hook 'before-save-hook 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+-# time-stamp-time-zone: "UTC0"
++# time-stamp-time-zone: "UTC"
+ # time-stamp-end: "; # UTC"
+ # End:
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/install-sh psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/install-sh
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/install-sh 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/install-sh 2020-07-16 10:48:35.352538233 +0200
+@@ -41,15 +41,19 @@
+ # This script is compatible with the BSD install script, but was written
+ # from scratch.
+
+-tab=' '
+ nl='
+ '
+-IFS=" $tab$nl"
++IFS=" "" $nl"
+
+-# Set DOITPROG to "echo" to test this script.
++# set DOITPROG to echo to test this script
+
++# Don't use :- since 4.3BSD and earlier shells don't like it.
+ doit=${DOITPROG-}
+-doit_exec=${doit:-exec}
++if test -z "$doit"; then
++ doit_exec=exec
++else
++ doit_exec=$doit
++fi
+
+ # Put in absolute file names if you don't have them in your path;
+ # or use environment vars.
+@@ -64,6 +68,17 @@
+ rmprog=${RMPROG-rm}
+ stripprog=${STRIPPROG-strip}
+
++posix_glob='?'
++initialize_posix_glob='
++ test "$posix_glob" != "?" || {
++ if (set -f) 2>/dev/null; then
++ posix_glob=
++ else
++ posix_glob=:
++ fi
++ }
++'
++
+ posix_mkdir=
+
+ # Desired mode of installed file.
+@@ -82,7 +97,7 @@
+ dst_arg=
+
+ copy_on_change=false
+-is_target_a_directory=possibly
++no_target_directory=
+
+ usage="\
+ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+@@ -122,57 +137,46 @@
+ -d) dir_arg=true;;
+
+ -g) chgrpcmd="$chgrpprog $2"
+- shift;;
++ shift;;
+
+ --help) echo "$usage"; exit $?;;
+
+ -m) mode=$2
+- case $mode in
+- *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+- echo "$0: invalid mode: $mode" >&2
+- exit 1;;
+- esac
+- shift;;
++ case $mode in
++ *' '* | *' '* | *'
++'* | *'*'* | *'?'* | *'['*)
++ echo "$0: invalid mode: $mode" >&2
++ exit 1;;
++ esac
++ shift;;
+
+ -o) chowncmd="$chownprog $2"
+- shift;;
++ shift;;
+
+ -s) stripcmd=$stripprog;;
+
+- -t)
+- is_target_a_directory=always
+- dst_arg=$2
+- # Protect names problematic for 'test' and other utilities.
+- case $dst_arg in
+- -* | [=\(\)!]) dst_arg=./$dst_arg;;
+- esac
+- shift;;
++ -t) dst_arg=$2
++ # Protect names problematic for 'test' and other utilities.
++ case $dst_arg in
++ -* | [=\(\)!]) dst_arg=./$dst_arg;;
++ esac
++ shift;;
+
+- -T) is_target_a_directory=never;;
++ -T) no_target_directory=true;;
+
+ --version) echo "$0 $scriptversion"; exit $?;;
+
+- --) shift
+- break;;
++ --) shift
++ break;;
+
+- -*) echo "$0: invalid option: $1" >&2
+- exit 1;;
++ -*) echo "$0: invalid option: $1" >&2
++ exit 1;;
+
+ *) break;;
+ esac
+ shift
+ done
+
+-# We allow the use of options -d and -T together, by making -d
+-# take the precedence; this is for compatibility with GNU install.
+-
+-if test -n "$dir_arg"; then
+- if test -n "$dst_arg"; then
+- echo "$0: target directory not allowed when installing a directory." >&2
+- exit 1
+- fi
+-fi
+-
+ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+ # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+@@ -204,15 +208,6 @@
+ fi
+
+ if test -z "$dir_arg"; then
+- if test $# -gt 1 || test "$is_target_a_directory" = always; then
+- if test ! -d "$dst_arg"; then
+- echo "$0: $dst_arg: Is not a directory." >&2
+- exit 1
+- fi
+- fi
+-fi
+-
+-if test -z "$dir_arg"; then
+ do_exit='(exit $ret); exit $ret'
+ trap "ret=129; $do_exit" 1
+ trap "ret=130; $do_exit" 2
+@@ -228,16 +223,16 @@
+
+ *[0-7])
+ if test -z "$stripcmd"; then
+- u_plus_rw=
++ u_plus_rw=
+ else
+- u_plus_rw='% 200'
++ u_plus_rw='% 200'
+ fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+ *)
+ if test -z "$stripcmd"; then
+- u_plus_rw=
++ u_plus_rw=
+ else
+- u_plus_rw=,u+rw
++ u_plus_rw=,u+rw
+ fi
+ cp_umask=$mode$u_plus_rw;;
+ esac
+@@ -387,51 +382,53 @@
+ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
+- /*) prefix='/';;
+- [-=\(\)!]*) prefix='./';;
+- *) prefix='';;
++ /*) prefix='/';;
++ [-=\(\)!]*) prefix='./';;
++ *) prefix='';;
+ esac
+
++ eval "$initialize_posix_glob"
++
+ oIFS=$IFS
+ IFS=/
+- set -f
++ $posix_glob set -f
+ set fnord $dstdir
+ shift
+- set +f
++ $posix_glob set +f
+ IFS=$oIFS
+
+ prefixes=
+
+ for d
+ do
+- test X"$d" = X && continue
++ test X"$d" = X && continue
+
+- prefix=$prefix$d
+- if test -d "$prefix"; then
+- prefixes=
+- else
+- if $posix_mkdir; then
+- (umask=$mkdir_umask &&
+- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+- # Don't fail if two instances are running concurrently.
+- test -d "$prefix" || exit 1
+- else
+- case $prefix in
+- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+- *) qprefix=$prefix;;
+- esac
+- prefixes="$prefixes '$qprefix'"
+- fi
+- fi
+- prefix=$prefix/
++ prefix=$prefix$d
++ if test -d "$prefix"; then
++ prefixes=
++ else
++ if $posix_mkdir; then
++ (umask=$mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
++ # Don't fail if two instances are running concurrently.
++ test -d "$prefix" || exit 1
++ else
++ case $prefix in
++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
++ *) qprefix=$prefix;;
++ esac
++ prefixes="$prefixes '$qprefix'"
++ fi
++ fi
++ prefix=$prefix/
+ done
+
+ if test -n "$prefixes"; then
+- # Don't fail if two instances are running concurrently.
+- (umask $mkdir_umask &&
+- eval "\$doit_exec \$mkdirprog $prefixes") ||
+- test -d "$dstdir" || exit 1
+- obsolete_mkdir_used=true
++ # Don't fail if two instances are running concurrently.
++ (umask $mkdir_umask &&
++ eval "\$doit_exec \$mkdirprog $prefixes") ||
++ test -d "$dstdir" || exit 1
++ obsolete_mkdir_used=true
+ fi
+ fi
+ fi
+@@ -466,12 +463,15 @@
+
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+- old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+- new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+- set -f &&
++ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
++ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
++
++ eval "$initialize_posix_glob" &&
++ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+- set +f &&
++ $posix_glob set +f &&
++
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+@@ -484,24 +484,24 @@
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+- # Now remove or move aside any old file at destination location.
+- # We try this two ways since rm can't unlink itself on some
+- # systems and the destination file might be busy for other
+- # reasons. In this case, the final cleanup might fail but the new
+- # file should still install successfully.
+- {
+- test ! -f "$dst" ||
+- $doit $rmcmd -f "$dst" 2>/dev/null ||
+- { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+- } ||
+- { echo "$0: cannot unlink or rename $dst" >&2
+- (exit 1); exit 1
+- }
+- } &&
++ # Now remove or move aside any old file at destination location.
++ # We try this two ways since rm can't unlink itself on some
++ # systems and the destination file might be busy for other
++ # reasons. In this case, the final cleanup might fail but the new
++ # file should still install successfully.
++ {
++ test ! -f "$dst" ||
++ $doit $rmcmd -f "$dst" 2>/dev/null ||
++ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
++ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
++ } ||
++ { echo "$0: cannot unlink or rename $dst" >&2
++ (exit 1); exit 1
++ }
++ } &&
+
+- # Now rename the file to the real destination.
+- $doit $mvcmd "$dsttmp" "$dst"
++ # Now rename the file to the real destination.
++ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
+
+@@ -513,6 +513,6 @@
+ # eval: (add-hook 'before-save-hook 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+-# time-stamp-time-zone: "UTC0"
++# time-stamp-time-zone: "UTC"
+ # time-stamp-end: "; # UTC"
+ # End:
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/libtool.m4 psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/libtool.m4
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/libtool.m4 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/libtool.m4 2020-07-16 10:48:35.364065380 +0200
+@@ -1,6 +1,8 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ #
+-# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # Written by Gordon Matzigkeit, 1996
+ #
+ # This file is free software; the Free Software Foundation gives
+@@ -8,30 +10,36 @@
+ # modifications, as long as this notice is preserved.
+
+ m4_define([_LT_COPYING], [dnl
+-# Copyright (C) 2014 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.
+-
+-# GNU Libtool is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of of the License, or
+-# (at your option) any later version.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
++# Written by Gordon Matzigkeit, 1996
++#
++# This file is part of GNU Libtool.
++#
++# GNU Libtool is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License as
++# published by the Free Software Foundation; either version 2 of
++# the License, or (at your option) any later version.
+ #
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program or library that is built
+-# using GNU Libtool, you may include this file under the same
+-# distribution terms that you use for the rest of that program.
++# As a special exception to the GNU General Public License,
++# if you distribute this file as part of a program or library that
++# is built using GNU Libtool, you may include this file under the
++# same distribution terms that you use for the rest of that program.
+ #
+-# GNU Libtool is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
++# GNU Libtool is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program. If not, see <http://www.gnu.org/licenses/>.
++# along with GNU Libtool; see the file COPYING. If not, a copy
++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
++# obtained by writing to the Free Software Foundation, Inc.,
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ ])
+
+-# serial 58 LT_INIT
++# serial 57 LT_INIT
+
+
+ # LT_PREREQ(VERSION)
+@@ -59,7 +67,7 @@
+ # LT_INIT([OPTIONS])
+ # ------------------
+ AC_DEFUN([LT_INIT],
+-[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
++[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+ AC_BEFORE([$0], [LT_LANG])dnl
+ AC_BEFORE([$0], [LT_OUTPUT])dnl
+@@ -83,7 +91,7 @@
+ _LT_SET_OPTIONS([$0], [$1])
+
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS=$ltmain
++LIBTOOL_DEPS="$ltmain"
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -103,43 +111,26 @@
+ dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+-# _LT_PREPARE_CC_BASENAME
+-# -----------------------
+-m4_defun([_LT_PREPARE_CC_BASENAME], [
+-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+-func_cc_basename ()
+-{
+- for cc_temp in @S|@*""; do
+- case $cc_temp in
+- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+- \-*) ;;
+- *) break;;
+- esac
+- done
+- func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+-}
+-])# _LT_PREPARE_CC_BASENAME
+-
+-
+ # _LT_CC_BASENAME(CC)
+ # -------------------
+-# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+-# but that macro is also expanded into generated libtool script, which
+-# arranges for $SED and $ECHO to be set by different means.
++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+ m4_defun([_LT_CC_BASENAME],
+-[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+-AC_REQUIRE([_LT_DECL_SED])dnl
+-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+-func_cc_basename $1
+-cc_basename=$func_cc_basename_result
++[for cc_temp in $1""; do
++ case $cc_temp in
++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+ ])
+
+
+ # _LT_FILEUTILS_DEFAULTS
+ # ----------------------
+ # It is okay to use these file commands and assume they have been set
+-# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
++# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+ m4_defun([_LT_FILEUTILS_DEFAULTS],
+ [: ${CP="cp -f"}
+ : ${MV="mv -f"}
+@@ -186,16 +177,15 @@
+ m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+ m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+ m4_require([_LT_WITH_SYSROOT])dnl
+-m4_require([_LT_CMD_TRUNCATE])dnl
+
+ _LT_CONFIG_LIBTOOL_INIT([
+-# See if we are running on zsh, and set the options that allow our
++# See if we are running on zsh, and set the options which allow our
+ # commands through without removal of \ escapes INIT.
+-if test -n "\${ZSH_VERSION+set}"; then
++if test -n "\${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+ ])
+-if test -n "${ZSH_VERSION+set}"; then
++if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+
+@@ -208,7 +198,7 @@
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+- if test set != "${COLLECT_NAMES+set}"; then
++ if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+@@ -219,14 +209,14 @@
+ ofile=libtool
+ can_build_shared=yes
+
+-# All known linkers require a '.a' archive for static linking (except MSVC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+
+-with_gnu_ld=$lt_cv_prog_gnu_ld
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+-old_CC=$CC
+-old_CFLAGS=$CFLAGS
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
+
+ # Set sane defaults for various variables
+ test -z "$CC" && CC=cc
+@@ -279,14 +269,14 @@
+
+ # _LT_PROG_LTMAIN
+ # ---------------
+-# Note that this code is called both from 'configure', and 'config.status'
++# Note that this code is called both from `configure', and `config.status'
+ # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
+-# 'config.status' has no value for ac_aux_dir unless we are using Automake,
++# `config.status' has no value for ac_aux_dir unless we are using Automake,
+ # so we pass a copy along to make sure it has a sensible value anyway.
+ m4_defun([_LT_PROG_LTMAIN],
+ [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+ _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+-ltmain=$ac_aux_dir/ltmain.sh
++ltmain="$ac_aux_dir/ltmain.sh"
+ ])# _LT_PROG_LTMAIN
+
+
+@@ -296,7 +286,7 @@
+
+ # So that we can recreate a full libtool script including additional
+ # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+-# in macros and then make a single call at the end using the 'libtool'
++# in macros and then make a single call at the end using the `libtool'
+ # label.
+
+
+@@ -431,8 +421,8 @@
+
+ # _LT_CONFIG_STATUS_DECLARE([VARNAME])
+ # ------------------------------------
+-# Quote a variable value, and forward it to 'config.status' so that its
+-# declaration there will have the same value as in 'configure'. VARNAME
++# Quote a variable value, and forward it to `config.status' so that its
++# declaration there will have the same value as in `configure'. VARNAME
+ # must have a single quote delimited value for this to work.
+ m4_define([_LT_CONFIG_STATUS_DECLARE],
+ [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+@@ -456,7 +446,7 @@
+ # Output comment and list of tags supported by the script
+ m4_defun([_LT_LIBTOOL_TAGS],
+ [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+-available_tags='_LT_TAGS'dnl
++available_tags="_LT_TAGS"dnl
+ ])
+
+
+@@ -484,7 +474,7 @@
+ # _LT_LIBTOOL_CONFIG_VARS
+ # -----------------------
+ # Produce commented declarations of non-tagged libtool config variables
+-# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
++# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+ # script. Tagged libtool config variables (even for the LIBTOOL CONFIG
+ # section) are produced by _LT_LIBTOOL_TAG_VARS.
+ m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+@@ -510,8 +500,8 @@
+ # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
+ # variables for single and double quote escaping we saved from calls
+ # to _LT_DECL, we can put quote escaped variables declarations
+-# into 'config.status', and then the shell code to quote escape them in
+-# for loops in 'config.status'. Finally, any additional code accumulated
++# into `config.status', and then the shell code to quote escape them in
++# for loops in `config.status'. Finally, any additional code accumulated
+ # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+ m4_defun([_LT_CONFIG_COMMANDS],
+ [AC_PROVIDE_IFELSE([LT_OUTPUT],
+@@ -557,7 +547,7 @@
+ ]], lt_decl_quote_varnames); do
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ *[[\\\\\\\`\\"\\\$]]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -570,7 +560,7 @@
+ ]], lt_decl_dquote_varnames); do
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ *[[\\\\\\\`\\"\\\$]]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -586,7 +576,7 @@
+ # Generate a child script FILE with all initialization necessary to
+ # reuse the environment learned by the parent script, and make the
+ # file executable. If COMMENT is supplied, it is inserted after the
+-# '#!' sequence but before initialization text begins. After this
++# `#!' sequence but before initialization text begins. After this
+ # macro, additional text can be appended to FILE to form the body of
+ # the child script. The macro ends with non-zero status if the
+ # file could not be fully written (such as if the disk is full).
+@@ -608,7 +598,7 @@
+ _AS_PREPARE
+ exec AS_MESSAGE_FD>&1
+ _ASEOF
+-test 0 = "$lt_write_fail" && chmod +x $1[]dnl
++test $lt_write_fail = 0 && chmod +x $1[]dnl
+ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+ # LT_OUTPUT
+@@ -631,7 +621,7 @@
+ } >&AS_MESSAGE_LOG_FD
+
+ lt_cl_help="\
+-'$as_me' creates a local libtool stub from the current configuration,
++\`$as_me' creates a local libtool stub from the current configuration,
+ for use in further configure time tests before the real libtool is
+ generated.
+
+@@ -653,7 +643,7 @@
+ This config.lt script is free software; the Free Software Foundation
+ gives unlimited permision to copy, distribute and modify it."
+
+-while test 0 != $[#]
++while test $[#] != 0
+ do
+ case $[1] in
+ --version | --v* | -V )
+@@ -666,10 +656,10 @@
+ lt_cl_silent=: ;;
+
+ -*) AC_MSG_ERROR([unrecognized option: $[1]
+-Try '$[0] --help' for more information.]) ;;
++Try \`$[0] --help' for more information.]) ;;
+
+ *) AC_MSG_ERROR([unrecognized argument: $[1]
+-Try '$[0] --help' for more information.]) ;;
++Try \`$[0] --help' for more information.]) ;;
+ esac
+ shift
+ done
+@@ -695,7 +685,7 @@
+ # open by configure. Here we exec the FD to /dev/null, effectively closing
+ # config.log, so it can be properly (re)opened and appended to by config.lt.
+ lt_cl_success=:
+-test yes = "$silent" &&
++test "$silent" = yes &&
+ lt_config_lt_args="$lt_config_lt_args --quiet"
+ exec AS_MESSAGE_LOG_FD>/dev/null
+ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+@@ -715,30 +705,27 @@
+ _LT_CONFIG_SAVE_COMMANDS([
+ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+ m4_if(_LT_TAG, [C], [
+- # See if we are running on zsh, and set the options that allow our
++ # See if we are running on zsh, and set the options which allow our
+ # commands through without removal of \ escapes.
+- if test -n "${ZSH_VERSION+set}"; then
++ if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+
+- cfgfile=${ofile}T
++ cfgfile="${ofile}T"
+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+ $RM "$cfgfile"
+
+ cat <<_LT_EOF >> "$cfgfile"
+ #! $SHELL
+-# Generated automatically by $as_me ($PACKAGE) $VERSION
+-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+-
+-# Provide generalized library-building support services.
+-# Written by Gordon Matzigkeit, 1996
+
++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
+ _LT_COPYING
+ _LT_LIBTOOL_TAGS
+
+-# Configured defaults for sys_lib_dlsearch_path munging.
+-: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+-
+ # ### BEGIN LIBTOOL CONFIG
+ _LT_LIBTOOL_CONFIG_VARS
+ _LT_LIBTOOL_TAG_VARS
+@@ -746,24 +733,13 @@
+
+ _LT_EOF
+
+- cat <<'_LT_EOF' >> "$cfgfile"
+-
+-# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+-
+-_LT_PREPARE_MUNGE_PATH_LIST
+-_LT_PREPARE_CC_BASENAME
+-
+-# ### END FUNCTIONS SHARED WITH CONFIGURE
+-
+-_LT_EOF
+-
+ case $host_os in
+ aix3*)
+ cat <<\_LT_EOF >> "$cfgfile"
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+-if test set != "${COLLECT_NAMES+set}"; then
++if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+@@ -780,6 +756,8 @@
+ sed '$q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
++ _LT_PROG_REPLACE_SHELLFNS
++
+ mv -f "$cfgfile" "$ofile" ||
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+ chmod +x "$ofile"
+@@ -797,6 +775,7 @@
+ [m4_if([$1], [], [
+ PACKAGE='$PACKAGE'
+ VERSION='$VERSION'
++ TIMESTAMP='$TIMESTAMP'
+ RM='$RM'
+ ofile='$ofile'], [])
+ ])dnl /_LT_CONFIG_SAVE_COMMANDS
+@@ -995,7 +974,7 @@
+
+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+ [lt_cv_apple_cc_single_mod=no
+- if test -z "$LT_MULTI_MODULE"; then
++ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+@@ -1013,7 +992,7 @@
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ # Otherwise, if the output was created with a 0 exit code from
+ # the compiler, it worked.
+- elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
++ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ lt_cv_apple_cc_single_mod=yes
+ else
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+@@ -1031,7 +1010,7 @@
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [lt_cv_ld_exported_symbols_list=yes],
+ [lt_cv_ld_exported_symbols_list=no])
+- LDFLAGS=$save_LDFLAGS
++ LDFLAGS="$save_LDFLAGS"
+ ])
+
+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+@@ -1053,7 +1032,7 @@
+ _lt_result=$?
+ if test -s conftest.err && $GREP force_load conftest.err; then
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+- elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
++ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+@@ -1063,32 +1042,32 @@
+ ])
+ case $host_os in
+ rhapsody* | darwin1.[[012]])
+- _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*) # darwin 5.x on
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+- 10.[[012]][[,.]]*)
+- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[[012]]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+- if test yes = "$lt_cv_apple_cc_single_mod"; then
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+- if test yes = "$lt_cv_ld_exported_symbols_list"; then
+- _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+- if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
++ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
+ else
+ _lt_dsymutil=
+@@ -1108,29 +1087,29 @@
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- if test yes = "$lt_cv_ld_force_load"; then
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++ if test "$lt_cv_ld_force_load" = "yes"; then
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ fi
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+- _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
++ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ case $cc_basename in
+- ifort*|nagfor*) _lt_dar_can_shared=yes ;;
++ ifort*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+- if test yes = "$_lt_dar_can_shared"; then
++ if test "$_lt_dar_can_shared" = "yes"; then
+ output_verbose_link_cmd=func_echo_all
+- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
++ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ m4_if([$1], [CXX],
+-[ if test yes != "$lt_cv_apple_cc_single_mod"; then
+- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
++[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ fi
+ ],[])
+ else
+@@ -1150,7 +1129,7 @@
+ # 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
+-if test set = "${lt_cv_aix_libpath+set}"; then
++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])],
+@@ -1168,7 +1147,7 @@
+ _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
++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+ fi
+ ])
+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+@@ -1188,8 +1167,8 @@
+ # -----------------------
+ # Find how we can fake an echo command that does not interpret backslash.
+ # In particular, with Autoconf 2.60 or later we add some code to the start
+-# of the generated configure script that will find a shell with a builtin
+-# printf (that we can use as an echo command).
++# of the generated configure script which will find a shell with a builtin
++# printf (which we can use as an echo command).
+ m4_defun([_LT_PROG_ECHO_BACKSLASH],
+ [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+@@ -1217,10 +1196,10 @@
+ # Invoke $ECHO with all args, space-separated.
+ func_echo_all ()
+ {
+- $ECHO "$*"
++ $ECHO "$*"
+ }
+
+-case $ECHO in
++case "$ECHO" in
+ printf*) AC_MSG_RESULT([printf]) ;;
+ print*) AC_MSG_RESULT([print -r]) ;;
+ *) AC_MSG_RESULT([cat]) ;;
+@@ -1246,17 +1225,16 @@
+ AC_DEFUN([_LT_WITH_SYSROOT],
+ [AC_MSG_CHECKING([for sysroot])
+ AC_ARG_WITH([sysroot],
+-[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+- [Search for dependent libraries within DIR (or the compiler's sysroot
+- if not specified).])],
++[ --with-sysroot[=DIR] Search for dependent libraries within DIR
++ (or the compiler's sysroot if not specified).],
+ [], [with_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_sysroot in #(
++case ${with_sysroot} in #(
+ yes)
+- if test yes = "$GCC"; then
++ if test "$GCC" = yes; then
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+ fi
+ ;; #(
+@@ -1266,14 +1244,14 @@
+ no|'')
+ ;; #(
+ *)
+- AC_MSG_RESULT([$with_sysroot])
++ AC_MSG_RESULT([${with_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 where our libraries should be installed.])])
++[dependent libraries, and in which our libraries should be installed.])])
+
+ # _LT_ENABLE_LOCK
+ # ---------------
+@@ -1281,33 +1259,31 @@
+ [AC_ARG_ENABLE([libtool-lock],
+ [AS_HELP_STRING([--disable-libtool-lock],
+ [avoid locking (might break parallel builds)])])
+-test no = "$enable_libtool_lock" || enable_libtool_lock=yes
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+ # Some flags need to be propagated to the compiler or linker for good
+ # libtool support.
+ case $host in
+ ia64-*-hpux*)
+- # Find out what ABI is being produced by ac_compile, and set mode
+- # options accordingly.
++ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *ELF-32*)
+- HPUX_IA64_MODE=32
++ HPUX_IA64_MODE="32"
+ ;;
+ *ELF-64*)
+- HPUX_IA64_MODE=64
++ HPUX_IA64_MODE="64"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ *-*-irix6*)
+- # Find out what ABI is being produced by ac_compile, and set linker
+- # options accordingly.
++ # Find out which ABI we are using.
+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+- if test yes = "$lt_cv_prog_gnu_ld"; then
++ if test "$lt_cv_prog_gnu_ld" = yes; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -melf32bsmip"
+@@ -1336,46 +1312,9 @@
+ rm -rf conftest*
+ ;;
+
+-mips64*-*linux*)
+- # Find out what ABI is being produced by ac_compile, and set linker
+- # options accordingly.
+- echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+- if AC_TRY_EVAL(ac_compile); then
+- emul=elf
+- case `/usr/bin/file conftest.$ac_objext` in
+- *32-bit*)
+- emul="${emul}32"
+- ;;
+- *64-bit*)
+- emul="${emul}64"
+- ;;
+- esac
+- case `/usr/bin/file conftest.$ac_objext` in
+- *MSB*)
+- emul="${emul}btsmip"
+- ;;
+- *LSB*)
+- emul="${emul}ltsmip"
+- ;;
+- esac
+- case `/usr/bin/file conftest.$ac_objext` in
+- *N32*)
+- emul="${emul}n32"
+- ;;
+- esac
+- LD="${LD-ld} -m $emul"
+- fi
+- rm -rf conftest*
+- ;;
+-
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+- # Find out what ABI is being produced by ac_compile, and set linker
+- # options accordingly. Note that the listed cases only cover the
+- # situations where additional linker options are needed (such as when
+- # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+- # vice versa); the common cases where no linker options are needed do
+- # not appear in the list.
++ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+@@ -1385,19 +1324,9 @@
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
+ x86_64-*linux*)
+- case `/usr/bin/file conftest.o` in
+- *x86-64*)
+- LD="${LD-ld} -m elf32_x86_64"
+- ;;
+- *)
+- LD="${LD-ld} -m elf_i386"
+- ;;
+- esac
+- ;;
+- powerpc64le-*linux*)
+- LD="${LD-ld} -m elf32lppclinux"
++ LD="${LD-ld} -m elf_i386"
+ ;;
+- powerpc64-*linux*)
++ ppc64-*linux*|powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+@@ -1416,10 +1345,7 @@
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+- powerpcle-*linux*)
+- LD="${LD-ld} -m elf64lppc"
+- ;;
+- powerpc-*linux*)
++ ppc*-*linux*|powerpc*-*linux*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*|s390*-*tpf*)
+@@ -1437,20 +1363,19 @@
+
+ *-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+- SAVE_CFLAGS=$CFLAGS
++ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+ [AC_LANG_PUSH(C)
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+ AC_LANG_POP])
+- if test yes != "$lt_cv_cc_needs_belf"; then
++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+- CFLAGS=$SAVE_CFLAGS
++ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+ *-*solaris*)
+- # Find out what ABI is being produced by ac_compile, and set linker
+- # options accordingly.
++ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+@@ -1458,7 +1383,7 @@
+ case $lt_cv_prog_gnu_ld in
+ yes*)
+ case $host in
+- i?86-*-solaris*|x86_64-*-solaris*)
++ i?86-*-solaris*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ sparc*-*-solaris*)
+@@ -1467,7 +1392,7 @@
+ esac
+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+- LD=${LD-ld}_sol2
++ LD="${LD-ld}_sol2"
+ fi
+ ;;
+ *)
+@@ -1483,7 +1408,7 @@
+ ;;
+ esac
+
+-need_locks=$enable_libtool_lock
++need_locks="$enable_libtool_lock"
+ ])# _LT_ENABLE_LOCK
+
+
+@@ -1502,11 +1427,11 @@
+ [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 0 -eq "$ac_status"; then
++ 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 0 -ne "$ac_status"; then
++ if test "$ac_status" -ne 0; then
+ lt_cv_ar_at_file=@
+ fi
+ fi
+@@ -1514,7 +1439,7 @@
+ ])
+ ])
+
+-if test no = "$lt_cv_ar_at_file"; then
++if test "x$lt_cv_ar_at_file" = xno; then
+ archiver_list_spec=
+ else
+ archiver_list_spec=$lt_cv_ar_at_file
+@@ -1545,7 +1470,7 @@
+
+ if test -n "$RANLIB"; then
+ case $host_os in
+- bitrig* | openbsd*)
++ openbsd*)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+ ;;
+ *)
+@@ -1581,7 +1506,7 @@
+ [$2=no
+ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+- lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment
++ lt_compiler_flag="$3"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+@@ -1608,7 +1533,7 @@
+ $RM conftest*
+ ])
+
+-if test yes = "[$]$2"; then
++if test x"[$]$2" = xyes; then
+ m4_if([$5], , :, [$5])
+ else
+ m4_if([$6], , :, [$6])
+@@ -1630,7 +1555,7 @@
+ m4_require([_LT_DECL_SED])dnl
+ AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+- save_LDFLAGS=$LDFLAGS
++ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $3"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+@@ -1649,10 +1574,10 @@
+ fi
+ fi
+ $RM -r conftest*
+- LDFLAGS=$save_LDFLAGS
++ LDFLAGS="$save_LDFLAGS"
+ ])
+
+-if test yes = "[$]$2"; then
++if test x"[$]$2" = xyes; then
+ m4_if([$4], , :, [$4])
+ else
+ m4_if([$5], , :, [$5])
+@@ -1673,7 +1598,7 @@
+ AC_MSG_CHECKING([the maximum length of command line arguments])
+ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+ i=0
+- teststring=ABCD
++ teststring="ABCD"
+
+ case $build_os in
+ msdosdjgpp*)
+@@ -1713,7 +1638,7 @@
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+- bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+@@ -1763,23 +1688,22 @@
+ ;;
+ *)
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+- if test -n "$lt_cv_sys_max_cmd_len" && \
+- test undefined != "$lt_cv_sys_max_cmd_len"; then
++ if test -n "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ # Make teststring a little bigger before we do anything with it.
+ # a 1K string should be a reasonable start.
+- for i in 1 2 3 4 5 6 7 8; do
++ for i in 1 2 3 4 5 6 7 8 ; do
+ teststring=$teststring$teststring
+ done
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+- while { test X`env echo "$teststring$teststring" 2>/dev/null` \
++ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+- test 17 != "$i" # 1/2 MB should be enough
++ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+@@ -1795,7 +1719,7 @@
+ ;;
+ esac
+ ])
+-if test -n "$lt_cv_sys_max_cmd_len"; then
++if test -n $lt_cv_sys_max_cmd_len ; then
+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+ else
+ AC_MSG_RESULT(none)
+@@ -1823,7 +1747,7 @@
+ # ----------------------------------------------------------------
+ m4_defun([_LT_TRY_DLOPEN_SELF],
+ [m4_require([_LT_HEADER_DLFCN])dnl
+-if test yes = "$cross_compiling"; then :
++if test "$cross_compiling" = yes; then :
+ [$4]
+ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+@@ -1870,9 +1794,9 @@
+ # endif
+ #endif
+
+-/* When -fvisibility=hidden is used, assume the code has been annotated
++/* 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))
++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+ int fnord () __attribute__((visibility("default")));
+ #endif
+
+@@ -1898,7 +1822,7 @@
+ return status;
+ }]
+ _LT_EOF
+- if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+@@ -1919,7 +1843,7 @@
+ # ------------------
+ AC_DEFUN([LT_SYS_DLOPEN_SELF],
+ [m4_require([_LT_HEADER_DLFCN])dnl
+-if test yes != "$enable_dlopen"; then
++if test "x$enable_dlopen" != xyes; then
+ enable_dlopen=unknown
+ enable_dlopen_self=unknown
+ enable_dlopen_self_static=unknown
+@@ -1929,52 +1853,44 @@
+
+ case $host_os in
+ beos*)
+- lt_cv_dlopen=load_add_on
++ lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ ;;
+
+ mingw* | pw32* | cegcc*)
+- lt_cv_dlopen=LoadLibrary
++ lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen_libs=
+ ;;
+
+ cygwin*)
+- lt_cv_dlopen=dlopen
++ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
+
+ darwin*)
+- # if libdl is installed we need to link against it
++ # if libdl is installed we need to link against it
+ AC_CHECK_LIB([dl], [dlopen],
+- [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+- lt_cv_dlopen=dyld
++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
++ lt_cv_dlopen="dyld"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ ])
+ ;;
+
+- tpf*)
+- # Don't try to run any link tests for TPF. We know it's impossible
+- # because TPF is a cross-compiler, and we know how we open DSOs.
+- lt_cv_dlopen=dlopen
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=no
+- ;;
+-
+ *)
+ AC_CHECK_FUNC([shl_load],
+- [lt_cv_dlopen=shl_load],
++ [lt_cv_dlopen="shl_load"],
+ [AC_CHECK_LIB([dld], [shl_load],
+- [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [AC_CHECK_FUNC([dlopen],
+- [lt_cv_dlopen=dlopen],
++ [lt_cv_dlopen="dlopen"],
+ [AC_CHECK_LIB([dl], [dlopen],
+- [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+ [AC_CHECK_LIB([svld], [dlopen],
+- [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [AC_CHECK_LIB([dld], [dld_link],
+- [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ ])
+ ])
+ ])
+@@ -1983,21 +1899,21 @@
+ ;;
+ esac
+
+- if test no = "$lt_cv_dlopen"; then
+- enable_dlopen=no
+- else
++ if test "x$lt_cv_dlopen" != xno; then
+ enable_dlopen=yes
++ else
++ enable_dlopen=no
+ fi
+
+ case $lt_cv_dlopen in
+ dlopen)
+- save_CPPFLAGS=$CPPFLAGS
+- test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++ save_CPPFLAGS="$CPPFLAGS"
++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+- save_LDFLAGS=$LDFLAGS
++ save_LDFLAGS="$LDFLAGS"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+- save_LIBS=$LIBS
++ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+
+ AC_CACHE_CHECK([whether a program can dlopen itself],
+@@ -2007,7 +1923,7 @@
+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+ ])
+
+- if test yes = "$lt_cv_dlopen_self"; then
++ if test "x$lt_cv_dlopen_self" = xyes; then
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+ lt_cv_dlopen_self_static, [dnl
+@@ -2017,9 +1933,9 @@
+ ])
+ fi
+
+- CPPFLAGS=$save_CPPFLAGS
+- LDFLAGS=$save_LDFLAGS
+- LIBS=$save_LIBS
++ CPPFLAGS="$save_CPPFLAGS"
++ LDFLAGS="$save_LDFLAGS"
++ LIBS="$save_LIBS"
+ ;;
+ esac
+
+@@ -2111,8 +2027,8 @@
+ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+ _LT_COMPILER_C_O([$1])
+
+-hard_links=nottested
+-if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
++hard_links="nottested"
++if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+ AC_MSG_CHECKING([if we can lock with hard links])
+ hard_links=yes
+@@ -2122,8 +2038,8 @@
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ AC_MSG_RESULT([$hard_links])
+- if test no = "$hard_links"; then
+- AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
++ if test "$hard_links" = no; then
++ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+ need_locks=warn
+ fi
+ else
+@@ -2150,8 +2066,8 @@
+ _LT_DECL([], [objdir], [0],
+ [The name of the directory that contains temporary libtool files])dnl
+ m4_pattern_allow([LT_OBJDIR])dnl
+-AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+- [Define to the sub-directory where libtool stores uninstalled libraries.])
++AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
++ [Define to the sub-directory in which libtool stores uninstalled libraries.])
+ ])# _LT_CHECK_OBJDIR
+
+
+@@ -2163,15 +2079,15 @@
+ _LT_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+ test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+- test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
++ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+ # We can hardcode non-existent directories.
+- if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
++ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+- ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+- test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
++ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+ # Linking always hardcodes the temporary library directory.
+ _LT_TAGVAR(hardcode_action, $1)=relink
+ else
+@@ -2185,12 +2101,12 @@
+ fi
+ AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+-if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+- test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
++if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
++ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+ # Fast installation is not supported
+ enable_fast_install=no
+-elif test yes = "$shlibpath_overrides_runpath" ||
+- test no = "$enable_shared"; then
++elif test "$shlibpath_overrides_runpath" = yes ||
++ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+ fi
+@@ -2214,7 +2130,7 @@
+ # FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+- if test -n "$STRIP"; then
++ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
+ AC_MSG_RESULT([yes])
+@@ -2232,47 +2148,6 @@
+ ])# _LT_CMD_STRIPLIB
+
+
+-# _LT_PREPARE_MUNGE_PATH_LIST
+-# ---------------------------
+-# Make sure func_munge_path_list() is defined correctly.
+-m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+-[[# func_munge_path_list VARIABLE PATH
+-# -----------------------------------
+-# VARIABLE is name of variable containing _space_ separated list of
+-# directories to be munged by the contents of PATH, which is string
+-# having a format:
+-# "DIR[:DIR]:"
+-# string "DIR[ DIR]" will be prepended to VARIABLE
+-# ":DIR[:DIR]"
+-# string "DIR[ DIR]" will be appended to VARIABLE
+-# "DIRP[:DIRP]::[DIRA:]DIRA"
+-# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+-# "DIRA[ DIRA]" will be appended to VARIABLE
+-# "DIR[:DIR]"
+-# VARIABLE will be replaced by "DIR[ DIR]"
+-func_munge_path_list ()
+-{
+- case x@S|@2 in
+- x)
+- ;;
+- *:)
+- eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+- ;;
+- x:*)
+- eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+- ;;
+- *::*)
+- eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+- eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+- ;;
+- *)
+- eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+- ;;
+- esac
+-}
+-]])# _LT_PREPARE_PATH_LIST
+-
+-
+ # _LT_SYS_DYNAMIC_LINKER([TAG])
+ # -----------------------------
+ # PORTME Fill in your ld.so characteristics
+@@ -2283,18 +2158,17 @@
+ m4_require([_LT_DECL_OBJDUMP])dnl
+ m4_require([_LT_DECL_SED])dnl
+ m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+-m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
+ AC_MSG_CHECKING([dynamic linker characteristics])
+ m4_if([$1],
+ [], [
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ case $host_os in
+- darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+- *) lt_awk_arg='/^libraries:/' ;;
++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+ case $host_os in
+- mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+- *) lt_sed_strip_eq='s|=/|/|g' ;;
++ mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
++ *) lt_sed_strip_eq="s,=/,/,g" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+ case $lt_search_path_spec in
+@@ -2310,35 +2184,28 @@
+ ;;
+ esac
+ # Ok, now we have the path, separated by spaces, we can step through it
+- # and add multilib dir if necessary...
++ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+- lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+- # ...but if some path component already ends with the multilib dir we assume
+- # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+- case "$lt_multi_os_dir; $lt_search_path_spec " in
+- "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+- lt_multi_os_dir=
+- ;;
+- esac
++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ for lt_sys_path in $lt_search_path_spec; do
+- if test -d "$lt_sys_path$lt_multi_os_dir"; then
+- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+- elif test -n "$lt_multi_os_dir"; then
++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++ else
+ test -d "$lt_sys_path" && \
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+-BEGIN {RS = " "; FS = "/|\n";} {
+- lt_foo = "";
+- lt_count = 0;
++BEGIN {RS=" "; FS="/|\n";} {
++ lt_foo="";
++ lt_count=0;
+ for (lt_i = NF; lt_i > 0; lt_i--) {
+ if ($lt_i != "" && $lt_i != ".") {
+ if ($lt_i == "..") {
+ lt_count++;
+ } else {
+ if (lt_count == 0) {
+- lt_foo = "/" $lt_i lt_foo;
++ lt_foo="/" $lt_i lt_foo;
+ } else {
+ lt_count--;
+ }
+@@ -2352,7 +2219,7 @@
+ # for these hosts.
+ case $host_os in
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+- $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
++ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+ esac
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+ else
+@@ -2361,7 +2228,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext_cmds=.so
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -2378,17 +2245,14 @@
+ # flags to be left without arguments
+ need_version=unknown
+
+-AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+-[User-defined run-time library search path.])
+-
+ case $host_os in
+ aix3*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+ # AIX 3 has no versioning support, so we append a major version to the name.
+- soname_spec='$libname$release$shared_ext$major'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+ aix[[4-9]]*)
+@@ -2396,91 +2260,41 @@
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 supports IA64
+- library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ else
+ # With GCC up to 2.95.x, collect2 would create an import file
+ # for dependence libraries. The import file would start with
+- # the line '#! .'. This would cause the generated library to
+- # depend on '.', always an invalid library. This was fixed in
++ # the line `#! .'. This would cause the generated library to
++ # depend on `.', always an invalid library. This was fixed in
+ # development snapshots of GCC prior to 3.0.
+ case $host_os in
+ aix4 | aix4.[[01]] | aix4.[[01]].*)
+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+ echo ' yes '
+- echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ :
+ else
+ can_build_shared=no
+ fi
+ ;;
+ esac
+- # Using Import Files as archive members, it is possible to support
+- # filename-based versioning of shared library archives on AIX. While
+- # this would work for both with and without runtime linking, it will
+- # prevent static linking of such archives. So we do filename-based
+- # shared library versioning with .so extension only, which is used
+- # when both runtime linking and shared linking is enabled.
+- # Unfortunately, runtime linking may impact performance, so we do
+- # not want this to be the default eventually. Also, we use the
+- # versioned .so libs for executables only if there is the -brtl
+- # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+- # To allow for filename-based versioning support, we need to create
+- # libNAME.so.V as an archive file, containing:
+- # *) an Import File, referring to the versioned filename of the
+- # archive as well as the shared archive member, telling the
+- # bitwidth (32 or 64) of that shared object, and providing the
+- # list of exported symbols of that shared object, eventually
+- # decorated with the 'weak' keyword
+- # *) the shared object with the F_LOADONLY flag set, to really avoid
+- # it being seen by the linker.
+- # At run time we better use the real file rather than another symlink,
+- # but for link time we create the symlink libNAME.so -> libNAME.so.V
+-
+- case $with_aix_soname,$aix_use_runtimelinking in
+- # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # soname into executable. Probably we can add versioning support to
+ # collect2, so additional links can be useful in future.
+- aix,yes) # traditional libtool
+- dynamic_linker='AIX unversionable lib.so'
++ if test "$aix_use_runtimelinking" = yes; then
+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+ # instead of lib<name>.a to let people know that these are not
+ # typical AIX shared libraries.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- ;;
+- aix,no) # traditional AIX only
+- dynamic_linker='AIX lib.a[(]lib.so.V[)]'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ else
+ # We preserve .a as extension for shared libraries through AIX4.2
+ # and later when we are not doing run time linking.
+- library_names_spec='$libname$release.a $libname.a'
+- soname_spec='$libname$release$shared_ext$major'
+- ;;
+- svr4,*) # full svr4 only
+- dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+- library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+- # We do not specify a path in Import Files, so LIBPATH fires.
+- shlibpath_overrides_runpath=yes
+- ;;
+- *,yes) # both, prefer svr4
+- dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+- library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+- # unpreferred sharedlib libNAME.a needs extra handling
+- postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+- postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+- # We do not specify a path in Import Files, so LIBPATH fires.
+- shlibpath_overrides_runpath=yes
+- ;;
+- *,no) # both, prefer aix
+- dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+- library_names_spec='$libname$release.a $libname.a'
+- soname_spec='$libname$release$shared_ext$major'
+- # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+- postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+- postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+- ;;
+- esac
++ library_names_spec='${libname}${release}.a $libname.a'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ fi
+ shlibpath_var=LIBPATH
+ fi
+ ;;
+@@ -2490,18 +2304,18 @@
+ powerpc)
+ # Since July 2007 AmigaOS4 officially supports .so libraries.
+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ ;;
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
+ ;;
+
+ beos*)
+- library_names_spec='$libname$shared_ext'
++ library_names_spec='${libname}${shared_ext}'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ ;;
+@@ -2509,8 +2323,8 @@
+ bsdi[[45]]*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+@@ -2522,7 +2336,7 @@
+
+ cygwin* | mingw* | pw32* | cegcc*)
+ version_type=windows
+- shrext_cmds=.dll
++ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+@@ -2531,8 +2345,8 @@
+ # gcc
+ library_names_spec='$libname.dll.a'
+ # 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'\''`~
++ 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~
+@@ -2548,17 +2362,17 @@
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+- soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ m4_if([$1], [],[
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+- soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
++ 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'
+@@ -2567,8 +2381,8 @@
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+- soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+- library_names_spec='$libname.dll.lib'
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++ library_names_spec='${libname}.dll.lib'
+
+ case $build_os in
+ mingw*)
+@@ -2595,7 +2409,7 @@
+ 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
++ 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'`
+@@ -2608,8 +2422,8 @@
+ 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'\''`~
++ 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'
+@@ -2622,7 +2436,7 @@
+
+ *)
+ # Assume MSVC wrapper
+- library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ dynamic_linker='Win32 ld.exe'
+ ;;
+ esac
+@@ -2635,8 +2449,8 @@
+ version_type=darwin
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+- soname_spec='$libname$release$major$shared_ext'
++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++ soname_spec='${libname}${release}${major}$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+@@ -2649,8 +2463,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+@@ -2668,13 +2482,12 @@
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+ freebsd-*)
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
+ ;;
+ esac
+@@ -2699,15 +2512,26 @@
+ esac
+ ;;
+
++gnu*)
++ version_type=linux # correct to gnu/linux during the next big refactor
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ haiku*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LIBRARY_PATH
+- shlibpath_overrides_runpath=no
++ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+@@ -2725,15 +2549,14 @@
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
+- if test 32 = "$HPUX_IA64_MODE"; then
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ if test "X$HPUX_IA64_MODE" = X32; then
+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+- sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+ else
+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+- sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+ fi
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
+ shrext_cmds='.sl'
+@@ -2741,8 +2564,8 @@
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+@@ -2751,8 +2574,8 @@
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+@@ -2765,8 +2588,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+@@ -2777,7 +2600,7 @@
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+ *)
+- if test yes = "$lt_cv_prog_gnu_ld"; then
++ if test "$lt_cv_prog_gnu_ld" = yes; then
+ version_type=linux # correct to gnu/linux during the next big refactor
+ else
+ version_type=irix
+@@ -2785,8 +2608,8 @@
+ esac
+ need_lib_prefix=no
+ need_version=no
+- soname_spec='$libname$release$shared_ext$major'
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ case $host_os in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+@@ -2805,8 +2628,8 @@
+ esac
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+ shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+- sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ hardcode_into_libs=yes
+ ;;
+
+@@ -2815,33 +2638,13 @@
+ dynamic_linker=no
+ ;;
+
+-linux*android*)
+- version_type=none # Android doesn't support versioned libraries.
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='$libname$release$shared_ext'
+- soname_spec='$libname$release$shared_ext'
+- finish_cmds=
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+-
+- # This implies no fast_install, which is unacceptable.
+- # Some rework will be needed to allow for fast_install
+- # before this can be enabled.
+- hardcode_into_libs=yes
+-
+- dynamic_linker='Android linker'
+- # Don't embed -rpath directories since the linker doesn't support them.
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- ;;
+-
+ # This must be glibc/ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+@@ -2866,15 +2669,14 @@
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # Ideally, we could use ldconfig to report *all* directores which are
+- # searched for libraries, however this is still not possible. Aside from not
+- # being certain /sbin/ldconfig is available, command
+- # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+- # even though it is searched at run-time. Try to do the best guess by
+- # appending ld.so.conf contents (and includes) to the search path.
++ # Add ABI-specific directories to the system library path.
++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
++
++ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -2891,12 +2693,12 @@
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -2906,7 +2708,7 @@
+
+ newsos6)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
+@@ -2915,68 +2717,58 @@
+ version_type=qnx
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='ldqnx.so'
+ ;;
+
+-openbsd* | bitrig*)
++openbsd*)
+ version_type=sunos
+- sys_lib_dlsearch_path_spec=/usr/lib
++ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+- need_version=no
+- else
+- need_version=yes
+- fi
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ case $host_os in
++ openbsd2.[[89]] | openbsd2.[[89]].*)
++ shlibpath_overrides_runpath=no
++ ;;
++ *)
++ shlibpath_overrides_runpath=yes
++ ;;
++ esac
++ else
++ shlibpath_overrides_runpath=yes
++ fi
+ ;;
+
+ os2*)
+ libname_spec='$name'
+- version_type=windows
+- shrext_cmds=.dll
+- need_version=no
++ shrext_cmds=".dll"
+ need_lib_prefix=no
+- # OS/2 can only load a DLL with a base name of 8 characters or less.
+- soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+- v=$($ECHO $release$versuffix | tr -d .-);
+- n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+- $ECHO $n$v`$shared_ext'
+- library_names_spec='${libname}_dll.$libext'
++ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+- shlibpath_var=BEGINLIBPATH
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+- 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~
+- chmod a+x \$dldir/$dlname~
+- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+- fi'
+- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+- dlpath=$dir/\$dldll~
+- $RM \$dlpath'
++ shlibpath_var=LIBPATH
+ ;;
+
+ osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+- soname_spec='$libname$release$shared_ext$major'
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+ rdos*)
+@@ -2987,8 +2779,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+@@ -2998,11 +2790,11 @@
+
+ sunos4*)
+ version_type=sunos
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+@@ -3010,8 +2802,8 @@
+
+ sysv4 | sysv4.3*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_vendor in
+ sni)
+@@ -3032,24 +2824,24 @@
+ ;;
+
+ sysv4*MP*)
+- if test -d /usr/nec; then
++ if test -d /usr/nec ;then
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+- soname_spec='$libname$shared_ext.$major'
++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+- version_type=sco
++ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+@@ -3067,7 +2859,7 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+@@ -3075,8 +2867,8 @@
+
+ uts4*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+@@ -3085,30 +2877,20 @@
+ ;;
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+-test no = "$dynamic_linker" && can_build_shared=no
++test "$dynamic_linker" = no && can_build_shared=no
+
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+
+-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+- sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ fi
+-
+-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+- sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+ fi
+
+-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+-
+-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+-
+-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+-
+ _LT_DECL([], [variables_saved_for_relink], [1],
+ [Variables whose values should be saved in libtool wrapper scripts and
+ restored at link time])
+@@ -3141,41 +2923,39 @@
+ [Whether we should hardcode library paths into libraries])
+ _LT_DECL([], [sys_lib_search_path_spec], [2],
+ [Compile-time system search path for libraries])
+-_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+- [Detected run-time system search path for libraries])
+-_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+- [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
++_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
++ [Run-time system search path for libraries])
+ ])# _LT_SYS_DYNAMIC_LINKER
+
+
+ # _LT_PATH_TOOL_PREFIX(TOOL)
+ # --------------------------
+-# find a file program that can recognize shared library
++# find a file program which can recognize shared library
+ AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+ [m4_require([_LT_DECL_EGREP])dnl
+ AC_MSG_CHECKING([for $1])
+ AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+ [case $MAGIC_CMD in
+ [[\\/*] | ?:[\\/]*])
+- lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ ;;
+ *)
+- lt_save_MAGIC_CMD=$MAGIC_CMD
+- lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++ lt_save_MAGIC_CMD="$MAGIC_CMD"
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ dnl $ac_dummy forces splitting on constant user-supplied paths.
+ dnl POSIX.2 word splitting is done only on the output of word expansions,
+ dnl not every word. This closes a longstanding sh security hole.
+ ac_dummy="m4_if([$2], , $PATH, [$2])"
+ for ac_dir in $ac_dummy; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+- if test -f "$ac_dir/$1"; then
+- lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
++ if test -f $ac_dir/$1; then
++ lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+- MAGIC_CMD=$lt_cv_path_MAGIC_CMD
++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ :
+@@ -3198,11 +2978,11 @@
+ break
+ fi
+ done
+- IFS=$lt_save_ifs
+- MAGIC_CMD=$lt_save_MAGIC_CMD
++ IFS="$lt_save_ifs"
++ MAGIC_CMD="$lt_save_MAGIC_CMD"
+ ;;
+ esac])
+-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+ AC_MSG_RESULT($MAGIC_CMD)
+ else
+@@ -3220,7 +3000,7 @@
+
+ # _LT_PATH_MAGIC
+ # --------------
+-# find a file program that can recognize a shared library
++# find a file program which can recognize a shared library
+ m4_defun([_LT_PATH_MAGIC],
+ [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+@@ -3247,16 +3027,16 @@
+ AC_ARG_WITH([gnu-ld],
+ [AS_HELP_STRING([--with-gnu-ld],
+ [assume the C compiler uses GNU ld @<:@default=no@:>@])],
+- [test no = "$withval" || with_gnu_ld=yes],
++ [test "$withval" = no || with_gnu_ld=yes],
+ [with_gnu_ld=no])dnl
+
+ ac_prog=ld
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ AC_MSG_CHECKING([for ld used by $CC])
+ case $host in
+ *-*-mingw*)
+- # gcc leaves a trailing carriage return, which upsets mingw
++ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+@@ -3270,7 +3050,7 @@
+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+ done
+- test -z "$LD" && LD=$ac_prog
++ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+@@ -3281,37 +3061,37 @@
+ with_gnu_ld=unknown
+ ;;
+ esac
+-elif test yes = "$with_gnu_ld"; then
++elif test "$with_gnu_ld" = yes; then
+ AC_MSG_CHECKING([for GNU ld])
+ else
+ AC_MSG_CHECKING([for non-GNU ld])
+ fi
+ AC_CACHE_VAL(lt_cv_path_LD,
+ [if test -z "$LD"; then
+- lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+- lt_cv_path_LD=$ac_dir/$ac_prog
++ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+- test no != "$with_gnu_ld" && break
++ test "$with_gnu_ld" != no && break
+ ;;
+ *)
+- test yes != "$with_gnu_ld" && break
++ test "$with_gnu_ld" != yes && break
+ ;;
+ esac
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ else
+- lt_cv_path_LD=$LD # Let the user override the test with a path.
++ lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ fi])
+-LD=$lt_cv_path_LD
++LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+ AC_MSG_RESULT($LD)
+ else
+@@ -3365,13 +3145,13 @@
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+- if test yes != "$GCC"; then
++ if test "$GCC" != yes; then
+ reload_cmds=false
+ fi
+ ;;
+ darwin*)
+- if test yes = "$GCC"; then
+- reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
++ if test "$GCC" = yes; then
++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ else
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ fi
+@@ -3382,43 +3162,6 @@
+ ])# _LT_CMD_RELOAD
+
+
+-# _LT_PATH_DD
+-# -----------
+-# find a working dd
+-m4_defun([_LT_PATH_DD],
+-[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+-[printf 0123456789abcdef0123456789abcdef >conftest.i
+-cat conftest.i conftest.i >conftest2.i
+-: ${lt_DD:=$DD}
+-AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+-[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+- cmp -s conftest.i conftest.out \
+- && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+-fi])
+-rm -f conftest.i conftest2.i conftest.out])
+-])# _LT_PATH_DD
+-
+-
+-# _LT_CMD_TRUNCATE
+-# ----------------
+-# find command to truncate a binary pipe
+-m4_defun([_LT_CMD_TRUNCATE],
+-[m4_require([_LT_PATH_DD])
+-AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+-[printf 0123456789abcdef0123456789abcdef >conftest.i
+-cat conftest.i conftest.i >conftest2.i
+-lt_cv_truncate_bin=
+-if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+- cmp -s conftest.i conftest.out \
+- && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+-fi
+-rm -f conftest.i conftest2.i conftest.out
+-test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+-_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+- [Command to truncate a binary pipe])
+-])# _LT_CMD_TRUNCATE
+-
+-
+ # _LT_CHECK_MAGIC_METHOD
+ # ----------------------
+ # how to check for library dependencies
+@@ -3434,13 +3177,13 @@
+ # Need to set the preceding variable on all platforms that support
+ # interlibrary dependencies.
+ # 'none' -- dependencies not supported.
+-# 'unknown' -- same as none, but documents that we really don't know.
++# `unknown' -- same as none, but documents that we really don't know.
+ # 'pass_all' -- all dependencies passed with no checks.
+ # 'test_compile' -- check by making test program.
+ # 'file_magic [[regex]]' -- check by looking for files in library path
+-# that responds to the $file_magic_cmd with a given extended regex.
+-# If you have 'file' or equivalent on your system and you're not sure
+-# whether 'pass_all' will *always* work, you probably want this one.
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+ aix[[4-9]]*)
+@@ -3467,7 +3210,8 @@
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+- if ( file / ) >/dev/null 2>&1; then
++ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
++ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+@@ -3503,6 +3247,10 @@
+ fi
+ ;;
+
++gnu*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
+ haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+@@ -3541,7 +3289,7 @@
+ ;;
+
+ # This must be glibc/ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -3563,8 +3311,8 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-openbsd* | bitrig*)
+- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++openbsd*)
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+@@ -3617,9 +3365,6 @@
+ tpf*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+-os2*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+ esac
+ ])
+
+@@ -3660,38 +3405,33 @@
+ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+ [if test -n "$NM"; then
+ # Let the user override the test.
+- lt_cv_path_NM=$NM
++ lt_cv_path_NM="$NM"
+ else
+- lt_nm_to_check=${ac_tool_prefix}nm
++ lt_nm_to_check="${ac_tool_prefix}nm"
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
+- lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+- tmp_nm=$ac_dir/$lt_tmp_nm
+- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
++ tmp_nm="$ac_dir/$lt_tmp_nm"
++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ # Check to see if the nm accepts a BSD-compat flag.
+- # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
++ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # nm: unknown option "B" ignored
+ # Tru64's nm complains that /dev/null is an invalid object file
+- # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+- case $build_os in
+- mingw*) lt_bad_file=conftest.nm/nofile ;;
+- *) lt_bad_file=/dev/null ;;
+- esac
+- case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+- *$lt_bad_file* | *'Invalid file or object type'*)
++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++ */dev/null* | *'Invalid file or object type'*)
+ lt_cv_path_NM="$tmp_nm -B"
+- break 2
++ break
+ ;;
+ *)
+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+ */dev/null*)
+ lt_cv_path_NM="$tmp_nm -p"
+- break 2
++ break
+ ;;
+ *)
+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+@@ -3702,21 +3442,21 @@
+ esac
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ done
+ : ${lt_cv_path_NM=no}
+ fi])
+-if test no != "$lt_cv_path_NM"; then
+- NM=$lt_cv_path_NM
++if test "$lt_cv_path_NM" != "no"; then
++ NM="$lt_cv_path_NM"
+ else
+ # Didn't find any BSD compatible name lister, look for dumpbin.
+ if test -n "$DUMPBIN"; then :
+ # Let the user override the test.
+ else
+ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+- case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
++ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ *COFF*)
+- DUMPBIN="$DUMPBIN -symbols -headers"
++ DUMPBIN="$DUMPBIN -symbols"
+ ;;
+ *)
+ DUMPBIN=:
+@@ -3724,8 +3464,8 @@
+ esac
+ fi
+ AC_SUBST([DUMPBIN])
+- if test : != "$DUMPBIN"; then
+- NM=$DUMPBIN
++ if test "$DUMPBIN" != ":"; then
++ NM="$DUMPBIN"
+ fi
+ fi
+ test -z "$NM" && NM=nm
+@@ -3771,8 +3511,8 @@
+
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+- # two different shell functions defined in ltmain.sh;
+- # decide which one to use based on capabilities of $DLLTOOL
++ # 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
+@@ -3784,7 +3524,7 @@
+ ;;
+ *)
+ # fallback: assume linklib IS sharedlib
+- lt_cv_sharedlib_from_linklib_cmd=$ECHO
++ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ ;;
+ esac
+ ])
+@@ -3811,28 +3551,13 @@
+ lt_cv_path_mainfest_tool=yes
+ fi
+ rm -f conftest*])
+-if test yes != "$lt_cv_path_mainfest_tool"; then
++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_DLL_DEF_P([FILE])
+-# ---------------------
+-# True iff FILE is a Windows DLL '.def' file.
+-# Keep in sync with func_dll_def_p in the libtool script
+-AC_DEFUN([_LT_DLL_DEF_P],
+-[dnl
+- test DEF = "`$SED -n dnl
+- -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace
+- -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments
+- -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl
+- -e q dnl Only consider the first "real" line
+- $1`" dnl
+-])# _LT_DLL_DEF_P
+-
+-
+ # LT_LIB_M
+ # --------
+ # check for math library
+@@ -3844,11 +3569,11 @@
+ # These system don't have libm, or don't need it
+ ;;
+ *-ncr-sysv4.3*)
+- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
++ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+ ;;
+ *)
+- AC_CHECK_LIB(m, cos, LIBM=-lm)
++ AC_CHECK_LIB(m, cos, LIBM="-lm")
+ ;;
+ esac
+ AC_SUBST([LIBM])
+@@ -3867,7 +3592,7 @@
+
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ case $cc_basename in
+ nvcc*)
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+@@ -3919,7 +3644,7 @@
+ symcode='[[ABCDGISTW]]'
+ ;;
+ hpux*)
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ symcode='[[ABCDEGRST]]'
+ fi
+ ;;
+@@ -3952,44 +3677,14 @@
+ symcode='[[ABCDGIRSTW]]' ;;
+ esac
+
+-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+- # Gets list of data symbols to import.
+- lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+- # Adjust the below global symbol transforms to fixup imported variables.
+- lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+- lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+- lt_c_name_lib_hook="\
+- -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+- -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+-else
+- # Disable hooks by default.
+- lt_cv_sys_global_symbol_to_import=
+- lt_cdecl_hook=
+- lt_c_name_hook=
+- lt_c_name_lib_hook=
+-fi
+-
+ # Transform an extracted symbol line into a proper C declaration.
+ # Some systems (esp. on ia64) link data and code symbols differently,
+ # so use this general approach.
+-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+-$lt_cdecl_hook\
+-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
++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"\
+-$lt_c_name_hook\
+-" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+-" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+-
+-# Transform an extracted symbol line into symbol name with lib prefix and
+-# symbol address.
+-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+-$lt_c_name_lib_hook\
+-" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+-" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+-" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/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=
+@@ -4007,24 +3702,21 @@
+
+ # Write the raw and C identifiers.
+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+- # Fake it for dumpbin and say T for any non-static function,
+- # D for any global variable and I for any imported variable.
++ # Fake it for dumpbin and say T for any non-static function
++ # and D for any global variable.
+ # Also find C++ and __fastcall symbols from MSVC++,
+ # which start with @ or ?.
+ lt_cv_sys_global_symbol_pipe="$AWK ['"\
+ " {last_section=section; section=\$ 3};"\
+ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+-" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+-" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+-" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+ " \$ 0!~/External *\|/{next};"\
+ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+ " {if(hide[section]) next};"\
+-" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+-" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+-" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+-" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
++" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
++" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
++" s[1]~/^[@?]/{print s[1], s[1]; next};"\
++" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+ " ' prfx=^$ac_symprfx]"
+ else
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+@@ -4064,11 +3756,11 @@
+ 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 can't be const, because runtime
++#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__
++#elif defined(__osf__)
+ /* This system does not cope well with relocations in const data. */
+ # define LT@&t@_DLSYM_CONST
+ #else
+@@ -4094,7 +3786,7 @@
+ {
+ { "@PROGRAM@", (void *) 0 },
+ _LT_EOF
+- $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ cat <<\_LT_EOF >> conftest.$ac_ext
+ {0, (void *) 0}
+ };
+@@ -4114,9 +3806,9 @@
+ mv conftest.$ac_objext conftstm.$ac_objext
+ lt_globsym_save_LIBS=$LIBS
+ lt_globsym_save_CFLAGS=$CFLAGS
+- LIBS=conftstm.$ac_objext
++ 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
++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+ pipe_works=yes
+ fi
+ LIBS=$lt_globsym_save_LIBS
+@@ -4137,7 +3829,7 @@
+ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+- if test yes = "$pipe_works"; then
++ if test "$pipe_works" = yes; then
+ break
+ else
+ lt_cv_sys_global_symbol_pipe=
+@@ -4164,16 +3856,12 @@
+ [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],
+ [Transform the output of nm in a proper C declaration])
+-_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+- [Transform the output of nm into a list of symbols to manually relocate])
+ _LT_DECL([global_symbol_to_c_name_address],
+ [lt_cv_sys_global_symbol_to_c_name_address], [1],
+ [Transform the output of nm in a C name address pair])
+ _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_interface], [lt_cv_nm_interface], [1],
+- [The name lister interface])
+ _LT_DECL([], [nm_file_list_spec], [1],
+ [Specify filename containing input files for $NM])
+ ]) # _LT_CMD_GLOBAL_SYMBOLS
+@@ -4189,18 +3877,17 @@
+
+ m4_if([$1], [CXX], [
+ # C++ specific cases for pic, static, wl, etc.
+- if test yes = "$GXX"; then
++ if test "$GXX" = yes; then
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+
+ amigaos*)
+@@ -4211,8 +3898,8 @@
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+- # adding the '-m68020' flag to GCC prevents building anything better,
+- # like '-m68040'.
++ # adding the `-m68020' flag to GCC prevents building anything better,
++ # like `-m68040'.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
+@@ -4228,11 +3915,6 @@
+ # (--disable-auto-import) libraries
+ m4_if([$1], [GCJ], [],
+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+- case $host_os in
+- os2*)
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+- ;;
+- esac
+ ;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+@@ -4282,7 +3964,7 @@
+ case $host_os in
+ aix[[4-9]]*)
+ # All AIX code is PIC.
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ else
+@@ -4323,14 +4005,14 @@
+ case $cc_basename in
+ CC*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+- if test ia64 != "$host_cpu"; then
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++ if test "$host_cpu" != ia64; then
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ fi
+ ;;
+ aCC*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+@@ -4359,7 +4041,7 @@
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -4367,7 +4049,7 @@
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ ecpc* )
+- # old Intel C++ for x86_64, which still supported -KPIC.
++ # old Intel C++ for x86_64 which still supported -KPIC.
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+@@ -4512,18 +4194,17 @@
+ fi
+ ],
+ [
+- if test yes = "$GCC"; then
++ if test "$GCC" = yes; then
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+
+ amigaos*)
+@@ -4534,8 +4215,8 @@
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+- # adding the '-m68020' flag to GCC prevents building anything better,
+- # like '-m68040'.
++ # adding the `-m68020' flag to GCC prevents building anything better,
++ # like `-m68040'.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
+@@ -4552,11 +4233,6 @@
+ # (--disable-auto-import) libraries
+ m4_if([$1], [GCJ], [],
+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+- case $host_os in
+- os2*)
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+- ;;
+- esac
+ ;;
+
+ darwin* | rhapsody*)
+@@ -4627,7 +4303,7 @@
+ case $host_os in
+ aix*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ else
+@@ -4635,30 +4311,11 @@
+ fi
+ ;;
+
+- darwin* | rhapsody*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+- case $cc_basename in
+- 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'
+- ;;
+- esac
+- ;;
+-
+ mingw* | cygwin* | pw32* | os2* | 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'])
+- case $host_os in
+- os2*)
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+- ;;
+- esac
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -4674,7 +4331,7 @@
+ ;;
+ esac
+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+@@ -4683,9 +4340,9 @@
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+- # old Intel for x86_64, which still supported -KPIC.
++ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+@@ -4710,12 +4367,6 @@
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+- tcc*)
+- # Fabrice Bellard et al's Tiny C Compiler
+- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+- ;;
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+@@ -4813,7 +4464,7 @@
+ ;;
+
+ sysv4*MP*)
+- if test -d /usr/nec; then
++ if test -d /usr/nec ;then
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+@@ -4842,7 +4493,7 @@
+ fi
+ ])
+ case $host_os in
+- # For platforms that do not support PIC, -DPIC is meaningless:
++ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
+@@ -4908,21 +4559,17 @@
+ case $host_os in
+ aix[[4-9]]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+- # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+- # Without the "-l" option, or with the "-B" option, AIX nm treats
+- # weak defined symbols like other global defined symbols, whereas
+- # GNU nm marks them as "W".
+- # While the 'weak' keyword is ignored in the Export File, we need
+- # it in the Import File for the 'aix-soname' feature, so we have
+- # to replace the "-B" option with "-P" for AIX nm.
++ # -C means demangle to AIX nm, but means don't demangle with GNU nm
++ # Also, AIX nm treats weak defined symbols like other global defined
++ # symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+- _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+ ;;
+ pw32*)
+- _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
++ _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
+ cygwin* | mingw* | cegcc*)
+ case $cc_basename in
+@@ -4968,9 +4615,9 @@
+ # included in the symbol list
+ _LT_TAGVAR(include_expsyms, $1)=
+ # exclude_expsyms can be an extended regexp of symbols to exclude
+- # it will be wrapped by ' (' and ')$', so one must not match beginning or
+- # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+- # as well as any symbol that contains 'd'.
++ # it will be wrapped by ` (' and `)$', so one must not match beginning or
++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++ # as well as any symbol that contains `d'.
+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+@@ -4986,7 +4633,7 @@
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+- if test yes != "$GCC"; then
++ if test "$GCC" != yes; then
+ with_gnu_ld=no
+ fi
+ ;;
+@@ -4994,7 +4641,7 @@
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
+- openbsd* | bitrig*)
++ openbsd*)
+ with_gnu_ld=no
+ ;;
+ esac
+@@ -5004,7 +4651,7 @@
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+@@ -5026,24 +4673,24 @@
+ esac
+ fi
+
+- if test yes = "$lt_use_gnu_ld_interface"; then
++ if test "$lt_use_gnu_ld_interface" = yes; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+- wlarc='$wl'
++ wlarc='${wl}'
+
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+- _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ supports_anon_versioning=no
+- case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
++ case `$LD -v 2>&1` in
+ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+@@ -5056,7 +4703,7 @@
+ case $host_os in
+ aix[[3-9]]*)
+ # On AIX/PPC, the GNU linker is very broken
+- if test ia64 != "$host_cpu"; then
++ if test "$host_cpu" != ia64; then
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
+
+@@ -5075,7 +4722,7 @@
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)=''
+ ;;
+ m68k)
+@@ -5091,7 +4738,7 @@
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -5101,7 +4748,7 @@
+ # _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(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
+@@ -5109,89 +4756,61 @@
+ _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'
+- # If the export-symbols file already is a .def file, use it as
+- # is; otherwise, prepend EXPORTS...
+- _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); 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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ _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'
++ # 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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ haiku*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- os2*)
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_TAGVAR(hardcode_minus_L, $1)=yes
+- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+- shrext_cmds=.dll
+- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- prefix_cmds="$SED"~
+- if test EXPORTS = "`$SED 1q $export_symbols`"; then
+- prefix_cmds="$prefix_cmds -e 1d";
+- fi~
+- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- ;;
+-
+ interix[[3-9]]*)
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+- if test linux-dietlibc = "$host_os"; then
++ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
+ esac
+ fi
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+- && test no = "$tmp_diet"
++ && test "$tmp_diet" = no
+ then
+ tmp_addflag=' $pic_flag'
+ tmp_sharedflag='-shared'
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+ pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group f77 and f90 compilers
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+@@ -5202,47 +4821,42 @@
+ lf95*) # Lahey Fortran 8.1
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ tmp_sharedflag='--shared' ;;
+- nagfor*) # NAGFOR 5.3
+- tmp_sharedflag='-Wl,-shared' ;;
+ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
+ nvcc*) # Cuda Compiler Driver 2.2
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
+ ;;
+ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ esac
+- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+- if test yes = "$supports_anon_versioning"; then
++ 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~
+- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+
+ case $cc_basename in
+- tcc*)
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+- ;;
+ xlf* | bgf* | bgxlf* | mpixlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+- if test yes = "$supports_anon_versioning"; then
++ 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 $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ echo "local: *; };" >> $output_objdir/$libname.ver~
++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
+@@ -5256,8 +4870,8 @@
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+ else
+- _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'
++ _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
+ ;;
+
+@@ -5275,8 +4889,8 @@
+
+ _LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- _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'
++ _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
+@@ -5288,7 +4902,7 @@
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
+
+-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+ *** reliably create shared libraries on SCO systems. Therefore, libtool
+ *** is disabling shared libraries support. We urge you to upgrade GNU
+ *** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+@@ -5303,9 +4917,9 @@
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+- _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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _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'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -5322,15 +4936,15 @@
+
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- _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'
++ _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
+ ;;
+ esac
+
+- if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
++ if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+ runpath_var=
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+@@ -5346,7 +4960,7 @@
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+- if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ _LT_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -5354,57 +4968,34 @@
+ ;;
+
+ aix[[4-9]]*)
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+- no_entry_flag=
++ no_entry_flag=""
+ else
+ # If we're using GNU nm, then we don't want the "-C" option.
+- # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+- # Without the "-l" option, or with the "-B" option, AIX nm treats
+- # weak defined symbols like other global defined symbols, whereas
+- # GNU nm marks them as "W".
+- # While the 'weak' keyword is ignored in the Export File, we need
+- # it in the Import File for the 'aix-soname' feature, so we have
+- # to replace the "-B" option with "-P" for AIX nm.
++ # -C means demangle to AIX nm, but means don't demangle with GNU nm
++ # Also, AIX nm treats weak defined symbols like other global
++ # defined symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+- _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+- # have runtime linking enabled, and use it for executables.
+- # For shared libraries, we enable/disable runtime linking
+- # depending on the kind of the shared library created -
+- # when "with_aix_soname,aix_use_runtimelinking" is:
+- # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+- # "aix,yes" lib.so shared, rtl:yes, for executables
+- # lib.a static archive
+- # "both,no" lib.so.V(shr.o) shared, rtl:yes
+- # lib.a(lib.so.V) shared, rtl:no, for executables
+- # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+- # lib.a(lib.so.V) shared, rtl:no
+- # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+- # lib.a static archive
++ # need to do runtime linking.
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+- if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
+ done
+- if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+- # With aix-soname=svr4, we create the lib.so.V shared archives only,
+- # so we don't have lib.a shared libs to link our executables.
+- # We have to force runtime linking in this case.
+- aix_use_runtimelinking=yes
+- LDFLAGS="$LDFLAGS -Wl,-brtl"
+- fi
+ ;;
+ esac
+
+@@ -5423,21 +5014,13 @@
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+- _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+- case $with_aix_soname,$aix_use_runtimelinking in
+- aix,*) ;; # traditional, no import file
+- svr4,* | *,yes) # use import file
+- # The Import File defines what to hardcode.
+- _LT_TAGVAR(hardcode_direct, $1)=no
+- _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+- ;;
+- esac
++ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+- if test yes = "$GCC"; then
++ if test "$GCC" = yes; then
+ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+- collect2name=`$CC -print-prog-name=collect2`
++ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+ then
+@@ -5456,80 +5039,61 @@
+ ;;
+ esac
+ shared_flag='-shared'
+- if test yes = "$aix_use_runtimelinking"; then
+- shared_flag="$shared_flag "'$wl-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
+ fi
+- # Need to ensure runtime linking is disabled for the traditional
+- # shared library, or the linker may eventually find shared libraries
+- # /with/ Import File - we do not want to mix them.
+- shared_flag_aix='-shared'
+- shared_flag_svr4='-shared $wl-G'
+ else
+ # not using gcc
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+- if test yes = "$aix_use_runtimelinking"; then
+- shared_flag='$wl-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag='${wl}-G'
+ else
+- shared_flag='$wl-bM:SRE'
++ shared_flag='${wl}-bM:SRE'
+ fi
+- shared_flag_aix='$wl-bM:SRE'
+- shared_flag_svr4='$wl-G'
+ fi
+ fi
+
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+- if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
++ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ _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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
++ _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
+- if test ia64 = "$host_cpu"; then
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
++ if test "$host_cpu" = ia64; then
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ _LT_SYS_MODULE_PATH_AIX([$1])
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
++ _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.
+- _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+- _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+- if test yes = "$with_gnu_ld"; then
++ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+- # -brtl affects multiple linker settings, -berok does not and is overridden later
+- compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+- if test svr4 != "$with_aix_soname"; then
+- # This is similar to how AIX traditionally builds its shared libraries.
+- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+- fi
+- if test aix != "$with_aix_soname"; then
+- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+- else
+- # used by -dlpreopen to get the symbols
+- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+- fi
+- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
++ # This is similar to how AIX traditionally builds its shared libraries.
++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+@@ -5538,7 +5102,7 @@
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)=''
+ ;;
+ m68k)
+@@ -5568,17 +5132,16 @@
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=.dll
++ 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,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+- _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+- cp "$export_symbols" "$output_objdir/$soname.def";
+- echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+- else
+- $SED -e '\''s/^/-link -EXPORT:/'\'' < $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='
++ _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
+@@ -5587,18 +5150,18 @@
+ # 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'
++ 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
+@@ -5607,7 +5170,7 @@
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=.dll
++ 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.
+@@ -5657,33 +5220,33 @@
+ ;;
+
+ hpux9*)
+- if test yes = "$GCC"; then
+- _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 "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
++ if test "$GCC" = yes; then
++ _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 "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
++ _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
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+
+ hpux10*)
+- if test yes,no = "$GCC,$with_gnu_ld"; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++ _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
+- if test no = "$with_gnu_ld"; then
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
++ if test "$with_gnu_ld" = no; then
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+@@ -5691,25 +5254,25 @@
+ ;;
+
+ hpux11*)
+- if test yes,no = "$GCC,$with_gnu_ld"; then
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _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 $pic_flag $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 $pic_flag $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
+ case $host_cpu in
+ hppa*64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ m4_if($1, [], [
+@@ -5717,14 +5280,14 @@
+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+ _LT_LINKER_OPTION([if $CC understands -b],
+ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+- [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
++ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+- [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
++ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+ ;;
+ esac
+ fi
+- if test no = "$with_gnu_ld"; then
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
++ if test "$with_gnu_ld" = no; then
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+@@ -5735,7 +5298,7 @@
+ *)
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+@@ -5746,16 +5309,16 @@
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+- if test yes = "$GCC"; then
+- _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'
++ if test "$GCC" = yes; then
++ _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.
+ # 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"
++ [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; }]],
+@@ -5768,31 +5331,21 @@
+ end]])])],
+ [lt_cv_irix_exported_symbol=yes],
+ [lt_cv_irix_exported_symbol=no])
+- LDFLAGS=$save_LDFLAGS])
+- if test yes = "$lt_cv_irix_exported_symbol"; 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'
++ 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'
++ _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'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- linux*)
+- case $cc_basename in
+- tcc*)
+- # Fabrice Bellard et al's Tiny C Compiler
+- _LT_TAGVAR(ld_shlibs, $1)=yes
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- ;;
+- esac
+- ;;
+-
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+@@ -5807,7 +5360,7 @@
+ newsos6)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+@@ -5815,19 +5368,27 @@
+ *nto* | *qnx*)
+ ;;
+
+- openbsd* | bitrig*)
++ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ else
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
++ case $host_os in
++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ ;;
++ *)
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ ;;
++ esac
+ fi
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+@@ -5838,53 +5399,33 @@
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+- shrext_cmds=.dll
+- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- prefix_cmds="$SED"~
+- if test EXPORTS = "`$SED 1q $export_symbols`"; then
+- prefix_cmds="$prefix_cmds -e 1d";
+- fi~
+- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+- if test yes = "$GCC"; 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-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
++ 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}-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(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $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_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+- if test yes = "$GCC"; then
+- _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+- _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'
++ 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} $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 \*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -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)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -5895,24 +5436,24 @@
+
+ solaris*)
+ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+- if test yes = "$GCC"; then
+- wlarc='$wl'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ wlarc='${wl}'
++ _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 $pic_flag $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"*)
+ wlarc=''
+- _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ ;;
+ *)
+- wlarc='$wl'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
++ wlarc='${wl}'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $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 -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ ;;
+ esac
+ fi
+@@ -5922,11 +5463,11 @@
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+- # but understands '-z linker_flag'. GCC discards it without '$wl',
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- if test yes = "$GCC"; then
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
++ if test "$GCC" = yes; then
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ fi
+@@ -5936,10 +5477,10 @@
+ ;;
+
+ sunos4*)
+- if test sequent = "$host_vendor"; then
++ if test "x$host_vendor" = xsequent; then
+ # Use $CC to link under sequent, because it throws in some extra .o
+ # files that make .init and .fini sections work.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+@@ -5988,43 +5529,43 @@
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+- _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
+
+- if test yes = "$GCC"; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+- # Note: We CANNOT use -z defs as we might desire, because we do not
++ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+- _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+- _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+- if test yes = "$GCC"; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+@@ -6039,17 +5580,17 @@
+ ;;
+ esac
+
+- if test sni = "$host_vendor"; then
++ if test x$host_vendor = xsni; then
+ case $host in
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+ ;;
+ esac
+ fi
+ fi
+ ])
+ AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+-test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
++test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+ _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+@@ -6066,7 +5607,7 @@
+ # Assume -lc should be added
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+- if test yes,yes = "$GCC,$enable_shared"; then
++ if test "$enable_shared" = yes && test "$GCC" = yes; then
+ case $_LT_TAGVAR(archive_cmds, $1) in
+ *'~'*)
+ # FIXME: we may have to deal with multi-command sequences.
+@@ -6146,12 +5687,12 @@
+ _LT_TAGDECL([], [hardcode_libdir_separator], [1],
+ [Whether we need a single "-rpath" flag with a separated argument])
+ _LT_TAGDECL([], [hardcode_direct], [0],
+- [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
++ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ DIR into the resulting binary])
+ _LT_TAGDECL([], [hardcode_direct_absolute], [0],
+- [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
++ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ DIR into the resulting binary and the resulting library dependency is
+- "absolute", i.e impossible to change by setting $shlibpath_var if the
++ "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+ library is relocated])
+ _LT_TAGDECL([], [hardcode_minus_L], [0],
+ [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+@@ -6192,10 +5733,10 @@
+ # ------------------------
+ # Ensure that the configuration variables for a C compiler are suitably
+ # defined. These variables are subsequently used by _LT_CONFIG to write
+-# the compiler configuration to 'libtool'.
++# the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_C_CONFIG],
+ [m4_require([_LT_DECL_EGREP])dnl
+-lt_save_CC=$CC
++lt_save_CC="$CC"
+ AC_LANG_PUSH(C)
+
+ # Source file extension for C test sources.
+@@ -6235,18 +5776,18 @@
+ LT_SYS_DLOPEN_SELF
+ _LT_CMD_STRIPLIB
+
+- # Report what library types will actually be built
++ # Report which library types will actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+
+ AC_MSG_CHECKING([whether to build shared libraries])
+- test no = "$can_build_shared" && enable_shared=no
++ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+- test yes = "$enable_shared" && enable_static=no
++ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+@@ -6254,12 +5795,8 @@
+ ;;
+
+ aix[[4-9]]*)
+- if test ia64 != "$host_cpu"; then
+- case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+- yes,aix,yes) ;; # shared object as lib.so file only
+- yes,svr4,*) ;; # shared object as lib.so archive member only
+- yes,*) enable_static=no ;; # shared object in lib.a archive as well
+- esac
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+ esac
+@@ -6267,13 +5804,13 @@
+
+ AC_MSG_CHECKING([whether to build static libraries])
+ # Make sure either enable_shared or enable_static is yes.
+- test yes = "$enable_shared" || enable_static=yes
++ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+
+ _LT_CONFIG($1)
+ fi
+ AC_LANG_POP
+-CC=$lt_save_CC
++CC="$lt_save_CC"
+ ])# _LT_LANG_C_CONFIG
+
+
+@@ -6281,14 +5818,14 @@
+ # --------------------------
+ # Ensure that the configuration variables for a C++ compiler are suitably
+ # defined. These variables are subsequently used by _LT_CONFIG to write
+-# the compiler configuration to 'libtool'.
++# the compiler configuration to `libtool'.
+ 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 no != "$CXX" &&
+- ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+- (test g++ != "$CXX"))); then
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
+ AC_PROG_CXXCPP
+ else
+ _lt_caught_CXX_error=yes
+@@ -6330,7 +5867,7 @@
+ # the CXX compiler isn't working. Some variables (like enable_shared)
+ # are currently assumed to apply to all compilers on this platform,
+ # and will be corrupted by setting them based on a non-working compiler.
+-if test yes != "$_lt_caught_CXX_error"; then
++if test "$_lt_caught_CXX_error" != yes; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="int some_variable = 0;"
+
+@@ -6372,35 +5909,35 @@
+ if test -n "$compiler"; then
+ # We don't want -fno-exception when compiling C++ code, so set the
+ # no_builtin_flag separately
+- if test yes = "$GXX"; then
++ if test "$GXX" = yes; then
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ else
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+ fi
+
+- if test yes = "$GXX"; then
++ if test "$GXX" = yes; then
+ # Set up default GNU C++ configuration
+
+ LT_PATH_LD
+
+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
+ # archiving commands below assume that GNU ld is being used.
+- if test yes = "$with_gnu_ld"; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ if test "$with_gnu_ld" = yes; then
++ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+ # investigate it a little bit more. (MM)
+- wlarc='$wl'
++ wlarc='${wl}'
+
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+ $GREP 'no-whole-archive' > /dev/null; then
+- _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+@@ -6436,30 +5973,18 @@
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ aix[[4-9]]*)
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+- no_entry_flag=
++ no_entry_flag=""
+ else
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+- # have runtime linking enabled, and use it for executables.
+- # For shared libraries, we enable/disable runtime linking
+- # depending on the kind of the shared library created -
+- # when "with_aix_soname,aix_use_runtimelinking" is:
+- # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+- # "aix,yes" lib.so shared, rtl:yes, for executables
+- # lib.a static archive
+- # "both,no" lib.so.V(shr.o) shared, rtl:yes
+- # lib.a(lib.so.V) shared, rtl:no, for executables
+- # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+- # lib.a(lib.so.V) shared, rtl:no
+- # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+- # lib.a static archive
++ # need to do runtime linking.
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+@@ -6469,13 +5994,6 @@
+ ;;
+ esac
+ done
+- if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+- # With aix-soname=svr4, we create the lib.so.V shared archives only,
+- # so we don't have lib.a shared libs to link our executables.
+- # We have to force runtime linking in this case.
+- aix_use_runtimelinking=yes
+- LDFLAGS="$LDFLAGS -Wl,-brtl"
+- fi
+ ;;
+ esac
+
+@@ -6494,21 +6012,13 @@
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+- _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+- case $with_aix_soname,$aix_use_runtimelinking in
+- aix,*) ;; # no import file
+- svr4,* | *,yes) # use import file
+- # The Import File defines what to hardcode.
+- _LT_TAGVAR(hardcode_direct, $1)=no
+- _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+- ;;
+- esac
++ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+- if test yes = "$GXX"; then
++ if test "$GXX" = yes; then
+ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+- collect2name=`$CC -print-prog-name=collect2`
++ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+ then
+@@ -6526,84 +6036,64 @@
+ fi
+ esac
+ shared_flag='-shared'
+- if test yes = "$aix_use_runtimelinking"; then
+- shared_flag=$shared_flag' $wl-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
+ fi
+- # Need to ensure runtime linking is disabled for the traditional
+- # shared library, or the linker may eventually find shared libraries
+- # /with/ Import File - we do not want to mix them.
+- shared_flag_aix='-shared'
+- shared_flag_svr4='-shared $wl-G'
+ else
+ # not using gcc
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+- if test yes = "$aix_use_runtimelinking"; then
+- shared_flag='$wl-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag='${wl}-G'
+ else
+- shared_flag='$wl-bM:SRE'
++ shared_flag='${wl}-bM:SRE'
+ fi
+- shared_flag_aix='$wl-bM:SRE'
+- shared_flag_svr4='$wl-G'
+ fi
+ fi
+
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to
+ # export.
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+- if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
++ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+- # The "-G" linker flag allows undefined symbols.
+- _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
++ _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an empty
+ # executable.
+ _LT_SYS_MODULE_PATH_AIX([$1])
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
++ _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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
++ _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
+- if test ia64 = "$host_cpu"; then
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
++ if test "$host_cpu" = ia64; then
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ _LT_SYS_MODULE_PATH_AIX([$1])
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
++ _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.
+- _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+- _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+- if test yes = "$with_gnu_ld"; then
++ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+- # -brtl affects multiple linker settings, -berok does not and is overridden later
+- compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+- if test svr4 != "$with_aix_soname"; then
+- # This is similar to how AIX traditionally builds its shared
+- # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+- fi
+- if test aix != "$with_aix_soname"; then
+- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+- else
+- # used by -dlpreopen to get the symbols
+- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+- fi
+- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
++ # This is similar to how AIX traditionally builds its shared
++ # libraries.
++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+@@ -6613,7 +6103,7 @@
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -6641,58 +6131,57 @@
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=.dll
++ 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,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+- _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+- cp "$export_symbols" "$output_objdir/$soname.def";
+- echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+- else
+- $SED -e '\''s/^/-link -EXPORT:/'\'' < $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='
++ _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'
++ 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(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, use it as
+- # is; otherwise, prepend EXPORTS...
+- _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); 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'
++ _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
+@@ -6703,34 +6192,6 @@
+ _LT_DARWIN_LINKER_FEATURES($1)
+ ;;
+
+- os2*)
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_TAGVAR(hardcode_minus_L, $1)=yes
+- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+- shrext_cmds=.dll
+- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- prefix_cmds="$SED"~
+- if test EXPORTS = "`$SED 1q $export_symbols`"; then
+- prefix_cmds="$prefix_cmds -e 1d";
+- fi~
+- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- ;;
+-
+ dgux*)
+ case $cc_basename in
+ ec++*)
+@@ -6765,15 +6226,18 @@
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ ;;
+
++ gnu*)
++ ;;
++
+ haiku*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+ hpux9*)
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+ # but as the default
+@@ -6785,7 +6249,7 @@
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ aCC*)
+- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${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'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+@@ -6794,11 +6258,11 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ ;;
+ *)
+- if test yes = "$GXX"; then
+- _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 "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
++ if test "$GXX" = yes; then
++ _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
+@@ -6808,15 +6272,15 @@
+ ;;
+
+ hpux10*|hpux11*)
+- if test no = "$with_gnu_ld"; then
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
++ if test $with_gnu_ld = no; then
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
+ *)
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+ esac
+ fi
+@@ -6842,13 +6306,13 @@
+ aCC*)
+ case $host_cpu in
+ hppa*64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -b $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 -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ # Commands to make compiler produce verbose output that lists
+@@ -6859,20 +6323,20 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ ;;
+ *)
+- if test yes = "$GXX"; then
+- if test no = "$with_gnu_ld"; then
++ if test "$GXX" = yes; then
++ if test $with_gnu_ld = no; then
+ case $host_cpu in
+ hppa*64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _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 $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 $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 $pic_flag $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
+@@ -6887,22 +6351,22 @@
+ interix[[3-9]]*)
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+ irix5* | irix6*)
+ case $cc_basename in
+ CC*)
+ # SGI C++
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+@@ -6911,22 +6375,22 @@
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+ ;;
+ *)
+- if test yes = "$GXX"; then
+- if test no = "$with_gnu_ld"; then
+- _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'
++ if test "$GXX" = yes; then
++ if test "$with_gnu_ld" = no; then
++ _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 $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'
++ _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
+ ;;
+ esac
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
+
+- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -6934,8 +6398,8 @@
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
++ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+@@ -6944,10 +6408,10 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+ # Archives containing C++ object files must be created using
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+@@ -6961,59 +6425,59 @@
+ # earlier do not add the objects themselves.
+ case `$CC -V 2>&1` in
+ *"Version 7."*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ *) # Version 8.0 or newer
+ tmp_idyn=
+ case $host_cpu in
+ ia64*) tmp_idyn=' -i_dynamic';;
+ esac
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ esac
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ case `$CC -V` in
+ *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+ _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 | sort | $NL2SP`"'
++ rm -rf $tpldir~
++ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
++ 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 | sort | $NL2SP`~
+- $RANLIB $oldlib'
++ rm -rf $tpldir~
++ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
++ $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 | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
++ 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 | 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 | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ 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 | 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'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+ esac
+
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ ;;
+ cxx*)
+ # Compaq C++
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+ runpath_var=LD_RUN_PATH
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -7027,18 +6491,18 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+ ;;
+ xl* | mpixl* | bgxl*)
+ # IBM XL 8.0 on PPC, with GNU ld
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- if test yes = "$supports_anon_versioning"; then
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$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~
+- $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ *)
+@@ -7046,10 +6510,10 @@
+ *Sun\ C*)
+ # Sun C++ 5.9
+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+ # Not sure whether something based on
+@@ -7107,17 +6571,22 @@
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ ;;
+
+- openbsd* | bitrig*)
++ openbsd2*)
++ # C++ shared libraries are fairly broken
++ _LT_TAGVAR(ld_shlibs, $1)=no
++ ;;
++
++ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+- _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+ output_verbose_link_cmd=func_echo_all
+ else
+@@ -7133,9 +6602,9 @@
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ # Archives containing C++ object files must be created using
+@@ -7153,17 +6622,17 @@
+ cxx*)
+ case $host in
+ osf3*)
+- _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ ;;
+ *)
+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -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)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+- echo "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+- $RM $lib.exp'
++ echo "-hidden">> $lib.exp~
++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
++ $RM $lib.exp'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ ;;
+ esac
+@@ -7178,21 +6647,21 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ ;;
+ *)
+- if test yes,no = "$GXX,$with_gnu_ld"; then
+- _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ case $host in
+ osf3*)
+- _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}-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'
++ _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
+
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ # Commands to make compiler produce verbose output that lists
+@@ -7238,9 +6707,9 @@
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $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 -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -7248,7 +6717,7 @@
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+- # but understands '-z linker_flag'.
++ # but understands `-z linker_flag'.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ ;;
+@@ -7265,30 +6734,30 @@
+ ;;
+ gcx*)
+ # Green Hills C++ Compiler
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+ # The C++ compiler must be used to create the archive.
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+ ;;
+ *)
+ # GNU C++ compiler with Solaris linker
+- if test yes,no = "$GXX,$with_gnu_ld"; then
+- _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
++ 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 $pic_flag -nostdlib $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 $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -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
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ else
+- # g++ 2.7 appears to require '-G' NOT '-shared' on this
++ # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # platform.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G -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 -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++ $CC -G -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
+@@ -7296,11 +6765,11 @@
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ fi
+
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
+ fi
+@@ -7309,52 +6778,52 @@
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+- _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+- # Note: We CANNOT use -z defs as we might desire, because we do not
++ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+- _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+- _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+- '"$_LT_TAGVAR(old_archive_cmds, $1)"
++ '"$_LT_TAGVAR(old_archive_cmds, $1)"
+ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+- '"$_LT_TAGVAR(reload_cmds, $1)"
++ '"$_LT_TAGVAR(reload_cmds, $1)"
+ ;;
+ *)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+@@ -7385,10 +6854,10 @@
+ esac
+
+ AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+- test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
++ test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+- _LT_TAGVAR(GCC, $1)=$GXX
+- _LT_TAGVAR(LD, $1)=$LD
++ _LT_TAGVAR(GCC, $1)="$GXX"
++ _LT_TAGVAR(LD, $1)="$LD"
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -7415,7 +6884,7 @@
+ lt_cv_path_LD=$lt_save_path_LD
+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+-fi # test yes != "$_lt_caught_CXX_error"
++fi # test "$_lt_caught_CXX_error" != yes
+
+ AC_LANG_POP
+ ])# _LT_LANG_CXX_CONFIG
+@@ -7437,14 +6906,13 @@
+ AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+ func_stripname_cnf ()
+ {
+- case @S|@2 in
+- .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+- *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
++ 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
+@@ -7528,13 +6996,13 @@
+ pre_test_object_deps_done=no
+
+ for p in `eval "$output_verbose_link_cmd"`; do
+- case $prev$p in
++ case ${prev}${p} in
+
+ -L* | -R* | -l*)
+ # Some compilers place space between "-{L,R}" and the path.
+ # Remove the space.
+- if test x-L = "$p" ||
+- test x-R = "$p"; then
++ if test $p = "-L" ||
++ test $p = "-R"; then
+ prev=$p
+ continue
+ fi
+@@ -7550,16 +7018,16 @@
+ case $p in
+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+ esac
+- if test no = "$pre_test_object_deps_done"; then
+- case $prev in
++ if test "$pre_test_object_deps_done" = no; then
++ 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.
+ if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+- _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
++ _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+ else
+- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
++ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+ fi
+ ;;
+ # The "-l" case would never come before the object being
+@@ -7567,9 +7035,9 @@
+ esac
+ else
+ if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+- _LT_TAGVAR(postdeps, $1)=$prev$p
++ _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+ else
+- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
++ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+ fi
+ fi
+ prev=
+@@ -7584,15 +7052,15 @@
+ continue
+ fi
+
+- if test no = "$pre_test_object_deps_done"; then
++ if test "$pre_test_object_deps_done" = no; then
+ if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+- _LT_TAGVAR(predep_objects, $1)=$p
++ _LT_TAGVAR(predep_objects, $1)="$p"
+ else
+ _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+ fi
+ else
+ if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+- _LT_TAGVAR(postdep_objects, $1)=$p
++ _LT_TAGVAR(postdep_objects, $1)="$p"
+ else
+ _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+ fi
+@@ -7623,6 +7091,51 @@
+ _LT_TAGVAR(postdep_objects,$1)=
+ _LT_TAGVAR(postdeps,$1)=
+ ;;
++
++linux*)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
++
++solaris*)
++ case $cc_basename in
++ 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
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++
++ # Adding this requires a known-good setup of shared libraries for
++ # Sun compiler versions before 5.6, else PIC objects from an old
++ # archive will be linked into the output, leading to subtle bugs.
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
+ esac
+ ])
+
+@@ -7631,7 +7144,7 @@
+ esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+ if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
++ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ fi
+ _LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+ [The directories searched by this compiler when creating a shared library])
+@@ -7651,10 +7164,10 @@
+ # --------------------------
+ # Ensure that the configuration variables for a Fortran 77 compiler are
+ # suitably defined. These variables are subsequently used by _LT_CONFIG
+-# to write the compiler configuration to 'libtool'.
++# to write the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_F77_CONFIG],
+ [AC_LANG_PUSH(Fortran 77)
+-if test -z "$F77" || test no = "$F77"; then
++if test -z "$F77" || test "X$F77" = "Xno"; then
+ _lt_disable_F77=yes
+ fi
+
+@@ -7691,7 +7204,7 @@
+ # the F77 compiler isn't working. Some variables (like enable_shared)
+ # are currently assumed to apply to all compilers on this platform,
+ # and will be corrupted by setting them based on a non-working compiler.
+-if test yes != "$_lt_disable_F77"; then
++if test "$_lt_disable_F77" != yes; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="\
+ subroutine t
+@@ -7713,7 +7226,7 @@
+ _LT_LINKER_BOILERPLATE
+
+ # Allow CC to be a program name with arguments.
+- lt_save_CC=$CC
++ lt_save_CC="$CC"
+ lt_save_GCC=$GCC
+ lt_save_CFLAGS=$CFLAGS
+ CC=${F77-"f77"}
+@@ -7727,25 +7240,21 @@
+ AC_MSG_RESULT([$can_build_shared])
+
+ AC_MSG_CHECKING([whether to build shared libraries])
+- test no = "$can_build_shared" && enable_shared=no
++ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+- test yes = "$enable_shared" && enable_static=no
++ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+ aix[[4-9]]*)
+- if test ia64 != "$host_cpu"; then
+- case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+- yes,aix,yes) ;; # shared object as lib.so file only
+- yes,svr4,*) ;; # shared object as lib.so archive member only
+- yes,*) enable_static=no ;; # shared object in lib.a archive as well
+- esac
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+ esac
+@@ -7753,11 +7262,11 @@
+
+ AC_MSG_CHECKING([whether to build static libraries])
+ # Make sure either enable_shared or enable_static is yes.
+- test yes = "$enable_shared" || enable_static=yes
++ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+
+- _LT_TAGVAR(GCC, $1)=$G77
+- _LT_TAGVAR(LD, $1)=$LD
++ _LT_TAGVAR(GCC, $1)="$G77"
++ _LT_TAGVAR(LD, $1)="$LD"
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -7774,9 +7283,9 @@
+ fi # test -n "$compiler"
+
+ GCC=$lt_save_GCC
+- CC=$lt_save_CC
+- CFLAGS=$lt_save_CFLAGS
+-fi # test yes != "$_lt_disable_F77"
++ CC="$lt_save_CC"
++ CFLAGS="$lt_save_CFLAGS"
++fi # test "$_lt_disable_F77" != yes
+
+ AC_LANG_POP
+ ])# _LT_LANG_F77_CONFIG
+@@ -7786,11 +7295,11 @@
+ # -------------------------
+ # Ensure that the configuration variables for a Fortran compiler are
+ # suitably defined. These variables are subsequently used by _LT_CONFIG
+-# to write the compiler configuration to 'libtool'.
++# to write the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_FC_CONFIG],
+ [AC_LANG_PUSH(Fortran)
+
+-if test -z "$FC" || test no = "$FC"; then
++if test -z "$FC" || test "X$FC" = "Xno"; then
+ _lt_disable_FC=yes
+ fi
+
+@@ -7827,7 +7336,7 @@
+ # the FC compiler isn't working. Some variables (like enable_shared)
+ # are currently assumed to apply to all compilers on this platform,
+ # and will be corrupted by setting them based on a non-working compiler.
+-if test yes != "$_lt_disable_FC"; then
++if test "$_lt_disable_FC" != yes; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="\
+ subroutine t
+@@ -7849,7 +7358,7 @@
+ _LT_LINKER_BOILERPLATE
+
+ # Allow CC to be a program name with arguments.
+- lt_save_CC=$CC
++ lt_save_CC="$CC"
+ lt_save_GCC=$GCC
+ lt_save_CFLAGS=$CFLAGS
+ CC=${FC-"f95"}
+@@ -7865,25 +7374,21 @@
+ AC_MSG_RESULT([$can_build_shared])
+
+ AC_MSG_CHECKING([whether to build shared libraries])
+- test no = "$can_build_shared" && enable_shared=no
++ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+- test yes = "$enable_shared" && enable_static=no
++ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+ aix[[4-9]]*)
+- if test ia64 != "$host_cpu"; then
+- case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+- yes,aix,yes) ;; # shared object as lib.so file only
+- yes,svr4,*) ;; # shared object as lib.so archive member only
+- yes,*) enable_static=no ;; # shared object in lib.a archive as well
+- esac
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+ esac
+@@ -7891,11 +7396,11 @@
+
+ AC_MSG_CHECKING([whether to build static libraries])
+ # Make sure either enable_shared or enable_static is yes.
+- test yes = "$enable_shared" || enable_static=yes
++ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+
+- _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+- _LT_TAGVAR(LD, $1)=$LD
++ _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
++ _LT_TAGVAR(LD, $1)="$LD"
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -7915,7 +7420,7 @@
+ GCC=$lt_save_GCC
+ CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
+-fi # test yes != "$_lt_disable_FC"
++fi # test "$_lt_disable_FC" != yes
+
+ AC_LANG_POP
+ ])# _LT_LANG_FC_CONFIG
+@@ -7925,7 +7430,7 @@
+ # --------------------------
+ # Ensure that the configuration variables for the GNU Java Compiler compiler
+ # are suitably defined. These variables are subsequently used by _LT_CONFIG
+-# to write the compiler configuration to 'libtool'.
++# to write the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_GCJ_CONFIG],
+ [AC_REQUIRE([LT_PROG_GCJ])dnl
+ AC_LANG_SAVE
+@@ -7959,7 +7464,7 @@
+ CFLAGS=$GCJFLAGS
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+-_LT_TAGVAR(LD, $1)=$LD
++_LT_TAGVAR(LD, $1)="$LD"
+ _LT_CC_BASENAME([$compiler])
+
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+@@ -7996,7 +7501,7 @@
+ # --------------------------
+ # Ensure that the configuration variables for the GNU Go compiler
+ # are suitably defined. These variables are subsequently used by _LT_CONFIG
+-# to write the compiler configuration to 'libtool'.
++# to write the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_GO_CONFIG],
+ [AC_REQUIRE([LT_PROG_GO])dnl
+ AC_LANG_SAVE
+@@ -8030,7 +7535,7 @@
+ CFLAGS=$GOFLAGS
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+-_LT_TAGVAR(LD, $1)=$LD
++_LT_TAGVAR(LD, $1)="$LD"
+ _LT_CC_BASENAME([$compiler])
+
+ # Go did not exist at the time GCC didn't implicitly link libc in.
+@@ -8067,7 +7572,7 @@
+ # -------------------------
+ # Ensure that the configuration variables for the Windows resource compiler
+ # are suitably defined. These variables are subsequently used by _LT_CONFIG
+-# to write the compiler configuration to 'libtool'.
++# to write the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_RC_CONFIG],
+ [AC_REQUIRE([LT_PROG_RC])dnl
+ AC_LANG_SAVE
+@@ -8083,7 +7588,7 @@
+ lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code=$lt_simple_compile_test_code
++lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_TAG_COMPILER
+@@ -8093,7 +7598,7 @@
+ _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=
+@@ -8122,7 +7627,7 @@
+ [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+ [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+ [AC_CHECK_TOOL(GCJ, gcj,)
+- test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+ AC_SUBST(GCJFLAGS)])])[]dnl
+ ])
+
+@@ -8233,7 +7738,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+- test ! -f "$lt_ac_sed" && continue
++ test ! -f $lt_ac_sed && continue
+ cat /dev/null > conftest.in
+ lt_ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+@@ -8250,9 +7755,9 @@
+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+ cmp -s conftest.out conftest.nl || break
+ # 10000 chars as input seems more than enough
+- test 10 -lt "$lt_ac_count" && break
++ test $lt_ac_count -gt 10 && break
+ lt_ac_count=`expr $lt_ac_count + 1`
+- if test "$lt_ac_count" -gt "$lt_ac_max"; then
++ if test $lt_ac_count -gt $lt_ac_max; then
+ lt_ac_max=$lt_ac_count
+ lt_cv_path_SED=$lt_ac_sed
+ fi
+@@ -8276,7 +7781,27 @@
+ # Find out whether the shell is Bourne or XSI compatible,
+ # or has some other useful features.
+ m4_defun([_LT_CHECK_SHELL_FEATURES],
+-[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
++# Try some XSI features
++xsi_shell=no
++( _lt_dummy="a/b/c"
++ 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
++AC_MSG_RESULT([$xsi_shell])
++_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
++
++AC_MSG_CHECKING([whether the shell understands "+="])
++lt_shell_append=no
++( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
++ >/dev/null 2>&1 \
++ && lt_shell_append=yes
++AC_MSG_RESULT([$lt_shell_append])
++_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
++
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ lt_unset=unset
+ else
+ lt_unset=false
+@@ -8300,9 +7825,102 @@
+ ])# _LT_CHECK_SHELL_FEATURES
+
+
++# _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_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##*/}"])
++
++ _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}"}])
++
++ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
++ func_split_long_opt_name=${1%%=*}
++ func_split_long_opt_arg=${1#*=}])
++
++ _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"}])
++
++ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
++ case ${1} in
++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
++ *) func_lo2o_result=${1} ;;
++ esac])
++
++ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
++
++ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
++
++ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
++fi
++
++if test x"$lt_shell_append" = xyes; then
++ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
++
++ _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"])
++
++ # 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
++ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
++fi
++])
++
+ # _LT_PATH_CONVERSION_FUNCTIONS
+ # -----------------------------
+-# Determine what file name conversion functions should be used by
++# 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],
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/ltmain.sh psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/ltmain.sh
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/ltmain.sh 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/ltmain.sh 2020-07-16 10:48:35.377648742 +0200
+@@ -1,12 +1,9 @@
+-#! /bin/sh
+-## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+-## by inline-source v2014-01-03.01
+
+-# libtool (GNU libtool) 2.4.6
+-# Provide generalized library-building support services.
++# libtool (GNU libtool) 2.4.2
+ # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007, 2008, 2009, 2010, 2011 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.
+
+@@ -26,2112 +23,881 @@
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+-
+-PROGRAM=libtool
+-PACKAGE=libtool
+-VERSION=2.4.6
+-package_revision=2.4.6
+-
+-
+-## ------ ##
+-## Usage. ##
+-## ------ ##
+-
+-# Run './libtool --help' for help with using this script from the
+-# command line.
+-
+-
+-## ------------------------------- ##
+-## User overridable command paths. ##
+-## ------------------------------- ##
+-
+-# After configure completes, it has a better idea of some of the
+-# shell tools we need than the defaults used by the functions shared
+-# with bootstrap, so set those here where they can still be over-
+-# ridden by the user, but otherwise take precedence.
+-
+-: ${AUTOCONF="autoconf"}
+-: ${AUTOMAKE="automake"}
+-
+-
+-## -------------------------- ##
+-## Source external libraries. ##
+-## -------------------------- ##
+-
+-# Much of our low-level functionality needs to be sourced from external
+-# libraries, which are installed to $pkgauxdir.
+-
+-# Set a version string for this script.
+-scriptversion=2015-01-20.17; # UTC
+-
+-# General shell script boiler plate, and helper functions.
+-# Written by Gary V. Vaughan, 2004
++# along with GNU Libtool; see the file COPYING. If not, a copy
++# can be downloaded from http://www.gnu.org/licenses/gpl.html,
++# or obtained by writing to the Free Software Foundation, Inc.,
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+-# Copyright (C) 2004-2015 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.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 3 of the License, or
+-# (at your option) any later version.
+-
+-# As a special exception to the GNU General Public License, if you distribute
+-# this file as part of a program or library that is built using GNU Libtool,
+-# you may include this file under the same distribution terms that you use
+-# for the rest of that program.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+-# General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+-# Please report bugs or propose patches to gary@gnu.org.
+-
+-
+-## ------ ##
+-## Usage. ##
+-## ------ ##
+-
+-# Evaluate this file near the top of your script to gain access to
+-# the functions and variables defined here:
++# Usage: $progname [OPTION]... [MODE-ARG]...
+ #
+-# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
++# Provide generalized library-building support services.
+ #
+-# If you need to override any of the default environment variable
+-# settings, do that before evaluating this file.
+-
+-
+-## -------------------- ##
+-## Shell normalisation. ##
+-## -------------------- ##
++# --config show all configuration variables
++# --debug enable verbose shell tracing
++# -n, --dry-run display commands without modifying any files
++# --features display basic configuration information and exit
++# --mode=MODE use operation mode MODE
++# --preserve-dup-deps don't remove duplicate dependency libraries
++# --quiet, --silent don't print informational messages
++# --no-quiet, --no-silent
++# print informational messages (default)
++# --no-warn don't display warning messages
++# --tag=TAG use configuration variables from tag TAG
++# -v, --verbose print more informational messages than default
++# --no-verbose don't print the extra informational messages
++# --version print version information
++# -h, --help, --help-all print short, long, or detailed help message
++#
++# MODE must be one of the following:
++#
++# clean remove files from the build directory
++# compile compile a source file into a libtool object
++# execute automatically set library path, then run a program
++# finish complete the installation of libtool libraries
++# install install libraries or executables
++# link create a library or an executable
++# uninstall remove libraries from an installed directory
++#
++# MODE-ARGS vary depending on the MODE. When passed as first option,
++# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
++# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
++#
++# When reporting a bug, please describe a test case to reproduce it and
++# include the following information:
++#
++# host-triplet: $host
++# shell: $SHELL
++# compiler: $LTCC
++# compiler flags: $LTCFLAGS
++# linker: $LD (gnu? $with_gnu_ld)
++# $progname: (GNU libtool) 2.4.2
++# automake: $automake_version
++# autoconf: $autoconf_version
++#
++# Report bugs to <bug-libtool@gnu.org>.
++# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
++# General help using GNU software: <http://www.gnu.org/gethelp/>.
+
+-# Some shells need a little help to be as Bourne compatible as possible.
+-# Before doing anything else, make sure all that help has been provided!
++PROGRAM=libtool
++PACKAGE=libtool
++VERSION=2.4.2
++TIMESTAMP=""
++package_revision=1.3337
+
+-DUALCASE=1; export DUALCASE # for MKS sh
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+ else
+- case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
+-fi
+-
+-# NLS nuisances: We save the old values in case they are required later.
+-_G_user_locale=
+-_G_safe_locale=
+-for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+-do
+- eval "if test set = \"\${$_G_var+set}\"; then
+- save_$_G_var=\$$_G_var
+- $_G_var=C
+- export $_G_var
+- _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+- _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
+- fi"
+-done
+-
+-# CDPATH.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+-
+-# Make sure IFS has a sensible default
+-sp=' '
+-nl='
+-'
+-IFS="$sp $nl"
+-
+-# There are apparently some retarded systems that use ';' as a PATH separator!
+-if test "${PATH_SEPARATOR+set}" != set; then
+- PATH_SEPARATOR=:
+- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+- PATH_SEPARATOR=';'
+- }
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
+
+-
+-
+-## ------------------------- ##
+-## Locate command utilities. ##
+-## ------------------------- ##
+-
+-
+-# func_executable_p FILE
+-# ----------------------
+-# Check that FILE is an executable regular file.
+-func_executable_p ()
++# A function that is used when there is no print builtin or printf.
++func_fallback_echo ()
+ {
+- test -f "$1" && test -x "$1"
+-}
+-
+-
+-# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+-# --------------------------------------------
+-# Search for either a program that responds to --version with output
+-# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+-# trying all the directories in PATH with each of the elements of
+-# PROGS_LIST.
+-#
+-# CHECK_FUNC should accept the path to a candidate program, and
+-# set $func_check_prog_result if it truncates its output less than
+-# $_G_path_prog_max characters.
+-func_path_progs ()
+-{
+- _G_progs_list=$1
+- _G_check_func=$2
+- _G_PATH=${3-"$PATH"}
+-
+- _G_path_prog_max=0
+- _G_path_prog_found=false
+- _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+- for _G_dir in $_G_PATH; do
+- IFS=$_G_save_IFS
+- test -z "$_G_dir" && _G_dir=.
+- for _G_prog_name in $_G_progs_list; do
+- for _exeext in '' .EXE; do
+- _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+- func_executable_p "$_G_path_prog" || continue
+- case `"$_G_path_prog" --version 2>&1` in
+- *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+- *) $_G_check_func $_G_path_prog
+- func_path_progs_result=$func_check_prog_result
+- ;;
+- esac
+- $_G_path_prog_found && break 3
+- done
+- done
+- done
+- IFS=$_G_save_IFS
+- test -z "$func_path_progs_result" && {
+- echo "no acceptable sed could be found in \$PATH" >&2
+- exit 1
+- }
+-}
+-
+-
+-# We want to be able to use the functions in this file before configure
+-# has figured out where the best binaries are kept, which means we have
+-# to search for them ourselves - except when the results are already set
+-# where we skip the searches.
+-
+-# Unless the user overrides by setting SED, search the path for either GNU
+-# sed, or the sed that truncates its output the least.
+-test -z "$SED" && {
+- _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+- for _G_i in 1 2 3 4 5 6 7; do
+- _G_sed_script=$_G_sed_script$nl$_G_sed_script
+- done
+- echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+- _G_sed_script=
+-
+- func_check_prog_sed ()
+- {
+- _G_path_prog=$1
+-
+- _G_count=0
+- printf 0123456789 >conftest.in
+- while :
+- do
+- cat conftest.in conftest.in >conftest.tmp
+- mv conftest.tmp conftest.in
+- cp conftest.in conftest.nl
+- echo '' >> conftest.nl
+- "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+- diff conftest.out conftest.nl >/dev/null 2>&1 || break
+- _G_count=`expr $_G_count + 1`
+- if test "$_G_count" -gt "$_G_path_prog_max"; then
+- # Best one so far, save it but keep looking for a better one
+- func_check_prog_result=$_G_path_prog
+- _G_path_prog_max=$_G_count
+- fi
+- # 10*(2^10) chars as input seems more than enough
+- test 10 -lt "$_G_count" && break
+- done
+- rm -f conftest.in conftest.tmp conftest.nl conftest.out
+- }
+-
+- func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+- rm -f conftest.sed
+- SED=$func_path_progs_result
++ eval 'cat <<_LTECHO_EOF
++$1
++_LTECHO_EOF'
+ }
+
++# NLS nuisances: We save the old values to restore during execute mode.
++lt_user_locale=
++lt_safe_locale=
++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++do
++ eval "if test \"\${$lt_var+set}\" = set; then
++ save_$lt_var=\$$lt_var
++ $lt_var=C
++ export $lt_var
++ lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
++ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
++ fi"
++done
++LC_ALL=C
++LANGUAGE=C
++export LANGUAGE LC_ALL
+
+-# Unless the user overrides by setting GREP, search the path for either GNU
+-# grep, or the grep that truncates its output the least.
+-test -z "$GREP" && {
+- func_check_prog_grep ()
+- {
+- _G_path_prog=$1
+-
+- _G_count=0
+- _G_path_prog_max=0
+- printf 0123456789 >conftest.in
+- while :
+- do
+- cat conftest.in conftest.in >conftest.tmp
+- mv conftest.tmp conftest.in
+- cp conftest.in conftest.nl
+- echo 'GREP' >> conftest.nl
+- "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+- diff conftest.out conftest.nl >/dev/null 2>&1 || break
+- _G_count=`expr $_G_count + 1`
+- if test "$_G_count" -gt "$_G_path_prog_max"; then
+- # Best one so far, save it but keep looking for a better one
+- func_check_prog_result=$_G_path_prog
+- _G_path_prog_max=$_G_count
+- fi
+- # 10*(2^10) chars as input seems more than enough
+- test 10 -lt "$_G_count" && break
+- done
+- rm -f conftest.in conftest.tmp conftest.nl conftest.out
+- }
++$lt_unset CDPATH
+
+- func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+- GREP=$func_path_progs_result
+-}
+
++# 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
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
+
+-## ------------------------------- ##
+-## User overridable command paths. ##
+-## ------------------------------- ##
+
+-# All uppercase variable names are used for environment variables. These
+-# variables can be overridden by the user before calling a script that
+-# uses them if a suitable command of that name is not already available
+-# in the command search PATH.
+
+ : ${CP="cp -f"}
+-: ${ECHO="printf %s\n"}
+-: ${EGREP="$GREP -E"}
+-: ${FGREP="$GREP -F"}
+-: ${LN_S="ln -s"}
++test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+ : ${MAKE="make"}
+ : ${MKDIR="mkdir"}
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
+ : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
++: ${Xsed="$SED -e 1s/^X//"}
+
++# Global variables:
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
++EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
++EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
+
+-## -------------------- ##
+-## Useful sed snippets. ##
+-## -------------------- ##
++exit_status=$EXIT_SUCCESS
+
+-sed_dirname='s|/[^/]*$||'
+-sed_basename='s|^.*/||'
++# Make sure IFS has a sensible default
++lt_nl='
++'
++IFS=" $lt_nl"
+
+-# Sed substitution that helps us do robust quoting. It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
++dirname="s,/[^/]*$,,"
++basename="s,^.*/,,"
+
+-# Same as above, but do not quote variable references.
+-sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
++# 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
+
+-# 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
+-# that contains forward slashes, into one that contains
+-# (escaped) backslashes. A very naive implementation.
+-sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
++# func_basename file
++func_basename ()
++{
++ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
++} # func_basename may be replaced by extended shell implementation
+
+-# Re-'\' parameter expansions in output of sed_double_quote_subst that
+-# were '\'-ed in input to the same. If an odd number of '\' preceded a
+-# '$' in input to sed_double_quote_subst, that '$' was protected from
+-# expansion. Since each input '\' is now two '\'s, look for any number
+-# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'.
+-_G_bs='\\'
+-_G_bs2='\\\\'
+-_G_bs4='\\\\\\\\'
+-_G_dollar='\$'
+-sed_double_backslash="\
+- s/$_G_bs4/&\\
+-/g
+- s/^$_G_bs2$_G_dollar/$_G_bs&/
+- s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+- s/\n//g"
++
++# 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 ()
++{
++ # 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
+
+
+-## ----------------- ##
+-## Global variables. ##
+-## ----------------- ##
+-
+-# Except for the global variables explicitly listed below, the following
+-# functions in the '^func_' namespace, and the '^require_' namespace
+-# variables initialised in the 'Resource management' section, sourcing
+-# this file will not pollute your global namespace with anything
+-# else. There's no portable way to scope variables in Bourne shell
+-# though, so actually running these functions will sometimes place
+-# results into a variable named after the function, and often use
+-# temporary variables in the '^_G_' namespace. If you are careful to
+-# avoid using those namespaces casually in your sourcing script, things
+-# should continue to work as you expect. And, of course, you can freely
+-# overwrite any of the functions or variables defined here before
+-# calling anything to customize them.
++# 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
+
+-EXIT_SUCCESS=0
+-EXIT_FAILURE=1
+-EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
+-EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
+
+-# Allow overriding, eg assuming that you follow the convention of
+-# putting '$debug_cmd' at the start of all your functions, you can get
+-# bash to show function call trace with:
+-#
+-# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+-debug_cmd=${debug_cmd-":"}
+-exit_cmd=:
++# These SED scripts presuppose an absolute path with a trailing slash.
++pathcar='s,^/\([^/]*\).*$,\1,'
++pathcdr='s,^/[^/]*,,'
++removedotparts=':dotsl
++ s@/\./@/@g
++ t dotsl
++ s,/\.$,/,'
++collapseslashes='s@/\{1,\}@/@g'
++finalslash='s,/*$,/,'
+
+-# By convention, finish your script with:
+-#
+-# exit $exit_status
+-#
+-# so that you can set exit_status to non-zero if you want to indicate
+-# something went wrong during execution without actually bailing out at
+-# the point of failure.
+-exit_status=$EXIT_SUCCESS
++# func_normal_abspath PATH
++# Remove doubled-up and trailing slashes, "." path components,
++# and cancel out any ".." path components in PATH after making
++# it an absolute path.
++# value returned in "$func_normal_abspath_result"
++func_normal_abspath ()
++{
++ # Start from root dir and reassemble the path.
++ func_normal_abspath_result=
++ func_normal_abspath_tpath=$1
++ func_normal_abspath_altnamespace=
++ case $func_normal_abspath_tpath in
++ "")
++ # Empty path, that just means $cwd.
++ func_stripname '' '/' "`pwd`"
++ func_normal_abspath_result=$func_stripname_result
++ return
++ ;;
++ # The next three entries are used to spot a run of precisely
++ # two leading slashes without using negated character classes;
++ # we take advantage of case's first-match behaviour.
++ ///*)
++ # Unusual form of absolute path, do nothing.
++ ;;
++ //*)
++ # Not necessarily an ordinary path; POSIX reserves leading '//'
++ # and for example Cygwin uses it to access remote file shares
++ # over CIFS/SMB, so we conserve a leading double slash if found.
++ func_normal_abspath_altnamespace=/
++ ;;
++ /*)
++ # Absolute path, do nothing.
++ ;;
++ *)
++ # Relative path, prepend $cwd.
++ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
++ ;;
++ esac
++ # Cancel out all the simple stuff to save iterations. We also want
++ # the path to end with a slash for ease of parsing, so make sure
++ # there is one (and only one) here.
++ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
++ -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
++ while :; do
++ # Processed it all yet?
++ if test "$func_normal_abspath_tpath" = / ; then
++ # If we ascended to the root using ".." the result may be empty now.
++ if test -z "$func_normal_abspath_result" ; then
++ func_normal_abspath_result=/
++ fi
++ break
++ fi
++ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
++ -e "$pathcar"`
++ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
++ -e "$pathcdr"`
++ # Figure out what to do with it
++ case $func_normal_abspath_tcomponent in
++ "")
++ # Trailing empty path component, ignore it.
++ ;;
++ ..)
++ # Parent dir; strip last assembled component from result.
++ func_dirname "$func_normal_abspath_result"
++ func_normal_abspath_result=$func_dirname_result
++ ;;
++ *)
++ # Actual path component, append it.
++ func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
++ ;;
++ esac
++ done
++ # Restore leading double-slash if one was found on entry.
++ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
++}
+
+-# 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
+-# positional parameter $0, within a function call, is the name of the
+-# function.
+-progpath=$0
++# func_relative_path SRCDIR DSTDIR
++# generates a relative path from SRCDIR to DSTDIR, with a trailing
++# slash if non-empty, suitable for immediately appending a filename
++# without needing to append a separator.
++# value returned in "$func_relative_path_result"
++func_relative_path ()
++{
++ func_relative_path_result=
++ func_normal_abspath "$1"
++ func_relative_path_tlibdir=$func_normal_abspath_result
++ func_normal_abspath "$2"
++ func_relative_path_tbindir=$func_normal_abspath_result
++
++ # Ascend the tree starting from libdir
++ while :; do
++ # check if we have found a prefix of bindir
++ case $func_relative_path_tbindir in
++ $func_relative_path_tlibdir)
++ # found an exact match
++ func_relative_path_tcancelled=
++ break
++ ;;
++ $func_relative_path_tlibdir*)
++ # found a matching prefix
++ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
++ func_relative_path_tcancelled=$func_stripname_result
++ if test -z "$func_relative_path_result"; then
++ func_relative_path_result=.
++ fi
++ break
++ ;;
++ *)
++ func_dirname $func_relative_path_tlibdir
++ func_relative_path_tlibdir=${func_dirname_result}
++ if test "x$func_relative_path_tlibdir" = x ; then
++ # Have to descend all the way to the root!
++ func_relative_path_result=../$func_relative_path_result
++ func_relative_path_tcancelled=$func_relative_path_tbindir
++ break
++ fi
++ func_relative_path_result=../$func_relative_path_result
++ ;;
++ esac
++ done
+
+-# The name of this program.
+-progname=`$ECHO "$progpath" |$SED "$sed_basename"`
++ # Now calculate path; take care to avoid doubling-up slashes.
++ func_stripname '' '/' "$func_relative_path_result"
++ func_relative_path_result=$func_stripname_result
++ func_stripname '/' '/' "$func_relative_path_tcancelled"
++ if test "x$func_stripname_result" != x ; then
++ func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
++ fi
+
+-# Make sure we have an absolute progpath for reexecution:
++ # Normalisation. If bindir is libdir, return empty string,
++ # else relative path ending with a slash; either way, target
++ # file name can be directly appended.
++ if test ! -z "$func_relative_path_result"; then
++ func_stripname './' '' "$func_relative_path_result/"
++ func_relative_path_result=$func_stripname_result
++ fi
++}
++
++# The name of this program:
++func_dirname_and_basename "$progpath"
++progname=$func_basename_result
++
++# Make sure we have an absolute path for reexecution:
+ case $progpath in
+ [\\/]*|[A-Za-z]:\\*) ;;
+ *[\\/]*)
+- progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
++ progdir=$func_dirname_result
+ progdir=`cd "$progdir" && pwd`
+- progpath=$progdir/$progname
++ progpath="$progdir/$progname"
+ ;;
+ *)
+- _G_IFS=$IFS
++ save_IFS="$IFS"
+ IFS=${PATH_SEPARATOR-:}
+ for progdir in $PATH; do
+- IFS=$_G_IFS
++ IFS="$save_IFS"
+ test -x "$progdir/$progname" && break
+ done
+- IFS=$_G_IFS
++ IFS="$save_IFS"
+ test -n "$progdir" || progdir=`pwd`
+- progpath=$progdir/$progname
++ progpath="$progdir/$progname"
+ ;;
+ esac
+
++# Sed substitution that helps us do robust quoting. It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed="${SED}"' -e 1s/^X//'
++sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+-## ----------------- ##
+-## Standard options. ##
+-## ----------------- ##
+-
+-# The following options affect the operation of the functions defined
+-# below, and should be set appropriately depending on run-time para-
+-# meters passed on the command line.
+-
+-opt_dry_run=false
+-opt_quiet=false
+-opt_verbose=false
+-
+-# Categories 'all' and 'none' are always available. Append any others
+-# you will pass as the first argument to func_warning from your own
+-# code.
+-warning_categories=
+-
+-# By default, display warnings according to 'opt_warning_types'. Set
+-# 'warning_func' to ':' to elide all warnings, or func_fatal_error to
+-# treat the next displayed warning as a fatal error.
+-warning_func=func_warn_and_continue
+-
+-# Set to 'all' to display all warnings, 'none' to suppress all
+-# warnings, or a space delimited list of some subset of
+-# 'warning_categories' to display only the listed warnings.
+-opt_warning_types=all
+-
+-
+-## -------------------- ##
+-## Resource management. ##
+-## -------------------- ##
+-
+-# This section contains definitions for functions that each ensure a
+-# particular resource (a file, or a non-empty configuration variable for
+-# example) is available, and if appropriate to extract default values
+-# from pertinent package files. Call them using their associated
+-# 'require_*' variable to ensure that they are executed, at most, once.
+-#
+-# It's entirely deliberate that calling these functions can set
+-# variables that don't obey the namespace limitations obeyed by the rest
+-# of this file, in order that that they be as useful as possible to
+-# callers.
+-
+-
+-# require_term_colors
+-# -------------------
+-# Allow display of bold text on terminals that support it.
+-require_term_colors=func_require_term_colors
+-func_require_term_colors ()
+-{
+- $debug_cmd
+-
+- test -t 1 && {
+- # COLORTERM and USE_ANSI_COLORS environment variables take
+- # precedence, because most terminfo databases neglect to describe
+- # whether color sequences are supported.
+- test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+-
+- if test 1 = "$USE_ANSI_COLORS"; then
+- # Standard ANSI escape sequences
+- tc_reset='[0m'
+- tc_bold='[1m'; tc_standout='[7m'
+- tc_red='[31m'; tc_green='[32m'
+- tc_blue='[34m'; tc_cyan='[36m'
+- else
+- # Otherwise trust the terminfo database after all.
+- test -n "`tput sgr0 2>/dev/null`" && {
+- tc_reset=`tput sgr0`
+- test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+- tc_standout=$tc_bold
+- test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+- test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+- test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+- test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+- test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+- }
+- fi
+- }
+-
+- require_term_colors=:
+-}
+-
+-
+-## ----------------- ##
+-## Function library. ##
+-## ----------------- ##
+-
+-# This section contains a variety of useful functions to call in your
+-# scripts. Take note of the portable wrappers for features provided by
+-# some modern shells, which will fall back to slower equivalents on
+-# less featureful shells.
+-
+-
+-# func_append VAR VALUE
+-# ---------------------
+-# Append VALUE onto the existing contents of VAR.
+-
+- # We should try to minimise forks, especially on Windows where they are
+- # unreasonably slow, so skip the feature probes when bash or zsh are
+- # being used:
+- if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+- : ${_G_HAVE_ARITH_OP="yes"}
+- : ${_G_HAVE_XSI_OPS="yes"}
+- # The += operator was introduced in bash 3.1
+- case $BASH_VERSION in
+- [12].* | 3.0 | 3.0*) ;;
+- *)
+- : ${_G_HAVE_PLUSEQ_OP="yes"}
+- ;;
+- esac
+- fi
+-
+- # _G_HAVE_PLUSEQ_OP
+- # Can be empty, in which case the shell is probed, "yes" if += is
+- # useable or anything else if it does not work.
+- test -z "$_G_HAVE_PLUSEQ_OP" \
+- && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+- && _G_HAVE_PLUSEQ_OP=yes
+-
+-if test yes = "$_G_HAVE_PLUSEQ_OP"
+-then
+- # This is an XSI compatible shell, allowing a faster implementation...
+- eval 'func_append ()
+- {
+- $debug_cmd
+-
+- eval "$1+=\$2"
+- }'
+-else
+- # ...otherwise fall back to using expr, which is often a shell builtin.
+- func_append ()
+- {
+- $debug_cmd
+-
+- eval "$1=\$$1\$2"
+- }
+-fi
+-
+-
+-# func_append_quoted VAR VALUE
+-# ----------------------------
+-# Quote VALUE and append to the end of shell variable VAR, separated
+-# by a space.
+-if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+- eval 'func_append_quoted ()
+- {
+- $debug_cmd
+-
+- func_quote_for_eval "$2"
+- eval "$1+=\\ \$func_quote_for_eval_result"
+- }'
+-else
+- func_append_quoted ()
+- {
+- $debug_cmd
+-
+- func_quote_for_eval "$2"
+- eval "$1=\$$1\\ \$func_quote_for_eval_result"
+- }
+-fi
+-
+-
+-# func_append_uniq VAR VALUE
+-# --------------------------
+-# Append unique VALUE onto the existing contents of VAR, assuming
+-# entries are delimited by the first character of VALUE. For example:
+-#
+-# func_append_uniq options " --another-option option-argument"
+-#
+-# will only append to $options if " --another-option option-argument "
+-# is not already present somewhere in $options already (note spaces at
+-# each end implied by leading space in second argument).
+-func_append_uniq ()
+-{
+- $debug_cmd
+-
+- eval _G_current_value='`$ECHO $'$1'`'
+- _G_delim=`expr "$2" : '\(.\)'`
+-
+- case $_G_delim$_G_current_value$_G_delim in
+- *"$2$_G_delim"*) ;;
+- *) func_append "$@" ;;
+- esac
+-}
+-
+-
+-# func_arith TERM...
+-# ------------------
+-# Set func_arith_result to the result of evaluating TERMs.
+- test -z "$_G_HAVE_ARITH_OP" \
+- && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+- && _G_HAVE_ARITH_OP=yes
+-
+-if test yes = "$_G_HAVE_ARITH_OP"; then
+- eval 'func_arith ()
+- {
+- $debug_cmd
+-
+- func_arith_result=$(( $* ))
+- }'
+-else
+- func_arith ()
+- {
+- $debug_cmd
+-
+- func_arith_result=`expr "$@"`
+- }
+-fi
+-
+-
+-# func_basename FILE
+-# ------------------
+-# Set func_basename_result to FILE with everything up to and including
+-# the last / stripped.
+-if test yes = "$_G_HAVE_XSI_OPS"; then
+- # If this shell supports suffix pattern removal, then use it to avoid
+- # forking. Hide the definitions single quotes in case the shell chokes
+- # on unsupported syntax...
+- _b='func_basename_result=${1##*/}'
+- _d='case $1 in
+- */*) func_dirname_result=${1%/*}$2 ;;
+- * ) func_dirname_result=$3 ;;
+- esac'
+-
+-else
+- # ...otherwise fall back to using sed.
+- _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+- _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"`
+- if test "X$func_dirname_result" = "X$1"; then
+- func_dirname_result=$3
+- else
+- func_append func_dirname_result "$2"
+- fi'
+-fi
+-
+-eval 'func_basename ()
+-{
+- $debug_cmd
+-
+- '"$_b"'
+-}'
+-
+-
+-# func_dirname FILE APPEND NONDIR_REPLACEMENT
+-# -------------------------------------------
+-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+-# otherwise set result to NONDIR_REPLACEMENT.
+-eval 'func_dirname ()
+-{
+- $debug_cmd
+-
+- '"$_d"'
+-}'
++# 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'
+
+-# 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"
+-# For efficiency, we do not delegate to the functions above but instead
+-# duplicate the functionality here.
+-eval 'func_dirname_and_basename ()
+-{
+- $debug_cmd
++# 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'
+
+- '"$_b"'
+- '"$_d"'
+-}'
++# 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.
++# Since each input `\' is now two `\'s, look for any number of runs of
++# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
++bs='\\'
++bs2='\\\\'
++bs4='\\\\\\\\'
++dollar='\$'
++sed_double_backslash="\
++ s/$bs4/&\\
++/g
++ s/^$bs2$dollar/$bs&/
++ s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
++ s/\n//g"
+
++# Standard options:
++opt_dry_run=false
++opt_help=false
++opt_quiet=false
++opt_verbose=false
++opt_warning=:
+
+-# func_echo ARG...
+-# ----------------
+-# Echo program name prefixed message.
++# func_echo arg...
++# Echo program name prefixed message, along with the current mode
++# name if it has been set yet.
+ func_echo ()
+ {
+- $debug_cmd
++ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
++}
+
+- _G_message=$*
++# func_verbose arg...
++# Echo program name prefixed message in verbose mode only.
++func_verbose ()
++{
++ $opt_verbose && func_echo ${1+"$@"}
+
+- func_echo_IFS=$IFS
+- IFS=$nl
+- for _G_line in $_G_message; do
+- IFS=$func_echo_IFS
+- $ECHO "$progname: $_G_line"
+- done
+- IFS=$func_echo_IFS
++ # A bug in bash halts the script if the last line of a function
++ # fails when set -e is in force, so we need another command to
++ # work around that:
++ :
+ }
+
+-
+-# func_echo_all ARG...
+-# --------------------
++# func_echo_all arg...
+ # Invoke $ECHO with all args, space-separated.
+ func_echo_all ()
+ {
+ $ECHO "$*"
+ }
+
+-
+-# func_echo_infix_1 INFIX ARG...
+-# ------------------------------
+-# Echo program name, followed by INFIX on the first line, with any
+-# additional lines not showing INFIX.
+-func_echo_infix_1 ()
+-{
+- $debug_cmd
+-
+- $require_term_colors
+-
+- _G_infix=$1; shift
+- _G_indent=$_G_infix
+- _G_prefix="$progname: $_G_infix: "
+- _G_message=$*
+-
+- # Strip color escape sequences before counting printable length
+- for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+- do
+- test -n "$_G_tc" && {
+- _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+- _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+- }
+- done
+- _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes
+-
+- func_echo_infix_1_IFS=$IFS
+- IFS=$nl
+- for _G_line in $_G_message; do
+- IFS=$func_echo_infix_1_IFS
+- $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+- _G_prefix=$_G_indent
+- done
+- IFS=$func_echo_infix_1_IFS
+-}
+-
+-
+-# func_error ARG...
+-# -----------------
++# func_error arg...
+ # Echo program name prefixed message to standard error.
+ func_error ()
+ {
+- $debug_cmd
++ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
++}
+
+- $require_term_colors
++# func_warning arg...
++# Echo program name prefixed warning message to standard error.
++func_warning ()
++{
++ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+
+- func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2
++ # bash bug again:
++ :
+ }
+
+-
+-# func_fatal_error ARG...
+-# -----------------------
++# func_fatal_error arg...
+ # Echo program name prefixed message to standard error, and exit.
+ func_fatal_error ()
+ {
+- $debug_cmd
+-
+- func_error "$*"
++ func_error ${1+"$@"}
+ exit $EXIT_FAILURE
+ }
+
++# func_fatal_help arg...
++# Echo program name prefixed message to standard error, followed by
++# a help hint, and exit.
++func_fatal_help ()
++{
++ func_error ${1+"$@"}
++ func_fatal_error "$help"
++}
++help="Try \`$progname --help' for more information." ## default
++
+
+-# func_grep EXPRESSION FILENAME
+-# -----------------------------
++# func_grep expression filename
+ # Check whether EXPRESSION matches any line of FILENAME, without output.
+ func_grep ()
+ {
+- $debug_cmd
+-
+ $GREP "$1" "$2" >/dev/null 2>&1
+ }
+
+
+-# func_len STRING
+-# ---------------
+-# Set func_len_result to the length of STRING. STRING may not
+-# start with a hyphen.
+- test -z "$_G_HAVE_XSI_OPS" \
+- && (eval 'x=a/b/c;
+- test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+- && _G_HAVE_XSI_OPS=yes
+-
+-if test yes = "$_G_HAVE_XSI_OPS"; then
+- eval 'func_len ()
+- {
+- $debug_cmd
+-
+- func_len_result=${#1}
+- }'
+-else
+- func_len ()
+- {
+- $debug_cmd
+-
+- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+- }
+-fi
+-
+-
+-# func_mkdir_p DIRECTORY-PATH
+-# ---------------------------
++# func_mkdir_p directory-path
+ # Make sure the entire path to DIRECTORY-PATH is available.
+ func_mkdir_p ()
+ {
+- $debug_cmd
+-
+- _G_directory_path=$1
+- _G_dir_list=
++ my_directory_path="$1"
++ my_dir_list=
+
+- if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
++ if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+- # Protect directory names starting with '-'
+- case $_G_directory_path in
+- -*) _G_directory_path=./$_G_directory_path ;;
++ # Protect directory names starting with `-'
++ case $my_directory_path in
++ -*) my_directory_path="./$my_directory_path" ;;
+ esac
+
+ # While some portion of DIR does not yet exist...
+- while test ! -d "$_G_directory_path"; do
++ while test ! -d "$my_directory_path"; do
+ # ...make a list in topmost first order. Use a colon delimited
+ # list incase some portion of path contains whitespace.
+- _G_dir_list=$_G_directory_path:$_G_dir_list
++ my_dir_list="$my_directory_path:$my_dir_list"
+
+ # If the last portion added has no slash in it, the list is done
+- case $_G_directory_path in */*) ;; *) break ;; esac
++ case $my_directory_path in */*) ;; *) break ;; esac
+
+ # ...otherwise throw away the child directory and loop
+- _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
++ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+ done
+- _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
++ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+
+- func_mkdir_p_IFS=$IFS; IFS=:
+- for _G_dir in $_G_dir_list; do
+- IFS=$func_mkdir_p_IFS
+- # mkdir can fail with a 'File exist' error if two processes
++ save_mkdir_p_IFS="$IFS"; IFS=':'
++ for my_dir in $my_dir_list; do
++ IFS="$save_mkdir_p_IFS"
++ # mkdir can fail with a `File exist' error if two processes
+ # try to create one of the directories concurrently. Don't
+ # stop in that case!
+- $MKDIR "$_G_dir" 2>/dev/null || :
++ $MKDIR "$my_dir" 2>/dev/null || :
+ done
+- IFS=$func_mkdir_p_IFS
++ IFS="$save_mkdir_p_IFS"
+
+ # Bail out if we (or some other process) failed to create a directory.
+- test -d "$_G_directory_path" || \
+- func_fatal_error "Failed to create '$1'"
++ test -d "$my_directory_path" || \
++ func_fatal_error "Failed to create \`$1'"
+ fi
+ }
+
+
+-# func_mktempdir [BASENAME]
+-# -------------------------
++# func_mktempdir [string]
+ # Make a temporary directory that won't clash with other running
+ # libtool processes, and avoids race conditions if possible. If
+-# given, BASENAME is the basename for that directory.
++# given, STRING is the basename for that directory.
+ func_mktempdir ()
+ {
+- $debug_cmd
++ my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+- _G_template=${TMPDIR-/tmp}/${1-$progname}
+-
+- if test : = "$opt_dry_run"; then
++ if test "$opt_dry_run" = ":"; then
+ # Return a directory name, but don't create it in dry-run mode
+- _G_tmpdir=$_G_template-$$
++ my_tmpdir="${my_template}-$$"
+ else
+
+ # If mktemp works, use that first and foremost
+- _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
++ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+- if test ! -d "$_G_tmpdir"; then
++ if test ! -d "$my_tmpdir"; then
+ # Failing that, at least try and use $RANDOM to avoid a race
+- _G_tmpdir=$_G_template-${RANDOM-0}$$
++ my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+- func_mktempdir_umask=`umask`
++ save_mktempdir_umask=`umask`
+ umask 0077
+- $MKDIR "$_G_tmpdir"
+- umask $func_mktempdir_umask
++ $MKDIR "$my_tmpdir"
++ umask $save_mktempdir_umask
+ fi
+
+ # If we're not in dry-run mode, bomb out on failure
+- test -d "$_G_tmpdir" || \
+- func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
++ test -d "$my_tmpdir" || \
++ func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+ fi
+
+- $ECHO "$_G_tmpdir"
++ $ECHO "$my_tmpdir"
+ }
+
+
+-# func_normal_abspath PATH
+-# ------------------------
+-# Remove doubled-up and trailing slashes, "." path components,
+-# and cancel out any ".." path components in PATH after making
+-# it an absolute path.
+-func_normal_abspath ()
++# func_quote_for_eval arg
++# Aesthetically quote ARG to be evaled later.
++# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
++# is double-quoted, suitable for a subsequent eval, whereas
++# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
++# which are still active within double quotes backslashified.
++func_quote_for_eval ()
+ {
+- $debug_cmd
++ case $1 in
++ *[\\\`\"\$]*)
++ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
++ *)
++ func_quote_for_eval_unquoted_result="$1" ;;
++ esac
+
+- # These SED scripts presuppose an absolute path with a trailing slash.
+- _G_pathcar='s|^/\([^/]*\).*$|\1|'
+- _G_pathcdr='s|^/[^/]*||'
+- _G_removedotparts=':dotsl
+- s|/\./|/|g
+- t dotsl
+- s|/\.$|/|'
+- _G_collapseslashes='s|/\{1,\}|/|g'
+- _G_finalslash='s|/*$|/|'
+-
+- # Start from root dir and reassemble the path.
+- func_normal_abspath_result=
+- func_normal_abspath_tpath=$1
+- func_normal_abspath_altnamespace=
+- case $func_normal_abspath_tpath in
+- "")
+- # Empty path, that just means $cwd.
+- func_stripname '' '/' "`pwd`"
+- func_normal_abspath_result=$func_stripname_result
+- return
+- ;;
+- # The next three entries are used to spot a run of precisely
+- # two leading slashes without using negated character classes;
+- # we take advantage of case's first-match behaviour.
+- ///*)
+- # Unusual form of absolute path, do nothing.
+- ;;
+- //*)
+- # Not necessarily an ordinary path; POSIX reserves leading '//'
+- # and for example Cygwin uses it to access remote file shares
+- # over CIFS/SMB, so we conserve a leading double slash if found.
+- func_normal_abspath_altnamespace=/
+- ;;
+- /*)
+- # Absolute path, do nothing.
++ case $func_quote_for_eval_unquoted_result in
++ # Double-quote args containing shell metacharacters to delay
++ # word splitting, command substitution and and variable
++ # expansion for a subsequent eval.
++ # Many Bourne shells cannot handle close brackets correctly
++ # in scan sets, so we specify it separately.
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+ ;;
+ *)
+- # Relative path, prepend $cwd.
+- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+- ;;
++ func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+ esac
+-
+- # Cancel out all the simple stuff to save iterations. We also want
+- # the path to end with a slash for ease of parsing, so make sure
+- # there is one (and only one) here.
+- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+- -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+- while :; do
+- # Processed it all yet?
+- if test / = "$func_normal_abspath_tpath"; then
+- # If we ascended to the root using ".." the result may be empty now.
+- if test -z "$func_normal_abspath_result"; then
+- func_normal_abspath_result=/
+- fi
+- break
+- fi
+- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+- -e "$_G_pathcar"`
+- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+- -e "$_G_pathcdr"`
+- # Figure out what to do with it
+- case $func_normal_abspath_tcomponent in
+- "")
+- # Trailing empty path component, ignore it.
+- ;;
+- ..)
+- # Parent dir; strip last assembled component from result.
+- func_dirname "$func_normal_abspath_result"
+- func_normal_abspath_result=$func_dirname_result
+- ;;
+- *)
+- # Actual path component, append it.
+- func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+- ;;
+- esac
+- done
+- # Restore leading double-slash if one was found on entry.
+- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+-}
+-
+-
+-# func_notquiet ARG...
+-# --------------------
+-# Echo program name prefixed message only when not in quiet mode.
+-func_notquiet ()
+-{
+- $debug_cmd
+-
+- $opt_quiet || func_echo ${1+"$@"}
+-
+- # A bug in bash halts the script if the last line of a function
+- # fails when set -e is in force, so we need another command to
+- # work around that:
+- :
+-}
+-
+-
+-# func_relative_path SRCDIR DSTDIR
+-# --------------------------------
+-# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+-func_relative_path ()
+-{
+- $debug_cmd
+-
+- func_relative_path_result=
+- func_normal_abspath "$1"
+- func_relative_path_tlibdir=$func_normal_abspath_result
+- func_normal_abspath "$2"
+- func_relative_path_tbindir=$func_normal_abspath_result
+-
+- # Ascend the tree starting from libdir
+- while :; do
+- # check if we have found a prefix of bindir
+- case $func_relative_path_tbindir in
+- $func_relative_path_tlibdir)
+- # found an exact match
+- func_relative_path_tcancelled=
+- break
+- ;;
+- $func_relative_path_tlibdir*)
+- # found a matching prefix
+- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+- func_relative_path_tcancelled=$func_stripname_result
+- if test -z "$func_relative_path_result"; then
+- func_relative_path_result=.
+- fi
+- break
+- ;;
+- *)
+- func_dirname $func_relative_path_tlibdir
+- func_relative_path_tlibdir=$func_dirname_result
+- if test -z "$func_relative_path_tlibdir"; then
+- # Have to descend all the way to the root!
+- func_relative_path_result=../$func_relative_path_result
+- func_relative_path_tcancelled=$func_relative_path_tbindir
+- break
+- fi
+- func_relative_path_result=../$func_relative_path_result
+- ;;
+- esac
+- done
+-
+- # Now calculate path; take care to avoid doubling-up slashes.
+- func_stripname '' '/' "$func_relative_path_result"
+- func_relative_path_result=$func_stripname_result
+- func_stripname '/' '/' "$func_relative_path_tcancelled"
+- if test -n "$func_stripname_result"; then
+- func_append func_relative_path_result "/$func_stripname_result"
+- fi
+-
+- # Normalisation. If bindir is libdir, return '.' else relative path.
+- if test -n "$func_relative_path_result"; then
+- func_stripname './' '' "$func_relative_path_result"
+- func_relative_path_result=$func_stripname_result
+- fi
+-
+- test -n "$func_relative_path_result" || func_relative_path_result=.
+-
+- :
+ }
+
+
+-# func_quote_for_eval ARG...
+-# --------------------------
+-# Aesthetically quote ARGs to be evaled later.
+-# This function returns two values:
+-# i) func_quote_for_eval_result
+-# double-quoted, suitable for a subsequent eval
+-# ii) func_quote_for_eval_unquoted_result
+-# has all characters that are still active within double
+-# quotes backslashified.
+-func_quote_for_eval ()
+-{
+- $debug_cmd
+-
+- func_quote_for_eval_unquoted_result=
+- func_quote_for_eval_result=
+- while test 0 -lt $#; do
+- case $1 in
+- *[\\\`\"\$]*)
+- _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+- *)
+- _G_unquoted_arg=$1 ;;
+- esac
+- if test -n "$func_quote_for_eval_unquoted_result"; then
+- func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+- else
+- func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+- fi
+-
+- case $_G_unquoted_arg in
+- # Double-quote args containing shell metacharacters to delay
+- # word splitting, command substitution and variable expansion
+- # for a subsequent eval.
+- # Many Bourne shells cannot handle close brackets correctly
+- # in scan sets, so we specify it separately.
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+- _G_quoted_arg=\"$_G_unquoted_arg\"
+- ;;
+- *)
+- _G_quoted_arg=$_G_unquoted_arg
+- ;;
+- esac
+-
+- if test -n "$func_quote_for_eval_result"; then
+- func_append func_quote_for_eval_result " $_G_quoted_arg"
+- else
+- func_append func_quote_for_eval_result "$_G_quoted_arg"
+- fi
+- shift
+- done
+-}
+-
+-
+-# func_quote_for_expand ARG
+-# -------------------------
++# func_quote_for_expand arg
+ # Aesthetically quote ARG to be evaled later; same as above,
+ # but do not quote variable references.
+ func_quote_for_expand ()
+ {
+- $debug_cmd
+-
+ case $1 in
+ *[\\\`\"]*)
+- _G_arg=`$ECHO "$1" | $SED \
+- -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
++ my_arg=`$ECHO "$1" | $SED \
++ -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+ *)
+- _G_arg=$1 ;;
++ my_arg="$1" ;;
+ esac
+
+- case $_G_arg in
++ case $my_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting and command substitution for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+- _G_arg=\"$_G_arg\"
++ my_arg="\"$my_arg\""
+ ;;
+ esac
+
+- func_quote_for_expand_result=$_G_arg
++ func_quote_for_expand_result="$my_arg"
+ }
+
+
+-# func_stripname PREFIX SUFFIX NAME
+-# ---------------------------------
+-# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+-# 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).
+-if test yes = "$_G_HAVE_XSI_OPS"; then
+- eval 'func_stripname ()
+- {
+- $debug_cmd
+-
+- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+- # positional parameters, so assign one to ordinary variable first.
+- func_stripname_result=$3
+- func_stripname_result=${func_stripname_result#"$1"}
+- func_stripname_result=${func_stripname_result%"$2"}
+- }'
+-else
+- func_stripname ()
+- {
+- $debug_cmd
+-
+- case $2 in
+- .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+- *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+- esac
+- }
+-fi
+-
+-
+-# func_show_eval CMD [FAIL_EXP]
+-# -----------------------------
+-# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
++# func_show_eval cmd [fail_exp]
++# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
+ # not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+ # is given, then evaluate it.
+ func_show_eval ()
+ {
+- $debug_cmd
+-
+- _G_cmd=$1
+- _G_fail_exp=${2-':'}
++ my_cmd="$1"
++ my_fail_exp="${2-:}"
+
+- func_quote_for_expand "$_G_cmd"
+- eval "func_notquiet $func_quote_for_expand_result"
++ ${opt_silent-false} || {
++ func_quote_for_expand "$my_cmd"
++ eval "func_echo $func_quote_for_expand_result"
++ }
+
+- $opt_dry_run || {
+- eval "$_G_cmd"
+- _G_status=$?
+- if test 0 -ne "$_G_status"; then
+- eval "(exit $_G_status); $_G_fail_exp"
++ if ${opt_dry_run-false}; then :; else
++ eval "$my_cmd"
++ my_status=$?
++ if test "$my_status" -eq 0; then :; else
++ eval "(exit $my_status); $my_fail_exp"
+ fi
+- }
++ fi
+ }
+
+
+-# func_show_eval_locale CMD [FAIL_EXP]
+-# ------------------------------------
+-# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
++# func_show_eval_locale cmd [fail_exp]
++# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
+ # not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+ # is given, then evaluate it. Use the saved locale for evaluation.
+ func_show_eval_locale ()
+ {
+- $debug_cmd
+-
+- _G_cmd=$1
+- _G_fail_exp=${2-':'}
++ my_cmd="$1"
++ my_fail_exp="${2-:}"
+
+- $opt_quiet || {
+- func_quote_for_expand "$_G_cmd"
++ ${opt_silent-false} || {
++ func_quote_for_expand "$my_cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+
+- $opt_dry_run || {
+- eval "$_G_user_locale
+- $_G_cmd"
+- _G_status=$?
+- eval "$_G_safe_locale"
+- if test 0 -ne "$_G_status"; then
+- eval "(exit $_G_status); $_G_fail_exp"
++ if ${opt_dry_run-false}; then :; else
++ eval "$lt_user_locale
++ $my_cmd"
++ my_status=$?
++ eval "$lt_safe_locale"
++ if test "$my_status" -eq 0; then :; else
++ eval "(exit $my_status); $my_fail_exp"
+ fi
+- }
++ 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 ()
+ {
+- $debug_cmd
+-
+- case $1 in
+- [0-9]* | *[!a-zA-Z0-9_]*)
+- func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+- ;;
+- * )
+- func_tr_sh_result=$1
+- ;;
+- esac
+-}
+-
+-
+-# func_verbose ARG...
+-# -------------------
+-# Echo program name prefixed message in verbose mode only.
+-func_verbose ()
+-{
+- $debug_cmd
+-
+- $opt_verbose && func_echo "$*"
+-
+- :
+-}
+-
+-
+-# func_warn_and_continue ARG...
+-# -----------------------------
+-# Echo program name prefixed warning message to standard error.
+-func_warn_and_continue ()
+-{
+- $debug_cmd
+-
+- $require_term_colors
+-
+- func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+-}
+-
+-
+-# func_warning CATEGORY ARG...
+-# ----------------------------
+-# Echo program name prefixed warning message to standard error. Warning
+-# messages can be filtered according to CATEGORY, where this function
+-# elides messages where CATEGORY is not listed in the global variable
+-# 'opt_warning_types'.
+-func_warning ()
+-{
+- $debug_cmd
+-
+- # CATEGORY must be in the warning_categories list!
+- case " $warning_categories " in
+- *" $1 "*) ;;
+- *) func_internal_error "invalid warning category '$1'" ;;
+- esac
+-
+- _G_category=$1
+- shift
+-
+- case " $opt_warning_types " in
+- *" $_G_category "*) $warning_func ${1+"$@"} ;;
+- esac
+-}
+-
+-
+-# func_sort_ver VER1 VER2
+-# -----------------------
+-# 'sort -V' is not generally available.
+-# Note this deviates from the version comparison in automake
+-# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+-# but this should suffice as we won't be specifying old
+-# version formats or redundant trailing .0 in bootstrap.conf.
+-# If we did want full compatibility then we should probably
+-# use m4_version_compare from autoconf.
+-func_sort_ver ()
+-{
+- $debug_cmd
+-
+- printf '%s\n%s\n' "$1" "$2" \
+- | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+-}
+-
+-# func_lt_ver PREV CURR
+-# ---------------------
+-# Return true if PREV and CURR are in the correct order according to
+-# func_sort_ver, otherwise false. Use it like this:
+-#
+-# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+-func_lt_ver ()
+-{
+- $debug_cmd
+-
+- test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+-}
+-
+-
+-# Local variables:
+-# mode: shell-script
+-# sh-indentation: 2
+-# eval: (add-hook 'before-save-hook 'time-stamp)
+-# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+-# time-stamp-time-zone: "UTC"
+-# End:
+-#! /bin/sh
+-
+-# Set a version string for this script.
+-scriptversion=2014-01-07.03; # UTC
+-
+-# A portable, pluggable option parser for Bourne shell.
+-# Written by Gary V. Vaughan, 2010
+-
+-# Copyright (C) 2010-2015 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.
+-
+-# This program is free software: you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation, either version 3 of the License, or
+-# (at your option) any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+-# Please report bugs or propose patches to gary@gnu.org.
+-
+-
+-## ------ ##
+-## Usage. ##
+-## ------ ##
+-
+-# This file is a library for parsing options in your shell scripts along
+-# with assorted other useful supporting features that you can make use
+-# of too.
+-#
+-# For the simplest scripts you might need only:
+-#
+-# #!/bin/sh
+-# . relative/path/to/funclib.sh
+-# . relative/path/to/options-parser
+-# scriptversion=1.0
+-# func_options ${1+"$@"}
+-# eval set dummy "$func_options_result"; shift
+-# ...rest of your script...
+-#
+-# In order for the '--version' option to work, you will need to have a
+-# suitably formatted comment like the one at the top of this file
+-# starting with '# Written by ' and ending with '# warranty; '.
+-#
+-# For '-h' and '--help' to work, you will also need a one line
+-# description of your script's purpose in a comment directly above the
+-# '# Written by ' line, like the one at the top of this file.
+-#
+-# The default options also support '--debug', which will turn on shell
+-# execution tracing (see the comment above debug_cmd below for another
+-# use), and '--verbose' and the func_verbose function to allow your script
+-# to display verbose messages only when your user has specified
+-# '--verbose'.
+-#
+-# After sourcing this file, you can plug processing for additional
+-# options by amending the variables from the 'Configuration' section
+-# below, and following the instructions in the 'Option parsing'
+-# section further down.
+-
+-## -------------- ##
+-## Configuration. ##
+-## -------------- ##
+-
+-# You should override these variables in your script after sourcing this
+-# file so that they reflect the customisations you have added to the
+-# option parser.
+-
+-# The usage line for option parsing errors and the start of '-h' and
+-# '--help' output messages. You can embed shell variables for delayed
+-# expansion at the time the message is displayed, but you will need to
+-# quote other shell meta-characters carefully to prevent them being
+-# expanded when the contents are evaled.
+-usage='$progpath [OPTION]...'
+-
+-# Short help message in response to '-h' and '--help'. Add to this or
+-# override it after sourcing this library to reflect the full set of
+-# options your script accepts.
+-usage_message="\
+- --debug enable verbose shell tracing
+- -W, --warnings=CATEGORY
+- report the warnings falling in CATEGORY [all]
+- -v, --verbose verbosely report processing
+- --version print version information and exit
+- -h, --help print short or long help message and exit
+-"
+-
+-# Additional text appended to 'usage_message' in response to '--help'.
+-long_help_message="
+-Warning categories include:
+- 'all' show all warnings
+- 'none' turn off all the warnings
+- 'error' warnings are treated as fatal errors"
+-
+-# Help message printed before fatal option parsing errors.
+-fatal_help="Try '\$progname --help' for more information."
+-
+-
+-
+-## ------------------------- ##
+-## Hook function management. ##
+-## ------------------------- ##
+-
+-# This section contains functions for adding, removing, and running hooks
+-# to the main code. A hook is just a named list of of function, that can
+-# be run in order later on.
+-
+-# func_hookable FUNC_NAME
+-# -----------------------
+-# Declare that FUNC_NAME will run hooks added with
+-# 'func_add_hook FUNC_NAME ...'.
+-func_hookable ()
+-{
+- $debug_cmd
+-
+- func_append hookable_fns " $1"
+-}
+-
+-
+-# func_add_hook FUNC_NAME HOOK_FUNC
+-# ---------------------------------
+-# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must
+-# first have been declared "hookable" by a call to 'func_hookable'.
+-func_add_hook ()
+-{
+- $debug_cmd
+-
+- case " $hookable_fns " in
+- *" $1 "*) ;;
+- *) func_fatal_error "'$1' does not accept hook functions." ;;
+- esac
+-
+- eval func_append ${1}_hooks '" $2"'
+-}
+-
+-
+-# func_remove_hook FUNC_NAME HOOK_FUNC
+-# ------------------------------------
+-# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+-func_remove_hook ()
+-{
+- $debug_cmd
+-
+- eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+-}
+-
+-
+-# func_run_hooks FUNC_NAME [ARG]...
+-# ---------------------------------
+-# Run all hook functions registered to FUNC_NAME.
+-# It is assumed that the list of hook functions contains nothing more
+-# than a whitespace-delimited list of legal shell function names, and
+-# no effort is wasted trying to catch shell meta-characters or preserve
+-# whitespace.
+-func_run_hooks ()
+-{
+- $debug_cmd
+-
+- case " $hookable_fns " in
+- *" $1 "*) ;;
+- *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+- esac
+-
+- eval _G_hook_fns=\$$1_hooks; shift
+-
+- for _G_hook in $_G_hook_fns; do
+- eval $_G_hook '"$@"'
+-
+- # store returned options list back into positional
+- # parameters for next 'cmd' execution.
+- eval _G_hook_result=\$${_G_hook}_result
+- eval set dummy "$_G_hook_result"; shift
+- done
+-
+- func_quote_for_eval ${1+"$@"}
+- func_run_hooks_result=$func_quote_for_eval_result
+-}
+-
+-
+-
+-## --------------- ##
+-## Option parsing. ##
+-## --------------- ##
+-
+-# In order to add your own option parsing hooks, you must accept the
+-# full positional parameter list in your hook function, remove any
+-# options that you action, and then pass back the remaining unprocessed
+-# options in '<hooked_function_name>_result', escaped suitably for
+-# 'eval'. Like this:
+-#
+-# my_options_prep ()
+-# {
+-# $debug_cmd
+-#
+-# # Extend the existing usage message.
+-# usage_message=$usage_message'
+-# -s, --silent don'\''t print informational messages
+-# '
+-#
+-# func_quote_for_eval ${1+"$@"}
+-# my_options_prep_result=$func_quote_for_eval_result
+-# }
+-# func_add_hook func_options_prep my_options_prep
+-#
+-#
+-# my_silent_option ()
+-# {
+-# $debug_cmd
+-#
+-# # Note that for efficiency, we parse as many options as we can
+-# # recognise in a loop before passing the remainder back to the
+-# # caller on the first unrecognised argument we encounter.
+-# while test $# -gt 0; do
+-# opt=$1; shift
+-# case $opt in
+-# --silent|-s) opt_silent=: ;;
+-# # Separate non-argument short options:
+-# -s*) func_split_short_opt "$_G_opt"
+-# set dummy "$func_split_short_opt_name" \
+-# "-$func_split_short_opt_arg" ${1+"$@"}
+-# shift
+-# ;;
+-# *) set dummy "$_G_opt" "$*"; shift; break ;;
+-# esac
+-# done
+-#
+-# func_quote_for_eval ${1+"$@"}
+-# my_silent_option_result=$func_quote_for_eval_result
+-# }
+-# func_add_hook func_parse_options my_silent_option
+-#
+-#
+-# my_option_validation ()
+-# {
+-# $debug_cmd
+-#
+-# $opt_silent && $opt_verbose && func_fatal_help "\
+-# '--silent' and '--verbose' options are mutually exclusive."
+-#
+-# func_quote_for_eval ${1+"$@"}
+-# my_option_validation_result=$func_quote_for_eval_result
+-# }
+-# func_add_hook func_validate_options my_option_validation
+-#
+-# You'll alse need to manually amend $usage_message to reflect the extra
+-# options you parse. It's preferable to append if you can, so that
+-# multiple option parsing hooks can be added safely.
+-
+-
+-# func_options [ARG]...
+-# ---------------------
+-# All the functions called inside func_options are hookable. See the
+-# individual implementations for details.
+-func_hookable func_options
+-func_options ()
+-{
+- $debug_cmd
+-
+- func_options_prep ${1+"$@"}
+- eval func_parse_options \
+- ${func_options_prep_result+"$func_options_prep_result"}
+- eval func_validate_options \
+- ${func_parse_options_result+"$func_parse_options_result"}
+-
+- eval func_run_hooks func_options \
+- ${func_validate_options_result+"$func_validate_options_result"}
+-
+- # save modified positional parameters for caller
+- func_options_result=$func_run_hooks_result
+-}
+-
+-
+-# func_options_prep [ARG]...
+-# --------------------------
+-# All initialisations required before starting the option parse loop.
+-# Note that when calling hook functions, we pass through the list of
+-# positional parameters. If a hook function modifies that list, and
+-# needs to propogate that back to rest of this script, then the complete
+-# modified list must be put in 'func_run_hooks_result' before
+-# returning.
+-func_hookable func_options_prep
+-func_options_prep ()
+-{
+- $debug_cmd
+-
+- # Option defaults:
+- opt_verbose=false
+- opt_warning_types=
+-
+- func_run_hooks func_options_prep ${1+"$@"}
+-
+- # save modified positional parameters for caller
+- func_options_prep_result=$func_run_hooks_result
+-}
+-
+-
+-# func_parse_options [ARG]...
+-# ---------------------------
+-# The main option parsing loop.
+-func_hookable func_parse_options
+-func_parse_options ()
+-{
+- $debug_cmd
+-
+- func_parse_options_result=
+-
+- # this just eases exit handling
+- while test $# -gt 0; do
+- # Defer to hook functions for initial option parsing, so they
+- # get priority in the event of reusing an option name.
+- func_run_hooks func_parse_options ${1+"$@"}
+-
+- # Adjust func_parse_options positional parameters to match
+- eval set dummy "$func_run_hooks_result"; shift
+-
+- # Break out of the loop if we already parsed every option.
+- test $# -gt 0 || break
+-
+- _G_opt=$1
+- shift
+- case $_G_opt in
+- --debug|-x) debug_cmd='set -x'
+- func_echo "enabling shell trace mode"
+- $debug_cmd
+- ;;
+-
+- --no-warnings|--no-warning|--no-warn)
+- set dummy --warnings none ${1+"$@"}
+- shift
+- ;;
+-
+- --warnings|--warning|-W)
+- test $# = 0 && func_missing_arg $_G_opt && break
+- case " $warning_categories $1" in
+- *" $1 "*)
+- # trailing space prevents matching last $1 above
+- func_append_uniq opt_warning_types " $1"
+- ;;
+- *all)
+- opt_warning_types=$warning_categories
+- ;;
+- *none)
+- opt_warning_types=none
+- warning_func=:
+- ;;
+- *error)
+- opt_warning_types=$warning_categories
+- warning_func=func_fatal_error
+- ;;
+- *)
+- func_fatal_error \
+- "unsupported warning category: '$1'"
+- ;;
+- esac
+- shift
+- ;;
+-
+- --verbose|-v) opt_verbose=: ;;
+- --version) func_version ;;
+- -\?|-h) func_usage ;;
+- --help) func_help ;;
+-
+- # Separate optargs to long options (plugins may need this):
+- --*=*) func_split_equals "$_G_opt"
+- set dummy "$func_split_equals_lhs" \
+- "$func_split_equals_rhs" ${1+"$@"}
+- shift
+- ;;
+-
+- # Separate optargs to short options:
+- -W*)
+- func_split_short_opt "$_G_opt"
+- set dummy "$func_split_short_opt_name" \
+- "$func_split_short_opt_arg" ${1+"$@"}
+- shift
+- ;;
+-
+- # Separate non-argument short options:
+- -\?*|-h*|-v*|-x*)
+- func_split_short_opt "$_G_opt"
+- set dummy "$func_split_short_opt_name" \
+- "-$func_split_short_opt_arg" ${1+"$@"}
+- shift
+- ;;
+-
+- --) break ;;
+- -*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
+- *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+- esac
+- done
+-
+- # save modified positional parameters for caller
+- func_quote_for_eval ${1+"$@"}
+- func_parse_options_result=$func_quote_for_eval_result
++ 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_validate_options [ARG]...
+-# ------------------------------
+-# Perform any sanity checks on option settings and/or unconsumed
+-# arguments.
+-func_hookable func_validate_options
+-func_validate_options ()
++# func_version
++# Echo version message to standard output and exit.
++func_version ()
+ {
+- $debug_cmd
+-
+- # Display all warnings if -W was not given.
+- test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+-
+- func_run_hooks func_validate_options ${1+"$@"}
++ $opt_debug
+
+- # Bail if the options were screwed!
+- $exit_cmd $EXIT_FAILURE
+-
+- # save modified positional parameters for caller
+- func_validate_options_result=$func_run_hooks_result
++ $SED -n '/(C)/!b go
++ :more
++ /\./!{
++ N
++ s/\n# / /
++ b more
++ }
++ :go
++ /^# '$PROGRAM' (GNU /,/# warranty; / {
++ s/^# //
++ s/^# *$//
++ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
++ p
++ }' < "$progpath"
++ exit $?
+ }
+
+-
+-
+-## ----------------- ##
+-## Helper functions. ##
+-## ----------------- ##
+-
+-# This section contains the helper functions used by the rest of the
+-# hookable option parser framework in ascii-betical order.
+-
+-
+-# func_fatal_help ARG...
+-# ----------------------
+-# Echo program name prefixed message to standard error, followed by
+-# a help hint, and exit.
+-func_fatal_help ()
++# func_usage
++# Echo short help message to standard output and exit.
++func_usage ()
+ {
+- $debug_cmd
++ $opt_debug
+
+- eval \$ECHO \""Usage: $usage"\"
+- eval \$ECHO \""$fatal_help"\"
+- func_error ${1+"$@"}
+- exit $EXIT_FAILURE
++ $SED -n '/^# Usage:/,/^# *.*--help/ {
++ s/^# //
++ s/^# *$//
++ s/\$progname/'$progname'/
++ p
++ }' < "$progpath"
++ echo
++ $ECHO "run \`$progname --help | more' for full usage"
++ exit $?
+ }
+
+-
+-# func_help
+-# ---------
+-# Echo long help message to standard output and exit.
++# func_help [NOEXIT]
++# Echo long help message to standard output and exit,
++# unless 'noexit' is passed as argument.
+ func_help ()
+ {
+- $debug_cmd
++ $opt_debug
+
+- func_usage_message
+- $ECHO "$long_help_message"
+- exit 0
++ $SED -n '/^# Usage:/,/# Report bugs to/ {
++ :print
++ s/^# //
++ s/^# *$//
++ s*\$progname*'$progname'*
++ s*\$host*'"$host"'*
++ s*\$SHELL*'"$SHELL"'*
++ s*\$LTCC*'"$LTCC"'*
++ s*\$LTCFLAGS*'"$LTCFLAGS"'*
++ s*\$LD*'"$LD"'*
++ s/\$with_gnu_ld/'"$with_gnu_ld"'/
++ s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
++ s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
++ p
++ d
++ }
++ /^# .* home page:/b print
++ /^# General help using/b print
++ ' < "$progpath"
++ ret=$?
++ if test -z "$1"; then
++ exit $ret
++ fi
+ }
+
+-
+-# func_missing_arg ARGNAME
+-# ------------------------
++# func_missing_arg argname
+ # Echo program name prefixed message to standard error and set global
+ # exit_cmd.
+ func_missing_arg ()
+ {
+- $debug_cmd
++ $opt_debug
+
+- func_error "Missing argument for '$1'."
++ func_error "missing argument for $1."
+ exit_cmd=exit
+ }
+
+
+-# func_split_equals STRING
+-# ------------------------
+-# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+-# splitting STRING at the '=' sign.
+-test -z "$_G_HAVE_XSI_OPS" \
+- && (eval 'x=a/b/c;
+- test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+- && _G_HAVE_XSI_OPS=yes
+-
+-if test yes = "$_G_HAVE_XSI_OPS"
+-then
+- # This is an XSI compatible shell, allowing a faster implementation...
+- eval 'func_split_equals ()
+- {
+- $debug_cmd
+-
+- func_split_equals_lhs=${1%%=*}
+- func_split_equals_rhs=${1#*=}
+- test "x$func_split_equals_lhs" = "x$1" \
+- && func_split_equals_rhs=
+- }'
+-else
+- # ...otherwise fall back to using expr, which is often a shell builtin.
+- func_split_equals ()
+- {
+- $debug_cmd
+-
+- func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+- func_split_equals_rhs=
+- test "x$func_split_equals_lhs" = "x$1" \
+- || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+- }
+-fi #func_split_equals
+-
+-
+-# func_split_short_opt SHORTOPT
+-# -----------------------------
++# 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.
+-if test yes = "$_G_HAVE_XSI_OPS"
+-then
+- # This is an XSI compatible shell, allowing a faster implementation...
+- eval 'func_split_short_opt ()
+- {
+- $debug_cmd
+-
+- func_split_short_opt_arg=${1#??}
+- func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+- }'
+-else
+- # ...otherwise fall back to using expr, which is often a shell builtin.
+- func_split_short_opt ()
+- {
+- $debug_cmd
+-
+- func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+- func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+- }
+-fi #func_split_short_opt
+-
+-
+-# func_usage
+-# ----------
+-# Echo short help message to standard output and exit.
+-func_usage ()
++func_split_short_opt ()
+ {
+- $debug_cmd
++ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
++ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+
+- func_usage_message
+- $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+- exit 0
+-}
++ 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_usage_message
+-# ------------------
+-# Echo short help message to standard output.
+-func_usage_message ()
++# 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 ()
+ {
+- $debug_cmd
++ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
++ my_sed_long_arg='1s/^--[^=]*=//'
+
+- eval \$ECHO \""Usage: $usage"\"
+- echo
+- $SED -n 's|^# ||
+- /^Written by/{
+- x;p;x
+- }
+- h
+- /^Written by/q' < "$progpath"
+- echo
+- eval \$ECHO \""$usage_message"\"
+-}
++ 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=:
+
+-# func_version
+-# ------------
+-# Echo version message to standard output and exit.
+-func_version ()
+-{
+- $debug_cmd
+
+- printf '%s\n' "$progname $scriptversion"
+- $SED -n '
+- /(C)/!b go
+- :more
+- /\./!{
+- N
+- s|\n# | |
+- b more
+- }
+- :go
+- /^# Written by /,/# warranty; / {
+- s|^# ||
+- s|^# *$||
+- s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+- p
+- }
+- /^# Written by / {
+- s|^# ||
+- p
+- }
+- /^warranty; /q' < "$progpath"
+
+- exit $?
+-}
+
+
+-# Local variables:
+-# mode: shell-script
+-# sh-indentation: 2
+-# eval: (add-hook 'before-save-hook 'time-stamp)
+-# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+-# time-stamp-time-zone: "UTC"
+-# End:
++magic="%%%MAGIC variable%%%"
++magic_exe="%%%MAGIC EXE variable%%%"
+
+-# Set a version string.
+-scriptversion='(GNU libtool) 2.4.6'
++# Global variables.
++nonopt=
++preserve_args=
++lo2o="s/\\.lo\$/.${objext}/"
++o2lo="s/\\.${objext}\$/.lo/"
++extracted_archives=
++extracted_serial=0
+
++# 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_echo ARG...
+-# ----------------
+-# Libtool also displays the current mode in messages, so override
+-# funclib.sh func_echo with this custom definition.
+-func_echo ()
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
+ {
+- $debug_cmd
+-
+- _G_message=$*
+-
+- func_echo_IFS=$IFS
+- IFS=$nl
+- for _G_line in $_G_message; do
+- IFS=$func_echo_IFS
+- $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+- done
+- IFS=$func_echo_IFS
+-}
++ eval "${1}=\$${1}\${2}"
++} # func_append may be replaced by extended shell implementation
+
+-
+-# func_warning ARG...
+-# -------------------
+-# Libtool warnings are not categorized, so override funclib.sh
+-# func_warning with this simpler definition.
+-func_warning ()
++# func_append_quoted var value
++# Quote VALUE and append to the end of shell variable VAR, separated
++# by a space.
++func_append_quoted ()
+ {
+- $debug_cmd
++ func_quote_for_eval "${2}"
++ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
++} # func_append_quoted may be replaced by extended shell implementation
+
+- $warning_func ${1+"$@"}
+-}
+-
+-
+-## ---------------- ##
+-## Options parsing. ##
+-## ---------------- ##
+-
+-# Hook in the functions to make sure our own options are parsed during
+-# the option parsing loop.
+-
+-usage='$progpath [OPTION]... [MODE-ARG]...'
+-
+-# Short help message in response to '-h'.
+-usage_message="Options:
+- --config show all configuration variables
+- --debug enable verbose shell tracing
+- -n, --dry-run display commands without modifying any files
+- --features display basic configuration information and exit
+- --mode=MODE use operation mode MODE
+- --no-warnings equivalent to '-Wnone'
+- --preserve-dup-deps don't remove duplicate dependency libraries
+- --quiet, --silent don't print informational messages
+- --tag=TAG use configuration variables from tag TAG
+- -v, --verbose print more informational messages than default
+- --version print version information
+- -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all]
+- -h, --help, --help-all print short, long, or detailed help message
+-"
+
+-# Additional text appended to 'usage_message' in response to '--help'.
+-func_help ()
++# func_arith arithmetic-term...
++func_arith ()
+ {
+- $debug_cmd
+-
+- func_usage_message
+- $ECHO "$long_help_message
+-
+-MODE must be one of the following:
+-
+- clean remove files from the build directory
+- compile compile a source file into a libtool object
+- execute automatically set library path, then run a program
+- finish complete the installation of libtool libraries
+- install install libraries or executables
+- link create a library or an executable
+- uninstall remove libraries from an installed directory
+-
+-MODE-ARGS vary depending on the MODE. When passed as first option,
+-'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+-Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+-
+-When reporting a bug, please describe a test case to reproduce it and
+-include the following information:
+-
+- host-triplet: $host
+- shell: $SHELL
+- compiler: $LTCC
+- compiler flags: $LTCFLAGS
+- linker: $LD (gnu? $with_gnu_ld)
+- version: $progname (GNU libtool) 2.4.6
+- automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+- autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+-
+-Report bugs to <bug-libtool@gnu.org>.
+-GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+-General help using GNU software: <http://www.gnu.org/gethelp/>."
+- exit 0
+-}
++ func_arith_result=`expr "${@}"`
++} # func_arith may be replaced by extended shell implementation
+
+
+-# func_lo2o OBJECT-NAME
+-# ---------------------
+-# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+-# object suffix.
++# 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
+
+-lo2o=s/\\.lo\$/.$objext/
+-o2lo=s/\\.$objext\$/.lo/
+
+-if test yes = "$_G_HAVE_XSI_OPS"; then
+- eval 'func_lo2o ()
+- {
+- case $1 in
+- *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+- * ) func_lo2o_result=$1 ;;
+- esac
+- }'
++# 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
+- # ---------------------------
+- # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+- # suffix to a '.lo' libtool-object suffix.
+- eval 'func_xform ()
+- {
+- func_xform_result=${1%.*}.lo
+- }'
+-else
+- # ...otherwise fall back to using sed.
+- func_lo2o ()
+- {
+- func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+- }
+
+- func_xform ()
+- {
+- func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+- }
+-fi
++# 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...
+-# -------------------------------
++# func_fatal_configuration arg...
+ # Echo program name prefixed message to standard error, followed by
+ # a configuration failure hint, and exit.
+ func_fatal_configuration ()
+ {
+- func__fatal_error ${1+"$@"} \
+- "See the $PACKAGE documentation for more information." \
+- "Fatal configuration error."
++ func_error ${1+"$@"}
++ func_error "See the $PACKAGE documentation for more information."
++ func_fatal_error "Fatal configuration error."
+ }
+
+
+ # func_config
+-# -----------
+ # Display the configuration for all the tags in this script.
+ func_config ()
+ {
+@@ -2149,19 +915,17 @@
+ exit $?
+ }
+
+-
+ # func_features
+-# -------------
+ # Display the features supported by this script.
+ func_features ()
+ {
+ echo "host: $host"
+- if test yes = "$build_libtool_libs"; then
++ if test "$build_libtool_libs" = yes; then
+ echo "enable shared libraries"
+ else
+ echo "disable shared libraries"
+ fi
+- if test yes = "$build_old_libs"; then
++ if test "$build_old_libs" = yes; then
+ echo "enable static libraries"
+ else
+ echo "disable static libraries"
+@@ -2170,297 +934,289 @@
+ exit $?
+ }
+
+-
+-# func_enable_tag TAGNAME
+-# -----------------------
++# func_enable_tag tagname
+ # Verify that TAGNAME is valid, and either flag an error and exit, or
+ # enable the TAGNAME tag. We also add TAGNAME to the global $taglist
+ # variable here.
+ func_enable_tag ()
+ {
+- # Global variable:
+- tagname=$1
++ # Global variable:
++ tagname="$1"
+
+- re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+- re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+- sed_extractcf=/$re_begincf/,/$re_endcf/p
+-
+- # Validate tagname.
+- case $tagname in
+- *[!-_A-Za-z0-9,/]*)
+- func_fatal_error "invalid tag name: $tagname"
+- ;;
+- esac
++ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
++ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
++ sed_extractcf="/$re_begincf/,/$re_endcf/p"
++
++ # Validate tagname.
++ case $tagname in
++ *[!-_A-Za-z0-9,/]*)
++ func_fatal_error "invalid tag name: $tagname"
++ ;;
++ esac
+
+- # Don't test for the "default" C tag, as we know it's
+- # there but not specially marked.
+- case $tagname in
+- CC) ;;
++ # Don't test for the "default" C tag, as we know it's
++ # there but not specially marked.
++ case $tagname in
++ CC) ;;
+ *)
+- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+- taglist="$taglist $tagname"
++ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
++ taglist="$taglist $tagname"
+
+- # Evaluate the configuration. Be careful to quote the path
+- # and the sed script, to avoid splitting on whitespace, but
+- # also don't use non-portable quotes within backquotes within
+- # quotes we have to do it in 2 steps:
+- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+- eval "$extractedcf"
+- else
+- func_error "ignoring unknown tag $tagname"
+- fi
+- ;;
+- esac
++ # Evaluate the configuration. Be careful to quote the path
++ # and the sed script, to avoid splitting on whitespace, but
++ # also don't use non-portable quotes within backquotes within
++ # quotes we have to do it in 2 steps:
++ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
++ eval "$extractedcf"
++ else
++ func_error "ignoring unknown tag $tagname"
++ fi
++ ;;
++ esac
+ }
+
+-
+ # 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
++ 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
++ 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
++ 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
+-
+- exit $EXIT_MISMATCH
+ fi
++
++ exit $EXIT_MISMATCH
++ fi
+ }
+
+
+-# libtool_options_prep [ARG]...
+-# -----------------------------
+-# Preparation for options parsed by libtool.
+-libtool_options_prep ()
+-{
+- $debug_mode
+-
+- # Option defaults:
+- opt_config=false
+- opt_dlopen=
+- opt_dry_run=false
+- opt_help=false
+- opt_mode=
+- opt_preserve_dup_deps=false
+- opt_quiet=false
++# 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
+
+- nonopt=
+- preserve_args=
+
+- # 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
+
+- # Pass back the list of options.
+- func_quote_for_eval ${1+"$@"}
+- libtool_options_prep_result=$func_quote_for_eval_result
+-}
+-func_add_hook func_options_prep libtool_options_prep
++# 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_warning=:
++opt_verbose=:
++opt_silent=false
++opt_verbose=false
+
+
+-# libtool_parse_options [ARG]...
+-# ---------------------------------
+-# Provide handling for libtool specific options.
+-libtool_parse_options ()
++# Parse options once, thoroughly. This comes as soon as possible in the
++# script to make things like `--version' happen as quickly as we can.
+ {
+- $debug_cmd
+-
+- # Perform our own loop to consume as many options as possible in
+- # each iteration.
+- while test $# -gt 0; do
+- _G_opt=$1
+- shift
+- case $_G_opt in
+- --dry-run|--dryrun|-n)
+- opt_dry_run=:
+- ;;
+-
+- --config) func_config ;;
+-
+- --dlopen|-dlopen)
+- opt_dlopen="${opt_dlopen+$opt_dlopen
+-}$1"
+- shift
+- ;;
+-
+- --preserve-dup-deps)
+- opt_preserve_dup_deps=: ;;
+-
+- --features) func_features ;;
+-
+- --finish) set dummy --mode finish ${1+"$@"}; shift ;;
+-
+- --help) opt_help=: ;;
+-
+- --help-all) opt_help=': help-all' ;;
+-
+- --mode) test $# = 0 && func_missing_arg $_G_opt && break
+- opt_mode=$1
+- 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 $_G_opt"
+- exit_cmd=exit
+- break
+- ;;
+- esac
+- shift
+- ;;
+-
+- --no-silent|--no-quiet)
+- opt_quiet=false
+- func_append preserve_args " $_G_opt"
+- ;;
+-
+- --no-warnings|--no-warning|--no-warn)
+- opt_warning=false
+- func_append preserve_args " $_G_opt"
+- ;;
+-
+- --no-verbose)
+- opt_verbose=false
+- func_append preserve_args " $_G_opt"
+- ;;
+-
+- --silent|--quiet)
+- opt_quiet=:
+- opt_verbose=false
+- func_append preserve_args " $_G_opt"
+- ;;
+-
+- --tag) test $# = 0 && func_missing_arg $_G_opt && break
+- opt_tag=$1
+- func_append preserve_args " $_G_opt $1"
+- func_enable_tag "$1"
+- shift
+- ;;
+-
+- --verbose|-v) opt_quiet=false
+- opt_verbose=:
+- func_append preserve_args " $_G_opt"
+- ;;
++ # this just eases exit handling
++ while test $# -gt 0; do
++ opt="$1"
++ shift
++ case $opt in
++ --debug|-x) opt_debug='set -x'
++ func_echo "enabling shell trace mode"
++ $opt_debug
++ ;;
++ --dry-run|--dryrun|-n)
++ opt_dry_run=:
++ ;;
++ --config)
++ opt_config=:
++func_config
++ ;;
++ --dlopen|-dlopen)
++ optarg="$1"
++ opt_dlopen="${opt_dlopen+$opt_dlopen
++}$optarg"
++ shift
++ ;;
++ --preserve-dup-deps)
++ opt_preserve_dup_deps=:
++ ;;
++ --features)
++ opt_features=:
++func_features
++ ;;
++ --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
++func_append preserve_args " $opt"
++ ;;
++ --no-warning|--no-warn)
++ opt_warning=false
++func_append preserve_args " $opt"
++ ;;
++ --no-verbose)
++ opt_verbose=false
++func_append preserve_args " $opt"
++ ;;
++ --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:
++ --*=*)
++ func_split_long_opt "$opt"
++ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
++ shift
++ ;;
++
++ # 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
+
+- # An option not handled by this hook function:
+- *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+- esac
+- done
++ # Validate options:
+
++ # save first non-option argument
++ if test "$#" -gt 0; then
++ nonopt="$opt"
++ shift
++ fi
+
+- # save modified positional parameters for caller
+- func_quote_for_eval ${1+"$@"}
+- libtool_parse_options_result=$func_quote_for_eval_result
+-}
+-func_add_hook func_parse_options libtool_parse_options
++ # preserve --debug
++ test "$opt_debug" = : || func_append preserve_args " --debug"
+
++ case $host in
++ *cygwin* | *mingw* | *pw32* | *cegcc*)
++ # don't eliminate duplications in $postdeps and $predeps
++ opt_duplicate_compiler_generated_deps=:
++ ;;
++ *)
++ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
++ ;;
++ esac
+
++ $opt_help || {
++ # Sanity checks first:
++ func_check_version_match
+
+-# libtool_validate_options [ARG]...
+-# ---------------------------------
+-# Perform any sanity checks on option settings and/or unconsumed
+-# arguments.
+-libtool_validate_options ()
+-{
+- # save first non-option argument
+- if test 0 -lt $#; then
+- nonopt=$1
+- shift
++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
++ func_fatal_configuration "not configured to build any kind of library"
+ fi
+
+- # preserve --debug
+- test : = "$debug_cmd" || func_append preserve_args " --debug"
++ # Darwin sucks
++ eval std_shrext=\"$shrext_cmds\"
+
+- case $host in
+- # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+- # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+- *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+- # don't eliminate duplications in $postdeps and $predeps
+- opt_duplicate_compiler_generated_deps=:
+- ;;
+- *)
+- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+- ;;
+- esac
++ # 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
+
+- $opt_help || {
+- # Sanity checks first:
+- func_check_version_match
+-
+- test yes != "$build_libtool_libs" \
+- && test yes != "$build_old_libs" \
+- && func_fatal_configuration "not configured to build any kind of library"
+-
+- # Darwin sucks
+- eval std_shrext=\"$shrext_cmds\"
+-
+- # Only execute mode is allowed to have -dlopen flags.
+- if test -n "$opt_dlopen" && test execute != "$opt_mode"; 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=$opt_mode' for more information."
+- }
++ # Change the help message to a mode-specific one.
++ generic_help="$help"
++ help="Try \`$progname --help --mode=$opt_mode' for more information."
++ }
+
+- # Pass back the unparsed argument list
+- func_quote_for_eval ${1+"$@"}
+- libtool_validate_options_result=$func_quote_for_eval_result
+-}
+-func_add_hook func_validate_options libtool_validate_options
+
++ # Bail if the options were screwed
++ $exit_cmd $EXIT_FAILURE
++}
+
+-# Process options as early as possible so that --help and --version
+-# can return quickly.
+-func_options ${1+"$@"}
+-eval set dummy "$func_options_result"; shift
+
+
+
+@@ -2468,52 +1224,24 @@
+ ## Main. ##
+ ## ----------- ##
+
+-magic='%%%MAGIC variable%%%'
+-magic_exe='%%%MAGIC EXE variable%%%'
+-
+-# Global variables.
+-extracted_archives=
+-extracted_serial=0
+-
+-# 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=
+-
+-
+-# A function that is used when there is no print builtin or printf.
+-func_fallback_echo ()
+-{
+- eval 'cat <<_LTECHO_EOF
+-$1
+-_LTECHO_EOF'
+-}
+-
+-# func_generated_by_libtool
+-# True iff stdin has been generated by Libtool. This function is only
+-# a basic sanity check; it will hardly flush out determined imposters.
+-func_generated_by_libtool_p ()
+-{
+- $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+-}
+-
+ # func_lalib_p file
+-# True iff FILE is a libtool '.la' library or '.lo' object file.
++# True iff FILE is a libtool `.la' library or `.lo' object file.
+ # This function is only a basic sanity check; it will hardly flush out
+ # determined imposters.
+ func_lalib_p ()
+ {
+ test -f "$1" &&
+- $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
++ $SED -e 4q "$1" 2>/dev/null \
++ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+ }
+
+ # func_lalib_unsafe_p file
+-# True iff FILE is a libtool '.la' library or '.lo' object file.
++# True iff FILE is a libtool `.la' library or `.lo' object file.
+ # This function implements the same check as func_lalib_p without
+ # resorting to external programs. To this end, it redirects stdin and
+ # closes it afterwards, without saving the original file descriptor.
+ # As a safety measure, use it only where a negative result would be
+-# fatal anyway. Works if 'file' does not exist.
++# fatal anyway. Works if `file' does not exist.
+ func_lalib_unsafe_p ()
+ {
+ lalib_p=no
+@@ -2521,13 +1249,13 @@
+ for lalib_p_l in 1 2 3 4
+ do
+ read lalib_p_line
+- case $lalib_p_line in
++ case "$lalib_p_line" in
+ \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+ esac
+ done
+ exec 0<&5 5<&-
+ fi
+- test yes = "$lalib_p"
++ test "$lalib_p" = yes
+ }
+
+ # func_ltwrapper_script_p file
+@@ -2536,8 +1264,7 @@
+ # determined imposters.
+ func_ltwrapper_script_p ()
+ {
+- test -f "$1" &&
+- $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
++ func_lalib_p "$1"
+ }
+
+ # func_ltwrapper_executable_p file
+@@ -2562,7 +1289,7 @@
+ {
+ 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_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ }
+
+ # func_ltwrapper_p file
+@@ -2581,13 +1308,11 @@
+ # FAIL_CMD may read-access the current command in variable CMD!
+ func_execute_cmds ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ save_ifs=$IFS; IFS='~'
+ for cmd in $1; do
+- IFS=$sp$nl
+- eval cmd=\"$cmd\"
+ IFS=$save_ifs
++ eval cmd=\"$cmd\"
+ func_show_eval "$cmd" "${2-:}"
+ done
+ IFS=$save_ifs
+@@ -2599,11 +1324,10 @@
+ # Note that it is not necessary on cygwin/mingw to append a dot to
+ # FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+ # behavior happens only for exec(3), not for open(2)! Also, sourcing
+-# 'FILE.' does not work on cygwin managed mounts.
++# `FILE.' does not work on cygwin managed mounts.
+ func_source ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ case $1 in
+ */* | *\\*) . "$1" ;;
+ *) . "./$1" ;;
+@@ -2630,10 +1354,10 @@
+ # store the result into func_replace_sysroot_result.
+ func_replace_sysroot ()
+ {
+- case $lt_sysroot:$1 in
++ case "$lt_sysroot:$1" in
+ ?*:"$lt_sysroot"*)
+ func_stripname "$lt_sysroot" '' "$1"
+- func_replace_sysroot_result='='$func_stripname_result
++ func_replace_sysroot_result="=$func_stripname_result"
+ ;;
+ *)
+ # Including no sysroot.
+@@ -2650,8 +1374,7 @@
+ # arg is usually of the form 'gcc ...'
+ func_infer_tag ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ if test -n "$available_tags" && test -z "$tagname"; then
+ CC_quoted=
+ for arg in $CC; do
+@@ -2670,7 +1393,7 @@
+ for z in $available_tags; do
+ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+ # Evaluate the configuration.
+- eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+ CC_quoted=
+ for arg in $CC; do
+ # Double-quote args containing other shell metacharacters.
+@@ -2695,7 +1418,7 @@
+ # line option must be used.
+ if test -z "$tagname"; then
+ func_echo "unable to infer tagged configuration"
+- func_fatal_error "specify a tag with '--tag'"
++ func_fatal_error "specify a tag with \`--tag'"
+ # else
+ # func_verbose "using $tagname tagged configuration"
+ fi
+@@ -2711,15 +1434,15 @@
+ # but don't create it if we're doing a dry run.
+ func_write_libtool_object ()
+ {
+- write_libobj=$1
+- if test yes = "$build_libtool_libs"; then
+- write_lobj=\'$2\'
++ write_libobj=${1}
++ if test "$build_libtool_libs" = yes; then
++ write_lobj=\'${2}\'
+ else
+ write_lobj=none
+ fi
+
+- if test yes = "$build_old_libs"; then
+- write_oldobj=\'$3\'
++ if test "$build_old_libs" = yes; then
++ write_oldobj=\'${3}\'
+ else
+ write_oldobj=none
+ fi
+@@ -2727,7 +1450,7 @@
+ $opt_dry_run || {
+ cat >${write_libobj}T <<EOF
+ # $write_libobj - a libtool object file
+-# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ #
+ # Please DO NOT delete this file!
+ # It is necessary for linking the library.
+@@ -2739,7 +1462,7 @@
+ non_pic_object=$write_oldobj
+
+ EOF
+- $MV "${write_libobj}T" "$write_libobj"
++ $MV "${write_libobj}T" "${write_libobj}"
+ }
+ }
+
+@@ -2759,9 +1482,8 @@
+ # be empty on error (or when ARG is empty)
+ func_convert_core_file_wine_to_w32 ()
+ {
+- $debug_cmd
+-
+- func_convert_core_file_wine_to_w32_result=$1
++ $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
+@@ -2769,9 +1491,9 @@
+ # *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
++ 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 "$sed_naive_backslashify"`
++ $SED -e "$lt_sed_naive_backslashify"`
+ else
+ func_convert_core_file_wine_to_w32_result=
+ fi
+@@ -2792,19 +1514,18 @@
+ # are convertible, then the result may be empty.
+ func_convert_core_path_wine_to_w32 ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ # unfortunately, winepath doesn't convert paths, only file names
+- func_convert_core_path_wine_to_w32_result=
++ 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 -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
++ 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
+@@ -2833,8 +1554,7 @@
+ # environment variable; do not put it in $PATH.
+ func_cygpath ()
+ {
+- $debug_cmd
+-
++ $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
+@@ -2843,7 +1563,7 @@
+ fi
+ else
+ func_cygpath_result=
+- func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
++ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+ fi
+ }
+ #end: func_cygpath
+@@ -2854,11 +1574,10 @@
+ # result in func_convert_core_msys_to_w32_result.
+ func_convert_core_msys_to_w32 ()
+ {
+- $debug_cmd
+-
++ $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 "$sed_naive_backslashify"`
++ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+ }
+ #end: func_convert_core_msys_to_w32
+
+@@ -2869,14 +1588,13 @@
+ # func_to_host_file_result to ARG1).
+ func_convert_file_check ()
+ {
+- $debug_cmd
+-
+- if test -z "$2" && test -n "$1"; then
++ $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 " \`$1'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback:
+- func_to_host_file_result=$1
++ func_to_host_file_result="$1"
+ fi
+ }
+ # end func_convert_file_check
+@@ -2888,11 +1606,10 @@
+ # func_to_host_file_result to a simplistic fallback value (see below).
+ func_convert_path_check ()
+ {
+- $debug_cmd
+-
++ $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 " \`$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.
+@@ -2901,7 +1618,7 @@
+ func_to_host_path_result=`echo "$3" |
+ $SED -e "$lt_replace_pathsep_chars"`
+ else
+- func_to_host_path_result=$3
++ func_to_host_path_result="$3"
+ fi
+ fi
+ }
+@@ -2913,10 +1630,9 @@
+ # and appending REPL if ORIG matches BACKPAT.
+ func_convert_path_front_back_pathsep ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ case $4 in
+- $1 ) func_to_host_path_result=$3$func_to_host_path_result
++ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+ ;;
+ esac
+ case $4 in
+@@ -2930,7 +1646,7 @@
+ ##################################################
+ # $build to $host FILE NAME CONVERSION FUNCTIONS #
+ ##################################################
+-# invoked via '$to_host_file_cmd ARG'
++# 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.
+@@ -2941,8 +1657,7 @@
+ # in func_to_host_file_result.
+ func_to_host_file ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ $to_host_file_cmd "$1"
+ }
+ # end func_to_host_file
+@@ -2954,8 +1669,7 @@
+ # in (the comma separated) LAZY, no conversion takes place.
+ func_to_tool_file ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ case ,$2, in
+ *,"$to_tool_file_cmd",*)
+ func_to_tool_file_result=$1
+@@ -2973,7 +1687,7 @@
+ # Copy ARG to func_to_host_file_result.
+ func_convert_file_noop ()
+ {
+- func_to_host_file_result=$1
++ func_to_host_file_result="$1"
+ }
+ # end func_convert_file_noop
+
+@@ -2984,12 +1698,11 @@
+ # func_to_host_file_result.
+ func_convert_file_msys_to_w32 ()
+ {
+- $debug_cmd
+-
+- func_to_host_file_result=$1
++ $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
++ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+ }
+@@ -3001,9 +1714,8 @@
+ # func_to_host_file_result.
+ func_convert_file_cygwin_to_w32 ()
+ {
+- $debug_cmd
+-
+- func_to_host_file_result=$1
++ $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.
+@@ -3019,12 +1731,11 @@
+ # and a working winepath. Returns result in func_to_host_file_result.
+ func_convert_file_nix_to_w32 ()
+ {
+- $debug_cmd
+-
+- func_to_host_file_result=$1
++ $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
++ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+ }
+@@ -3036,13 +1747,12 @@
+ # Returns result in func_to_host_file_result.
+ func_convert_file_msys_to_cygwin ()
+ {
+- $debug_cmd
+-
+- func_to_host_file_result=$1
++ $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
++ func_to_host_file_result="$func_cygpath_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+ }
+@@ -3055,14 +1765,13 @@
+ # in func_to_host_file_result.
+ func_convert_file_nix_to_cygwin ()
+ {
+- $debug_cmd
+-
+- func_to_host_file_result=$1
++ $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
++ func_to_host_file_result="$func_cygpath_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+ }
+@@ -3072,7 +1781,7 @@
+ #############################################
+ # $build to $host PATH CONVERSION FUNCTIONS #
+ #############################################
+-# invoked via '$to_host_path_cmd ARG'
++# 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.
+@@ -3096,11 +1805,10 @@
+ to_host_path_cmd=
+ func_init_to_host_path_cmd ()
+ {
+- $debug_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
++ to_host_path_cmd="func_convert_path_${func_stripname_result}"
+ fi
+ }
+
+@@ -3110,8 +1818,7 @@
+ # in func_to_host_path_result.
+ func_to_host_path ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ func_init_to_host_path_cmd
+ $to_host_path_cmd "$1"
+ }
+@@ -3122,7 +1829,7 @@
+ # Copy ARG to func_to_host_path_result.
+ func_convert_path_noop ()
+ {
+- func_to_host_path_result=$1
++ func_to_host_path_result="$1"
+ }
+ # end func_convert_path_noop
+
+@@ -3133,9 +1840,8 @@
+ # func_to_host_path_result.
+ func_convert_path_msys_to_w32 ()
+ {
+- $debug_cmd
+-
+- func_to_host_path_result=$1
++ $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 ';.';
+@@ -3143,7 +1849,7 @@
+ 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_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"
+@@ -3157,9 +1863,8 @@
+ # func_to_host_file_result.
+ func_convert_path_cygwin_to_w32 ()
+ {
+- $debug_cmd
+-
+- func_to_host_path_result=$1
++ $opt_debug
++ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # See func_convert_path_msys_to_w32:
+ func_stripname : : "$1"
+@@ -3178,15 +1883,14 @@
+ # a working winepath. Returns result in func_to_host_file_result.
+ func_convert_path_nix_to_w32 ()
+ {
+- $debug_cmd
+-
+- func_to_host_path_result=$1
++ $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_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"
+@@ -3200,16 +1904,15 @@
+ # Returns result in func_to_host_file_result.
+ func_convert_path_msys_to_cygwin ()
+ {
+- $debug_cmd
+-
+- func_to_host_path_result=$1
++ $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_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"
+@@ -3224,9 +1927,8 @@
+ # func_to_host_file_result.
+ func_convert_path_nix_to_cygwin ()
+ {
+- $debug_cmd
+-
+- func_to_host_path_result=$1
++ $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
+@@ -3235,7 +1937,7 @@
+ 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_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"
+@@ -3244,31 +1946,13 @@
+ # end func_convert_path_nix_to_cygwin
+
+
+-# func_dll_def_p FILE
+-# True iff FILE is a Windows DLL '.def' file.
+-# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+-func_dll_def_p ()
+-{
+- $debug_cmd
+-
+- func_dll_def_p_tmp=`$SED -n \
+- -e 's/^[ ]*//' \
+- -e '/^\(;.*\)*$/d' \
+- -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \
+- -e q \
+- "$1"`
+- test DEF = "$func_dll_def_p_tmp"
+-}
+-
+-
+ # func_mode_compile arg...
+ func_mode_compile ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ # Get the compilation command and the source file.
+ base_compile=
+- srcfile=$nonopt # always keep a non-empty value in "srcfile"
++ srcfile="$nonopt" # always keep a non-empty value in "srcfile"
+ suppress_opt=yes
+ suppress_output=
+ arg_mode=normal
+@@ -3281,12 +1965,12 @@
+ case $arg_mode in
+ arg )
+ # do not "continue". Instead, add this to base_compile
+- lastarg=$arg
++ lastarg="$arg"
+ arg_mode=normal
+ ;;
+
+ target )
+- libobj=$arg
++ libobj="$arg"
+ arg_mode=normal
+ continue
+ ;;
+@@ -3296,7 +1980,7 @@
+ case $arg in
+ -o)
+ test -n "$libobj" && \
+- func_fatal_error "you cannot specify '-o' more than once"
++ func_fatal_error "you cannot specify \`-o' more than once"
+ arg_mode=target
+ continue
+ ;;
+@@ -3325,12 +2009,12 @@
+ func_stripname '-Wc,' '' "$arg"
+ args=$func_stripname_result
+ lastarg=
+- save_ifs=$IFS; IFS=,
++ save_ifs="$IFS"; IFS=','
+ for arg in $args; do
+- IFS=$save_ifs
++ IFS="$save_ifs"
+ func_append_quoted lastarg "$arg"
+ done
+- IFS=$save_ifs
++ IFS="$save_ifs"
+ func_stripname ' ' '' "$lastarg"
+ lastarg=$func_stripname_result
+
+@@ -3343,8 +2027,8 @@
+ # Accept the current argument as the source file.
+ # The previous "srcfile" becomes the current argument.
+ #
+- lastarg=$srcfile
+- srcfile=$arg
++ lastarg="$srcfile"
++ srcfile="$arg"
+ ;;
+ esac # case $arg
+ ;;
+@@ -3359,13 +2043,13 @@
+ func_fatal_error "you must specify an argument for -Xcompile"
+ ;;
+ target)
+- func_fatal_error "you must specify a target with '-o'"
++ func_fatal_error "you must specify a target with \`-o'"
+ ;;
+ *)
+ # Get the name of the library object.
+ test -z "$libobj" && {
+ func_basename "$srcfile"
+- libobj=$func_basename_result
++ libobj="$func_basename_result"
+ }
+ ;;
+ esac
+@@ -3385,7 +2069,7 @@
+ case $libobj in
+ *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+ *)
+- func_fatal_error "cannot determine name of library object from '$libobj'"
++ func_fatal_error "cannot determine name of library object from \`$libobj'"
+ ;;
+ esac
+
+@@ -3394,8 +2078,8 @@
+ for arg in $later; do
+ case $arg in
+ -shared)
+- test yes = "$build_libtool_libs" \
+- || func_fatal_configuration "cannot build a shared library"
++ test "$build_libtool_libs" != yes && \
++ func_fatal_configuration "can not build a shared library"
+ build_old_libs=no
+ continue
+ ;;
+@@ -3421,17 +2105,17 @@
+ func_quote_for_eval "$libobj"
+ test "X$libobj" != "X$func_quote_for_eval_result" \
+ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \
+- && func_warning "libobj name '$libobj' may not contain shell special characters."
++ && func_warning "libobj name \`$libobj' may not contain shell special characters."
+ func_dirname_and_basename "$obj" "/" ""
+- objname=$func_basename_result
+- xdir=$func_dirname_result
+- lobj=$xdir$objdir/$objname
++ objname="$func_basename_result"
++ xdir="$func_dirname_result"
++ lobj=${xdir}$objdir/$objname
+
+ test -z "$base_compile" && \
+ func_fatal_help "you must specify a compilation command"
+
+ # Delete any leftover library objects.
+- if test yes = "$build_old_libs"; then
++ if test "$build_old_libs" = yes; then
+ removelist="$obj $lobj $libobj ${libobj}T"
+ else
+ removelist="$lobj $libobj ${libobj}T"
+@@ -3443,16 +2127,16 @@
+ pic_mode=default
+ ;;
+ esac
+- if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
++ if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+ # non-PIC code in shared libraries is not supported
+ pic_mode=default
+ fi
+
+ # Calculate the filename of the output object if compiler does
+ # not support -o with -c
+- if test no = "$compiler_c_o"; then
+- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+- lockfile=$output_obj.lock
++ if test "$compiler_c_o" = no; then
++ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
++ lockfile="$output_obj.lock"
+ else
+ output_obj=
+ need_locks=no
+@@ -3461,12 +2145,12 @@
+
+ # Lock this critical section if it is needed
+ # We use this script file to make the link, it avoids creating a new file
+- if test yes = "$need_locks"; then
++ if test "$need_locks" = yes; then
+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+ func_echo "Waiting for $lockfile to be removed"
+ sleep 2
+ done
+- elif test warn = "$need_locks"; then
++ elif test "$need_locks" = warn; then
+ if test -f "$lockfile"; then
+ $ECHO "\
+ *** ERROR, $lockfile exists and contains:
+@@ -3474,7 +2158,7 @@
+
+ This indicates that another process is trying to use the same
+ temporary object file, and libtool could not work around it because
+-your compiler does not support '-c' and '-o' together. If you
++your compiler does not support \`-c' and \`-o' together. If you
+ repeat this compilation, it may succeed, by chance, but you had better
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+@@ -3496,11 +2180,11 @@
+ qsrcfile=$func_quote_for_eval_result
+
+ # Only build a PIC object if we are building libtool libraries.
+- if test yes = "$build_libtool_libs"; then
++ if test "$build_libtool_libs" = yes; then
+ # Without this assignment, base_compile gets emptied.
+ fbsd_hideous_sh_bug=$base_compile
+
+- if test no != "$pic_mode"; then
++ if test "$pic_mode" != no; then
+ command="$base_compile $qsrcfile $pic_flag"
+ else
+ # Don't build PIC code
+@@ -3517,7 +2201,7 @@
+ func_show_eval_locale "$command" \
+ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+- if test warn = "$need_locks" &&
++ if test "$need_locks" = warn &&
+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+ $ECHO "\
+ *** ERROR, $lockfile contains:
+@@ -3528,7 +2212,7 @@
+
+ This indicates that another process is trying to use the same
+ temporary object file, and libtool could not work around it because
+-your compiler does not support '-c' and '-o' together. If you
++your compiler does not support \`-c' and \`-o' together. If you
+ repeat this compilation, it may succeed, by chance, but you had better
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+@@ -3544,20 +2228,20 @@
+ fi
+
+ # Allow error messages only from the first compilation.
+- if test yes = "$suppress_opt"; then
++ if test "$suppress_opt" = yes; then
+ suppress_output=' >/dev/null 2>&1'
+ fi
+ fi
+
+ # Only build a position-dependent object if we build old libraries.
+- if test yes = "$build_old_libs"; then
+- if test yes != "$pic_mode"; then
++ if test "$build_old_libs" = yes; then
++ if test "$pic_mode" != yes; then
+ # Don't build PIC code
+ command="$base_compile $qsrcfile$pie_flag"
+ else
+ command="$base_compile $qsrcfile $pic_flag"
+ fi
+- if test yes = "$compiler_c_o"; then
++ if test "$compiler_c_o" = yes; then
+ func_append command " -o $obj"
+ fi
+
+@@ -3566,7 +2250,7 @@
+ func_show_eval_locale "$command" \
+ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+- if test warn = "$need_locks" &&
++ if test "$need_locks" = warn &&
+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+ $ECHO "\
+ *** ERROR, $lockfile contains:
+@@ -3577,7 +2261,7 @@
+
+ This indicates that another process is trying to use the same
+ temporary object file, and libtool could not work around it because
+-your compiler does not support '-c' and '-o' together. If you
++your compiler does not support \`-c' and \`-o' together. If you
+ repeat this compilation, it may succeed, by chance, but you had better
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+@@ -3597,7 +2281,7 @@
+ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+ # Unlock the critical section if it was locked
+- if test no != "$need_locks"; then
++ if test "$need_locks" != no; then
+ removelist=$lockfile
+ $RM "$lockfile"
+ fi
+@@ -3607,7 +2291,7 @@
+ }
+
+ $opt_help || {
+- test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
++ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+ }
+
+ func_mode_help ()
+@@ -3627,7 +2311,7 @@
+ Remove files from the build directory.
+
+ RM is the name of the program to use to delete files associated with each FILE
+-(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
++(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+ to RM.
+
+ If FILE is a libtool library, object or program, all the files associated
+@@ -3646,16 +2330,16 @@
+ -no-suppress do not suppress compiler output for multiple passes
+ -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
++ -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
+
+-COMPILE-COMMAND is a command to be used in creating a 'standard' object file
++COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+ from the given SOURCEFILE.
+
+ The output file name is determined by removing the directory component from
+-SOURCEFILE, then substituting the C source code suffix '.c' with the
+-library object suffix, '.lo'."
++SOURCEFILE, then substituting the C source code suffix \`.c' with the
++library object suffix, \`.lo'."
+ ;;
+
+ execute)
+@@ -3668,7 +2352,7 @@
+
+ -dlopen FILE add the directory containing FILE to the library path
+
+-This mode sets the library path environment variable according to '-dlopen'
++This mode sets the library path environment variable according to \`-dlopen'
+ flags.
+
+ If any of the ARGS are libtool executable wrappers, then they are translated
+@@ -3687,7 +2371,7 @@
+ Each LIBDIR is a directory that contains libtool libraries.
+
+ The commands that this mode executes may require superuser privileges. Use
+-the '--dry-run' option if you just want to see what would be executed."
++the \`--dry-run' option if you just want to see what would be executed."
+ ;;
+
+ install)
+@@ -3697,7 +2381,7 @@
+ Install executables or libraries.
+
+ INSTALL-COMMAND is the installation command. The first component should be
+-either the 'install' or 'cp' program.
++either the \`install' or \`cp' program.
+
+ The following components of INSTALL-COMMAND are treated specially:
+
+@@ -3723,7 +2407,7 @@
+ -avoid-version do not add a version suffix if possible
+ -bindir BINDIR specify path to binaries directory (for systems where
+ libraries must be found in the PATH setting at runtime)
+- -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime
++ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+ -export-symbols SYMFILE
+@@ -3737,8 +2421,7 @@
+ -no-install link a not-installable executable
+ -no-undefined declare that a library does not refer to external symbols
+ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
+- -objectlist FILE use a list of object files found in FILE to specify objects
+- -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes)
++ -objectlist FILE Use a list of object files found in FILE to specify objects
+ -precious-files-regex REGEX
+ don't remove output files matching REGEX
+ -release RELEASE specify package release information
+@@ -3758,20 +2441,20 @@
+ -Xlinker FLAG pass linker-specific FLAG directly to the linker
+ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
+
+-All other options (arguments beginning with '-') are ignored.
++All other options (arguments beginning with \`-') are ignored.
+
+-Every other argument is treated as a filename. Files ending in '.la' are
++Every other argument is treated as a filename. Files ending in \`.la' are
+ treated as uninstalled libtool libraries, other files are standard or library
+ object files.
+
+-If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+-only library objects ('.lo' files) may be specified, and '-rpath' is
++If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
++only library objects (\`.lo' files) may be specified, and \`-rpath' is
+ required, except when creating a convenience library.
+
+-If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+-using 'ar' and 'ranlib', or on Windows using 'lib'.
++If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
++using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+-If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
++If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+ is created, otherwise an executable program is created."
+ ;;
+
+@@ -3782,7 +2465,7 @@
+ Remove libraries from an installation directory.
+
+ RM is the name of the program to use to delete files associated with each FILE
+-(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
++(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+ to RM.
+
+ If FILE is a libtool library, all the files associated with it are deleted.
+@@ -3790,17 +2473,17 @@
+ ;;
+
+ *)
+- func_fatal_help "invalid operation mode '$opt_mode'"
++ func_fatal_help "invalid operation mode \`$opt_mode'"
+ ;;
+ esac
+
+ echo
+- $ECHO "Try '$progname --help' for more information about other modes."
++ $ECHO "Try \`$progname --help' for more information about other modes."
+ }
+
+ # Now that we've collected a possible --mode arg, show help if necessary
+ if $opt_help; then
+- if test : = "$opt_help"; then
++ if test "$opt_help" = :; then
+ func_mode_help
+ else
+ {
+@@ -3808,7 +2491,7 @@
+ for opt_mode in compile link execute install finish uninstall clean; do
+ func_mode_help
+ done
+- } | $SED -n '1p; 2,$s/^Usage:/ or: /p'
++ } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+ {
+ func_help noexit
+ for opt_mode in compile link execute install finish uninstall clean; do
+@@ -3816,7 +2499,7 @@
+ func_mode_help
+ done
+ } |
+- $SED '1d
++ sed '1d
+ /^When reporting/,/^Report/{
+ H
+ d
+@@ -3833,17 +2516,16 @@
+ # func_mode_execute arg...
+ func_mode_execute ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ # The first argument is the command name.
+- cmd=$nonopt
++ cmd="$nonopt"
+ test -z "$cmd" && \
+ func_fatal_help "you must specify a COMMAND"
+
+ # Handle -dlopen flags immediately.
+ for file in $opt_dlopen; do
+ test -f "$file" \
+- || func_fatal_help "'$file' is not a file"
++ || func_fatal_help "\`$file' is not a file"
+
+ dir=
+ case $file in
+@@ -3853,7 +2535,7 @@
+
+ # 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"
++ || func_fatal_help "\`$lib' is not a valid libtool archive"
+
+ # Read the libtool library.
+ dlname=
+@@ -3864,18 +2546,18 @@
+ if test -z "$dlname"; then
+ # Warn if it was a shared library.
+ test -n "$library_names" && \
+- func_warning "'$file' was not linked with '-export-dynamic'"
++ func_warning "\`$file' was not linked with \`-export-dynamic'"
+ continue
+ fi
+
+ func_dirname "$file" "" "."
+- dir=$func_dirname_result
++ dir="$func_dirname_result"
+
+ if test -f "$dir/$objdir/$dlname"; then
+ func_append dir "/$objdir"
+ else
+ if test ! -f "$dir/$dlname"; then
+- func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
++ func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+ fi
+ fi
+ ;;
+@@ -3883,18 +2565,18 @@
+ *.lo)
+ # Just add the directory containing the .lo file.
+ func_dirname "$file" "" "."
+- dir=$func_dirname_result
++ dir="$func_dirname_result"
+ ;;
+
+ *)
+- func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
++ func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+ continue
+ ;;
+ esac
+
+ # Get the absolute pathname.
+ absdir=`cd "$dir" && pwd`
+- test -n "$absdir" && dir=$absdir
++ test -n "$absdir" && dir="$absdir"
+
+ # Now add the directory to shlibpath_var.
+ if eval "test -z \"\$$shlibpath_var\""; then
+@@ -3906,7 +2588,7 @@
+
+ # This variable tells wrapper scripts just to set shlibpath_var
+ # rather than running their programs.
+- libtool_execute_magic=$magic
++ libtool_execute_magic="$magic"
+
+ # Check if any of the arguments is a wrapper script.
+ args=
+@@ -3919,12 +2601,12 @@
+ if func_ltwrapper_script_p "$file"; then
+ func_source "$file"
+ # Transform arg to wrapped name.
+- file=$progdir/$program
++ file="$progdir/$program"
+ elif func_ltwrapper_executable_p "$file"; then
+ func_ltwrapper_scriptname "$file"
+ func_source "$func_ltwrapper_scriptname_result"
+ # Transform arg to wrapped name.
+- file=$progdir/$program
++ file="$progdir/$program"
+ fi
+ ;;
+ esac
+@@ -3932,15 +2614,7 @@
+ func_append_quoted args "$file"
+ done
+
+- if $opt_dry_run; then
+- # Display what would be done.
+- if test -n "$shlibpath_var"; then
+- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+- echo "export $shlibpath_var"
+- fi
+- $ECHO "$cmd$args"
+- exit $EXIT_SUCCESS
+- else
++ if test "X$opt_dry_run" = Xfalse; then
+ if test -n "$shlibpath_var"; then
+ # Export the shlibpath_var.
+ eval "export $shlibpath_var"
+@@ -3957,18 +2631,25 @@
+ done
+
+ # Now prepare to actually exec the command.
+- exec_cmd=\$cmd$args
++ exec_cmd="\$cmd$args"
++ else
++ # Display what would be done.
++ if test -n "$shlibpath_var"; then
++ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
++ echo "export $shlibpath_var"
++ fi
++ $ECHO "$cmd$args"
++ exit $EXIT_SUCCESS
+ fi
+ }
+
+-test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
++test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+
+
+ # func_mode_finish arg...
+ func_mode_finish ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ libs=
+ libdirs=
+ admincmds=
+@@ -3982,11 +2663,11 @@
+ if func_lalib_unsafe_p "$opt"; then
+ func_append libs " $opt"
+ else
+- func_warning "'$opt' is not a valid libtool archive"
++ func_warning "\`$opt' is not a valid libtool archive"
+ fi
+
+ else
+- func_fatal_error "invalid argument '$opt'"
++ func_fatal_error "invalid argument \`$opt'"
+ fi
+ done
+
+@@ -4001,12 +2682,12 @@
+ # Remove sysroot references
+ if $opt_dry_run; then
+ for lib in $libs; do
+- echo "removing references to $lt_sysroot and '=' prefixes from $lib"
++ 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 \
++ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+ > $tmpdir/tmp-la
+ mv -f $tmpdir/tmp-la $lib
+ done
+@@ -4031,7 +2712,7 @@
+ fi
+
+ # Exit here if they wanted silent mode.
+- $opt_quiet && exit $EXIT_SUCCESS
++ $opt_silent && exit $EXIT_SUCCESS
+
+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+ echo "----------------------------------------------------------------------"
+@@ -4042,27 +2723,27 @@
+ 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 "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 " - 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 " - 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"
++ $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'"
++ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ fi
+ echo
+
+@@ -4081,20 +2762,18 @@
+ exit $EXIT_SUCCESS
+ }
+
+-test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
++test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+
+
+ # func_mode_install arg...
+ func_mode_install ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ # There may be an optional sh(1) argument at the beginning of
+ # install_prog (especially on Windows NT).
+- if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
++ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ # Allow the use of GNU shtool's install command.
+- case $nonopt in *shtool*) :;; *) false;; esac
+- then
++ case $nonopt in *shtool*) :;; *) false;; esac; then
+ # Aesthetically quote it.
+ func_quote_for_eval "$nonopt"
+ install_prog="$func_quote_for_eval_result "
+@@ -4121,7 +2800,7 @@
+ opts=
+ prev=
+ install_type=
+- isdir=false
++ isdir=no
+ stripme=
+ no_mode=:
+ for arg
+@@ -4134,7 +2813,7 @@
+ fi
+
+ case $arg in
+- -d) isdir=: ;;
++ -d) isdir=yes ;;
+ -f)
+ if $install_cp; then :; else
+ prev=$arg
+@@ -4152,7 +2831,7 @@
+ *)
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
+- if test X-m = "X$prev" && test -n "$install_override_mode"; then
++ if test "x$prev" = x-m && test -n "$install_override_mode"; then
+ arg2=$install_override_mode
+ no_mode=false
+ fi
+@@ -4177,7 +2856,7 @@
+ func_fatal_help "you must specify an install program"
+
+ test -n "$prev" && \
+- func_fatal_help "the '$prev' option requires an argument"
++ func_fatal_help "the \`$prev' option requires an argument"
+
+ if test -n "$install_override_mode" && $no_mode; then
+ if $install_cp; then :; else
+@@ -4199,19 +2878,19 @@
+ dest=$func_stripname_result
+
+ # Check to see that the destination is a directory.
+- test -d "$dest" && isdir=:
+- if $isdir; then
+- destdir=$dest
++ test -d "$dest" && isdir=yes
++ if test "$isdir" = yes; then
++ destdir="$dest"
+ destname=
+ else
+ func_dirname_and_basename "$dest" "" "."
+- destdir=$func_dirname_result
+- destname=$func_basename_result
++ destdir="$func_dirname_result"
++ destname="$func_basename_result"
+
+ # Not a directory, so check to see that there is only one file specified.
+ set dummy $files; shift
+ test "$#" -gt 1 && \
+- func_fatal_help "'$dest' is not a directory"
++ func_fatal_help "\`$dest' is not a directory"
+ fi
+ case $destdir in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+@@ -4220,7 +2899,7 @@
+ case $file in
+ *.lo) ;;
+ *)
+- func_fatal_help "'$destdir' must be an absolute directory name"
++ func_fatal_help "\`$destdir' must be an absolute directory name"
+ ;;
+ esac
+ done
+@@ -4229,7 +2908,7 @@
+
+ # This variable tells wrapper scripts just to set variables rather
+ # than running their programs.
+- libtool_install_magic=$magic
++ libtool_install_magic="$magic"
+
+ staticlibs=
+ future_libdirs=
+@@ -4249,7 +2928,7 @@
+
+ # 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"
++ || func_fatal_help "\`$file' is not a valid libtool archive"
+
+ library_names=
+ old_library=
+@@ -4271,7 +2950,7 @@
+ fi
+
+ func_dirname "$file" "/" ""
+- dir=$func_dirname_result
++ dir="$func_dirname_result"
+ func_append dir "$objdir"
+
+ if test -n "$relink_command"; then
+@@ -4285,7 +2964,7 @@
+ # are installed into $libdir/../bin (currently, that works fine)
+ # but it's something to keep an eye on.
+ test "$inst_prefix_dir" = "$destdir" && \
+- func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
++ func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+@@ -4294,36 +2973,29 @@
+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ fi
+
+- func_warning "relinking '$file'"
++ func_warning "relinking \`$file'"
+ func_show_eval "$relink_command" \
+- 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
++ 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+ fi
+
+ # See the names of the shared library.
+ set dummy $library_names; shift
+ if test -n "$1"; then
+- realname=$1
++ realname="$1"
+ shift
+
+- srcname=$realname
+- test -n "$relink_command" && srcname=${realname}T
++ srcname="$realname"
++ test -n "$relink_command" && srcname="$realname"T
+
+ # Install the shared library and build the symlinks.
+ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+ 'exit $?'
+- tstripme=$stripme
++ tstripme="$stripme"
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ case $realname in
+ *.dll.a)
+- tstripme=
+- ;;
+- esac
+- ;;
+- os2*)
+- case $realname in
+- *_dll.a)
+- tstripme=
++ tstripme=""
+ ;;
+ esac
+ ;;
+@@ -4334,7 +3006,7 @@
+
+ if test "$#" -gt 0; then
+ # Delete the old symlinks, and create new ones.
+- # Try 'ln -sf' first, because the 'ln' binary might depend on
++ # Try `ln -sf' first, because the `ln' binary might depend on
+ # the symlink we replace! Solaris /bin/ln does not understand -f,
+ # so we also need to try rm && ln -s.
+ for linkname
+@@ -4345,14 +3017,14 @@
+ fi
+
+ # Do each command in the postinstall commands.
+- lib=$destdir/$realname
++ lib="$destdir/$realname"
+ func_execute_cmds "$postinstall_cmds" 'exit $?'
+ fi
+
+ # Install the pseudo-library for information purposes.
+ func_basename "$file"
+- name=$func_basename_result
+- instname=$dir/${name}i
++ name="$func_basename_result"
++ instname="$dir/$name"i
+ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+ # Maybe install the static library, too.
+@@ -4364,11 +3036,11 @@
+
+ # Figure out destination file name, if it wasn't already specified.
+ if test -n "$destname"; then
+- destfile=$destdir/$destname
++ destfile="$destdir/$destname"
+ else
+ func_basename "$file"
+- destfile=$func_basename_result
+- destfile=$destdir/$destfile
++ destfile="$func_basename_result"
++ destfile="$destdir/$destfile"
+ fi
+
+ # Deduce the name of the destination old-style object file.
+@@ -4378,11 +3050,11 @@
+ staticdest=$func_lo2o_result
+ ;;
+ *.$objext)
+- staticdest=$destfile
++ staticdest="$destfile"
+ destfile=
+ ;;
+ *)
+- func_fatal_help "cannot copy a libtool object to '$destfile'"
++ func_fatal_help "cannot copy a libtool object to \`$destfile'"
+ ;;
+ esac
+
+@@ -4391,7 +3063,7 @@
+ func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+ # Install the old object if enabled.
+- if test yes = "$build_old_libs"; then
++ if test "$build_old_libs" = yes; then
+ # Deduce the name of the old-style object file.
+ func_lo2o "$file"
+ staticobj=$func_lo2o_result
+@@ -4403,23 +3075,23 @@
+ *)
+ # Figure out destination file name, if it wasn't already specified.
+ if test -n "$destname"; then
+- destfile=$destdir/$destname
++ destfile="$destdir/$destname"
+ else
+ func_basename "$file"
+- destfile=$func_basename_result
+- destfile=$destdir/$destfile
++ destfile="$func_basename_result"
++ destfile="$destdir/$destfile"
+ fi
+
+ # If the file is missing, and there is a .exe on the end, strip it
+ # because it is most likely a libtool script we actually want to
+ # install
+- stripped_ext=
++ stripped_ext=""
+ case $file in
+ *.exe)
+ if test ! -f "$file"; then
+ func_stripname '' '.exe' "$file"
+ file=$func_stripname_result
+- stripped_ext=.exe
++ stripped_ext=".exe"
+ fi
+ ;;
+ esac
+@@ -4447,19 +3119,19 @@
+
+ # Check the variables that should have been set.
+ test -z "$generated_by_libtool_version" && \
+- func_fatal_error "invalid libtool wrapper script '$wrapper'"
++ func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+
+- finalize=:
++ finalize=yes
+ for lib in $notinst_deplibs; do
+ # Check to see that each library is installed.
+ libdir=
+ if test -f "$lib"; then
+ func_source "$lib"
+ fi
+- libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
++ libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ if test -n "$libdir" && test ! -f "$libfile"; then
+- func_warning "'$lib' has not been installed in '$libdir'"
+- finalize=false
++ func_warning "\`$lib' has not been installed in \`$libdir'"
++ finalize=no
+ fi
+ done
+
+@@ -4467,29 +3139,29 @@
+ func_source "$wrapper"
+
+ outputname=
+- if test no = "$fast_install" && test -n "$relink_command"; then
++ if test "$fast_install" = no && test -n "$relink_command"; then
+ $opt_dry_run || {
+- if $finalize; then
++ if test "$finalize" = yes; then
+ tmpdir=`func_mktempdir`
+ func_basename "$file$stripped_ext"
+- file=$func_basename_result
+- outputname=$tmpdir/$file
++ file="$func_basename_result"
++ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+- $opt_quiet || {
++ $opt_silent || {
+ func_quote_for_expand "$relink_command"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+ if eval "$relink_command"; then :
+ else
+- func_error "error: relink '$file' with the above command before installing it"
++ func_error "error: relink \`$file' with the above command before installing it"
+ $opt_dry_run || ${RM}r "$tmpdir"
+ continue
+ fi
+- file=$outputname
++ file="$outputname"
+ else
+- func_warning "cannot relink '$file'"
++ func_warning "cannot relink \`$file'"
+ fi
+ }
+ else
+@@ -4526,10 +3198,10 @@
+
+ for file in $staticlibs; do
+ func_basename "$file"
+- name=$func_basename_result
++ name="$func_basename_result"
+
+ # Set up the ranlib parameters.
+- oldlib=$destdir/$name
++ oldlib="$destdir/$name"
+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+ tool_oldlib=$func_to_tool_file_result
+
+@@ -4544,18 +3216,18 @@
+ done
+
+ test -n "$future_libdirs" && \
+- func_warning "remember to run '$progname --finish$future_libdirs'"
++ func_warning "remember to run \`$progname --finish$future_libdirs'"
+
+ 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'
++ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ else
+ exit $EXIT_SUCCESS
+ fi
+ }
+
+-test install = "$opt_mode" && func_mode_install ${1+"$@"}
++test "$opt_mode" = install && func_mode_install ${1+"$@"}
+
+
+ # func_generate_dlsyms outputname originator pic_p
+@@ -4563,17 +3235,16 @@
+ # a dlpreopen symbol table.
+ func_generate_dlsyms ()
+ {
+- $debug_cmd
+-
+- my_outputname=$1
+- my_originator=$2
+- my_pic_p=${3-false}
+- my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
++ $opt_debug
++ my_outputname="$1"
++ my_originator="$2"
++ my_pic_p="${3-no}"
++ my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+ my_dlsyms=
+
+- if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$NM" && test -n "$global_symbol_pipe"; then
+- my_dlsyms=${my_outputname}S.c
++ my_dlsyms="${my_outputname}S.c"
+ else
+ func_error "not configured to extract global symbols from dlpreopened files"
+ fi
+@@ -4584,7 +3255,7 @@
+ "") ;;
+ *.c)
+ # Discover the nlist of each of the dlfiles.
+- nlist=$output_objdir/$my_outputname.nm
++ nlist="$output_objdir/${my_outputname}.nm"
+
+ func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+@@ -4592,36 +3263,34 @@
+ func_verbose "creating $output_objdir/$my_dlsyms"
+
+ $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+-/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+-/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
++/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
++/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+
+ #ifdef __cplusplus
+ extern \"C\" {
+ #endif
+
+-#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
++#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+ #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 can't be const, because runtime
++#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__
++#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
+
+-#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+-
+ /* External symbol declarations for the compiler. */\
+ "
+
+- if test yes = "$dlself"; then
+- func_verbose "generating symbol list for '$output'"
++ if test "$dlself" = yes; then
++ func_verbose "generating symbol list for \`$output'"
+
+ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+@@ -4629,7 +3298,7 @@
+ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ for progfile in $progfiles; do
+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+- func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
++ 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
+
+@@ -4649,10 +3318,10 @@
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+- export_symbols=$output_objdir/$outputname.exp
++ export_symbols="$output_objdir/$outputname.exp"
+ $opt_dry_run || {
+ $RM $export_symbols
+- eval "$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* )
+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+@@ -4662,7 +3331,7 @@
+ }
+ else
+ $opt_dry_run || {
+- eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++ 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
+@@ -4676,22 +3345,22 @@
+ fi
+
+ for dlprefile in $dlprefiles; do
+- func_verbose "extracting global C symbols from '$dlprefile'"
++ func_verbose "extracting global C symbols from \`$dlprefile'"
+ func_basename "$dlprefile"
+- name=$func_basename_result
++ name="$func_basename_result"
+ 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=
++ 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
++ if test -n "$dlprefile_dlname" ; then
+ func_basename "$dlprefile_dlname"
+- dlprefile_dlbasename=$func_basename_result
++ dlprefile_dlbasename="$func_basename_result"
+ else
+ # no lafile. user explicitly requested -dlpreopen <import library>.
+ $sharedlib_from_linklib_cmd "$dlprefile"
+@@ -4699,7 +3368,7 @@
+ fi
+ fi
+ $opt_dry_run || {
+- if test -n "$dlprefile_dlbasename"; then
++ if test -n "$dlprefile_dlbasename" ; then
+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+ else
+ func_warning "Could not compute DLL name from $name"
+@@ -4755,11 +3424,6 @@
+ echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+ fi
+
+- func_show_eval '$RM "${nlist}I"'
+- if test -n "$global_symbol_to_import"; then
+- eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+- fi
+-
+ echo >> "$output_objdir/$my_dlsyms" "\
+
+ /* The mapping between symbol names and symbols. */
+@@ -4768,30 +3432,11 @@
+ void *address;
+ } lt_dlsymlist;
+ extern LT_DLSYM_CONST lt_dlsymlist
+-lt_${my_prefix}_LTX_preloaded_symbols[];\
+-"
+-
+- if test -s "$nlist"I; then
+- echo >> "$output_objdir/$my_dlsyms" "\
+-static void lt_syminit(void)
+-{
+- LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+- for (; symbol->name; ++symbol)
+- {"
+- $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+- echo >> "$output_objdir/$my_dlsyms" "\
+- }
+-}"
+- fi
+- echo >> "$output_objdir/$my_dlsyms" "\
++lt_${my_prefix}_LTX_preloaded_symbols[];
+ LT_DLSYM_CONST lt_dlsymlist
+ lt_${my_prefix}_LTX_preloaded_symbols[] =
+-{ {\"$my_originator\", (void *) 0},"
+-
+- if test -s "$nlist"I; then
+- echo >> "$output_objdir/$my_dlsyms" "\
+- {\"@INIT@\", (void *) <_syminit},"
+- fi
++{\
++ { \"$my_originator\", (void *) 0 },"
+
+ case $need_lib_prefix in
+ no)
+@@ -4833,7 +3478,9 @@
+ *-*-hpux*)
+ pic_flag_for_symtable=" $pic_flag" ;;
+ *)
+- $my_pic_p && pic_flag_for_symtable=" $pic_flag"
++ if test "X$my_pic_p" != Xno; then
++ pic_flag_for_symtable=" $pic_flag"
++ fi
+ ;;
+ esac
+ ;;
+@@ -4850,10 +3497,10 @@
+ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+ # Clean up the generated files.
+- func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
++ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+
+ # Transform the symbol file into the correct name.
+- symfileobj=$output_objdir/${my_outputname}S.$objext
++ symfileobj="$output_objdir/${my_outputname}S.$objext"
+ case $host in
+ *cygwin* | *mingw* | *cegcc* )
+ if test -f "$output_objdir/$my_outputname.def"; then
+@@ -4871,7 +3518,7 @@
+ esac
+ ;;
+ *)
+- func_fatal_error "unknown suffix for '$my_dlsyms'"
++ func_fatal_error "unknown suffix for \`$my_dlsyms'"
+ ;;
+ esac
+ else
+@@ -4885,32 +3532,6 @@
+ fi
+ }
+
+-# 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 ()
+-{
+- $debug_cmd
+-
+- 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 ()
+-{
+- $debug_cmd
+-
+- 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_win32_libid arg
+ # return the library type of file 'arg'
+ #
+@@ -4920,9 +3541,8 @@
+ # Despite the name, also deal with 64 bit binaries.
+ func_win32_libid ()
+ {
+- $debug_cmd
+-
+- win32_libid_type=unknown
++ $opt_debug
++ win32_libid_type="unknown"
+ win32_fileres=`file -L $1 2>/dev/null`
+ case $win32_fileres in
+ *ar\ archive\ import\ library*) # definitely import
+@@ -4932,29 +3552,16 @@
+ # 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
+- case $nm_interface in
+- "MS dumpbin")
+- if func_cygming_ms_implib_p "$1" ||
+- func_cygming_gnu_implib_p "$1"
+- then
+- win32_nmres=import
+- else
+- win32_nmres=
+- fi
+- ;;
+- *)
+- 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 '
++ 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 /{
+- s|.*|import|
++ s,.*,import,
+ p
+ q
+ }
+ }'`
+- ;;
+- esac
+ case $win32_nmres in
+ import*) win32_libid_type="x86 archive import";;
+ *) win32_libid_type="x86 archive static";;
+@@ -4986,8 +3593,7 @@
+ # $sharedlib_from_linklib_result
+ func_cygming_dll_for_implib ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+ }
+
+@@ -5004,8 +3610,7 @@
+ # specified import library.
+ func_cygming_dll_for_implib_fallback_core ()
+ {
+- $debug_cmd
+-
++ $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"':/{
+@@ -5041,8 +3646,8 @@
+ /./p' |
+ # we now have a list, one entry per line, of the stringified
+ # contents of the appropriate section of all members of the
+- # archive that possess that section. Heuristic: eliminate
+- # all those that have a first or second character that is
++ # 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
+@@ -5053,6 +3658,30 @@
+ $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
+@@ -5066,17 +3695,16 @@
+ # $sharedlib_from_linklib_result
+ func_cygming_dll_for_implib_fallback ()
+ {
+- $debug_cmd
+-
+- if func_cygming_gnu_implib_p "$1"; then
++ $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
++ 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=
++ sharedlib_from_linklib_result=""
+ fi
+ }
+
+@@ -5084,11 +3712,10 @@
+ # func_extract_an_archive dir oldlib
+ func_extract_an_archive ()
+ {
+- $debug_cmd
+-
+- f_ex_an_ar_dir=$1; shift
+- f_ex_an_ar_oldlib=$1
+- if test yes = "$lock_old_archive_extraction"; then
++ $opt_debug
++ f_ex_an_ar_dir="$1"; shift
++ f_ex_an_ar_oldlib="$1"
++ if test "$lock_old_archive_extraction" = yes; then
+ lockfile=$f_ex_an_ar_oldlib.lock
+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+ func_echo "Waiting for $lockfile to be removed"
+@@ -5097,7 +3724,7 @@
+ fi
+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+ 'stat=$?; rm -f "$lockfile"; exit $stat'
+- if test yes = "$lock_old_archive_extraction"; then
++ if test "$lock_old_archive_extraction" = yes; then
+ $opt_dry_run || rm -f "$lockfile"
+ fi
+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+@@ -5111,23 +3738,22 @@
+ # func_extract_archives gentop oldlib ...
+ func_extract_archives ()
+ {
+- $debug_cmd
+-
+- my_gentop=$1; shift
++ $opt_debug
++ my_gentop="$1"; shift
+ my_oldlibs=${1+"$@"}
+- my_oldobjs=
+- my_xlib=
+- my_xabs=
+- my_xdir=
++ my_oldobjs=""
++ my_xlib=""
++ my_xabs=""
++ my_xdir=""
+
+ for my_xlib in $my_oldlibs; do
+ # Extract the objects.
+ case $my_xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
++ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+ *) my_xabs=`pwd`"/$my_xlib" ;;
+ esac
+ func_basename "$my_xlib"
+- my_xlib=$func_basename_result
++ my_xlib="$func_basename_result"
+ my_xlib_u=$my_xlib
+ while :; do
+ case " $extracted_archives " in
+@@ -5139,7 +3765,7 @@
+ esac
+ done
+ extracted_archives="$extracted_archives $my_xlib_u"
+- my_xdir=$my_gentop/$my_xlib_u
++ my_xdir="$my_gentop/$my_xlib_u"
+
+ func_mkdir_p "$my_xdir"
+
+@@ -5152,23 +3778,22 @@
+ cd $my_xdir || exit $?
+ darwin_archive=$my_xabs
+ darwin_curdir=`pwd`
+- func_basename "$darwin_archive"
+- darwin_base_archive=$func_basename_result
++ darwin_base_archive=`basename "$darwin_archive"`
+ darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+ if test -n "$darwin_arches"; then
+ darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+ darwin_arch=
+ func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+- for darwin_arch in $darwin_arches; do
+- func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+- $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+- cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+- func_extract_an_archive "`pwd`" "$darwin_base_archive"
++ for darwin_arch in $darwin_arches ; do
++ func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+ cd "$darwin_curdir"
+- $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
++ $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+ done # $darwin_arches
+ ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
++ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+ darwin_file=
+ darwin_files=
+ for darwin_file in $darwin_filelist; do
+@@ -5190,7 +3815,7 @@
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+ done
+
+- func_extract_archives_result=$my_oldobjs
++ func_extract_archives_result="$my_oldobjs"
+ }
+
+
+@@ -5205,7 +3830,7 @@
+ #
+ # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+ # variable will take. If 'yes', then the emitted script
+-# will assume that the directory where it is stored is
++# will assume that the directory in which it is stored is
+ # the $objdir directory. This is a cygwin/mingw-specific
+ # behavior.
+ func_emit_wrapper ()
+@@ -5216,7 +3841,7 @@
+ #! $SHELL
+
+ # $output - temporary wrapper script for $objdir/$outputname
+-# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ #
+ # The $output program cannot be directly executed until all the libtool
+ # libraries that it depends on are installed.
+@@ -5273,9 +3898,9 @@
+
+ # Very basic option parsing. These options are (a) specific to
+ # the libtool wrapper, (b) are identical between the wrapper
+-# /script/ and the wrapper /executable/ that is used only on
++# /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 that match
++# (application programs are unlikely to have options which match
+ # this pattern).
+ #
+ # There are only two supported options: --lt-debug and
+@@ -5308,7 +3933,7 @@
+
+ # Print the debug banner immediately:
+ if test -n \"\$lt_option_debug\"; then
+- echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
++ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+ fi
+ }
+
+@@ -5319,7 +3944,7 @@
+ lt_dump_args_N=1;
+ for lt_arg
+ do
+- \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+ done
+ }
+@@ -5333,7 +3958,7 @@
+ *-*-mingw | *-*-os2* | *-cegcc*)
+ $ECHO "\
+ if test -n \"\$lt_option_debug\"; then
+- \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+ func_lt_dump_args \${1+\"\$@\"} 1>&2
+ fi
+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+@@ -5343,7 +3968,7 @@
+ *)
+ $ECHO "\
+ if test -n \"\$lt_option_debug\"; then
+- \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+ func_lt_dump_args \${1+\"\$@\"} 1>&2
+ fi
+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+@@ -5418,13 +4043,13 @@
+ test -n \"\$absdir\" && thisdir=\"\$absdir\"
+ "
+
+- if test yes = "$fast_install"; then
++ if test "$fast_install" = yes; then
+ $ECHO "\
+ program=lt-'$outputname'$exeext
+ progdir=\"\$thisdir/$objdir\"
+
+ if test ! -f \"\$progdir/\$program\" ||
+- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
++ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+ test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+ file=\"\$\$-\$program\"
+@@ -5441,7 +4066,7 @@
+ if test -n \"\$relink_command\"; then
+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+ else
+- \$ECHO \"\$relink_command_output\" >&2
++ $ECHO \"\$relink_command_output\" >&2
+ $RM \"\$progdir/\$file\"
+ exit 1
+ fi
+@@ -5476,7 +4101,7 @@
+ fi
+
+ # Export our shlibpath_var if we have one.
+- if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ $ECHO "\
+ # Add our own library path to $shlibpath_var
+ $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+@@ -5496,7 +4121,7 @@
+ fi
+ else
+ # The program doesn't exist.
+- \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
++ \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+ \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+ exit 1
+@@ -5515,7 +4140,7 @@
+ cat <<EOF
+
+ /* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+- Generated by $PROGRAM (GNU $PACKAGE) $VERSION
++ Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+
+ The $output program cannot be directly executed until all the libtool
+ libraries that it depends on are installed.
+@@ -5550,45 +4175,47 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+
+-#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+-
+ /* declarations of non-ANSI functions */
+-#if defined __MINGW32__
++#if defined(__MINGW32__)
+ # ifdef __STRICT_ANSI__
+ int _putenv (const char *);
+ # endif
+-#elif defined __CYGWIN__
++#elif defined(__CYGWIN__)
+ # ifdef __STRICT_ANSI__
+ char *realpath (const char *, char *);
+ int putenv (char *);
+ int setenv (const char *, const char *, int);
+ # endif
+-/* #elif defined other_platform || defined ... */
++/* #elif defined (other platforms) ... */
+ #endif
+
+ /* portability defines, excluding path handling macros */
+-#if defined _MSC_VER
++#if defined(_MSC_VER)
+ # define setmode _setmode
+ # define stat _stat
+ # define chmod _chmod
+ # define getcwd _getcwd
+ # define putenv _putenv
+ # define S_IXUSR _S_IEXEC
+-#elif defined __MINGW32__
++# ifndef _INTPTR_T_DEFINED
++# define _INTPTR_T_DEFINED
++# define intptr_t int
++# endif
++#elif defined(__MINGW32__)
+ # define setmode _setmode
+ # define stat _stat
+ # define chmod _chmod
+ # define getcwd _getcwd
+ # define putenv _putenv
+-#elif defined __CYGWIN__
++#elif defined(__CYGWIN__)
+ # define HAVE_SETENV
+ # define FOPEN_WB "wb"
+-/* #elif defined other platforms ... */
++/* #elif defined (other platforms) ... */
+ #endif
+
+-#if defined PATH_MAX
++#if defined(PATH_MAX)
+ # define LT_PATHMAX PATH_MAX
+-#elif defined MAXPATHLEN
++#elif defined(MAXPATHLEN)
+ # define LT_PATHMAX MAXPATHLEN
+ #else
+ # define LT_PATHMAX 1024
+@@ -5607,8 +4234,8 @@
+ # define PATH_SEPARATOR ':'
+ #endif
+
+-#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+- defined __OS2__
++#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
++ defined (__OS2__)
+ # define HAVE_DOS_BASED_FILE_SYSTEM
+ # define FOPEN_WB "wb"
+ # ifndef DIR_SEPARATOR_2
+@@ -5641,10 +4268,10 @@
+
+ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
+ #define XFREE(stale) do { \
+- if (stale) { free (stale); stale = 0; } \
++ if (stale) { free ((void *) stale); stale = 0; } \
+ } while (0)
+
+-#if defined LT_DEBUGWRAPPER
++#if defined(LT_DEBUGWRAPPER)
+ static int lt_debug = 1;
+ #else
+ static int lt_debug = 0;
+@@ -5673,16 +4300,11 @@
+ EOF
+
+ cat <<EOF
+-#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+-# define externally_visible volatile
+-#else
+-# define externally_visible __attribute__((externally_visible)) volatile
+-#endif
+-externally_visible const char * MAGIC_EXE = "$magic_exe";
++volatile const char * MAGIC_EXE = "$magic_exe";
+ const char * LIB_PATH_VARNAME = "$shlibpath_var";
+ EOF
+
+- if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ func_to_host_path "$temp_rpath"
+ cat <<EOF
+ const char * LIB_PATH_VALUE = "$func_to_host_path_result";
+@@ -5706,7 +4328,7 @@
+ EOF
+ fi
+
+- if test yes = "$fast_install"; then
++ if test "$fast_install" = yes; then
+ cat <<EOF
+ const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+ EOF
+@@ -5735,12 +4357,12 @@
+ char *actual_cwrapper_name;
+ char *target_name;
+ char *lt_argv_zero;
+- int rval = 127;
++ intptr_t rval = 127;
+
+ int i;
+
+ program_name = (char *) xstrdup (base_name (argv[0]));
+- newargz = XMALLOC (char *, (size_t) argc + 1);
++ newargz = XMALLOC (char *, argc + 1);
+
+ /* very simple arg parsing; don't want to rely on getopt
+ * also, copy all non cwrapper options to newargz, except
+@@ -5749,10 +4371,10 @@
+ newargc=0;
+ for (i = 1; i < argc; i++)
+ {
+- if (STREQ (argv[i], dumpscript_opt))
++ if (strcmp (argv[i], dumpscript_opt) == 0)
+ {
+ EOF
+- case $host in
++ case "$host" in
+ *mingw* | *cygwin* )
+ # make stdout use "unix" line endings
+ echo " setmode(1,_O_BINARY);"
+@@ -5763,12 +4385,12 @@
+ lt_dump_script (stdout);
+ return 0;
+ }
+- if (STREQ (argv[i], debug_opt))
++ if (strcmp (argv[i], debug_opt) == 0)
+ {
+ lt_debug = 1;
+ continue;
+ }
+- if (STREQ (argv[i], ltwrapper_option_prefix))
++ 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
+@@ -5791,7 +4413,7 @@
+ EOF
+ cat <<EOF
+ /* The GNU banner must be the first non-error debug message */
+- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
++ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+ EOF
+ cat <<"EOF"
+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+@@ -5902,7 +4524,7 @@
+ cat <<"EOF"
+ /* execv doesn't actually work on mingw as expected on unix */
+ newargz = prepare_spawn (newargz);
+- rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
++ rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+ if (rval == -1)
+ {
+ /* failed to start process */
+@@ -5947,7 +4569,7 @@
+ {
+ const char *base;
+
+-#if defined HAVE_DOS_BASED_FILE_SYSTEM
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ /* Skip over the disk name in MSDOS pathnames. */
+ if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+ name += 2;
+@@ -6006,7 +4628,7 @@
+ const char *p_next;
+ /* static buffer for getcwd */
+ char tmp[LT_PATHMAX + 1];
+- size_t tmp_len;
++ int tmp_len;
+ char *concat_name;
+
+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+@@ -6016,7 +4638,7 @@
+ return NULL;
+
+ /* Absolute path? */
+-#if defined HAVE_DOS_BASED_FILE_SYSTEM
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+ {
+ concat_name = xstrdup (wrapper);
+@@ -6034,7 +4656,7 @@
+ return concat_name;
+ XFREE (concat_name);
+ }
+-#if defined HAVE_DOS_BASED_FILE_SYSTEM
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ }
+ #endif
+
+@@ -6057,7 +4679,7 @@
+ for (q = p; *q; q++)
+ if (IS_PATH_SEPARATOR (*q))
+ break;
+- p_len = (size_t) (q - p);
++ p_len = q - p;
+ p_next = (*q == '\0' ? q : q + 1);
+ if (p_len == 0)
+ {
+@@ -6176,7 +4798,7 @@
+ if (patlen <= len)
+ {
+ str += len - patlen;
+- if (STREQ (str, pat))
++ if (strcmp (str, pat) == 0)
+ *str = '\0';
+ }
+ return str;
+@@ -6241,7 +4863,7 @@
+ char *str = xstrdup (value);
+ setenv (name, str, 1);
+ #else
+- size_t len = strlen (name) + 1 + strlen (value) + 1;
++ int len = strlen (name) + 1 + strlen (value) + 1;
+ char *str = XMALLOC (char, len);
+ sprintf (str, "%s=%s", name, value);
+ if (putenv (str) != EXIT_SUCCESS)
+@@ -6258,8 +4880,8 @@
+ char *new_value;
+ if (orig_value && *orig_value)
+ {
+- size_t orig_value_len = strlen (orig_value);
+- size_t add_len = strlen (add);
++ int orig_value_len = strlen (orig_value);
++ int add_len = strlen (add);
+ new_value = XMALLOC (char, add_len + orig_value_len + 1);
+ if (to_end)
+ {
+@@ -6290,10 +4912,10 @@
+ {
+ char *new_value = lt_extend_str (getenv (name), value, 0);
+ /* some systems can't cope with a ':'-terminated path #' */
+- size_t len = strlen (new_value);
+- while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
++ int len = strlen (new_value);
++ while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+ {
+- new_value[--len] = '\0';
++ new_value[len-1] = '\0';
+ }
+ lt_setenv (name, new_value);
+ XFREE (new_value);
+@@ -6460,47 +5082,27 @@
+ # True if ARG is an import lib, as indicated by $file_magic_cmd
+ func_win32_import_lib_p ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+ *import*) : ;;
+ *) false ;;
+ esac
+ }
+
+-# func_suncc_cstd_abi
+-# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+-# Several compiler flags select an ABI that is incompatible with the
+-# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+-func_suncc_cstd_abi ()
+-{
+- $debug_cmd
+-
+- case " $compile_command " in
+- *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+- suncc_use_cstd_abi=no
+- ;;
+- *)
+- suncc_use_cstd_abi=yes
+- ;;
+- esac
+-}
+-
+ # func_mode_link arg...
+ func_mode_link ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ # It is impossible to link a dll without this setting, and
+ # we shouldn't force the makefile maintainer to figure out
+- # what system we are compiling for in order to pass an extra
++ # which system we are compiling for in order to pass an extra
+ # flag for every libtool invocation.
+ # allow_undefined=no
+
+ # FIXME: Unfortunately, there are problems with the above when trying
+- # to make a dll that has undefined symbols, in which case not
++ # to make a dll which has undefined symbols, in which case not
+ # even a static library is built. For now, we need to specify
+ # -no-undefined on the libtool link line when we can be certain
+ # that all symbols are satisfied, otherwise we get a static library.
+@@ -6544,11 +5146,10 @@
+ module=no
+ no_install=no
+ objs=
+- os2dllname=
+ non_pic_objects=
+ precious_files_regex=
+ prefer_static_libs=no
+- preload=false
++ preload=no
+ prev=
+ prevarg=
+ release=
+@@ -6560,7 +5161,7 @@
+ vinfo=
+ vinfo_number=no
+ weak_libs=
+- single_module=$wl-single_module
++ single_module="${wl}-single_module"
+ func_infer_tag $base_compile
+
+ # We need to know -static, to get the right output filenames.
+@@ -6568,15 +5169,15 @@
+ do
+ case $arg in
+ -shared)
+- test yes != "$build_libtool_libs" \
+- && func_fatal_configuration "cannot build a shared library"
++ test "$build_libtool_libs" != yes && \
++ func_fatal_configuration "can not build a shared library"
+ build_old_libs=no
+ break
+ ;;
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+ -all-static)
+- if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
++ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ func_warning "complete static linking is impossible in this configuration"
+ fi
+ if test -n "$link_static_flag"; then
+@@ -6609,7 +5210,7 @@
+
+ # Go through the arguments, transforming them on the way.
+ while test "$#" -gt 0; do
+- arg=$1
++ arg="$1"
+ shift
+ func_quote_for_eval "$arg"
+ qarg=$func_quote_for_eval_unquoted_result
+@@ -6626,21 +5227,21 @@
+
+ case $prev in
+ bindir)
+- bindir=$arg
++ bindir="$arg"
+ prev=
+ continue
+ ;;
+ dlfiles|dlprefiles)
+- $preload || {
++ if test "$preload" = no; then
+ # Add the symbol object into the linking commands.
+ func_append compile_command " @SYMFILE@"
+ func_append finalize_command " @SYMFILE@"
+- preload=:
+- }
++ preload=yes
++ fi
+ case $arg in
+ *.la | *.lo) ;; # We handle these cases below.
+ force)
+- if test no = "$dlself"; then
++ if test "$dlself" = no; then
+ dlself=needless
+ export_dynamic=yes
+ fi
+@@ -6648,9 +5249,9 @@
+ continue
+ ;;
+ self)
+- if test dlprefiles = "$prev"; then
++ if test "$prev" = dlprefiles; then
+ dlself=yes
+- elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
++ elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+ dlself=yes
+ else
+ dlself=needless
+@@ -6660,7 +5261,7 @@
+ continue
+ ;;
+ *)
+- if test dlfiles = "$prev"; then
++ if test "$prev" = dlfiles; then
+ func_append dlfiles " $arg"
+ else
+ func_append dlprefiles " $arg"
+@@ -6671,14 +5272,14 @@
+ esac
+ ;;
+ expsyms)
+- export_symbols=$arg
++ export_symbols="$arg"
+ test -f "$arg" \
+- || func_fatal_error "symbol file '$arg' does not exist"
++ || func_fatal_error "symbol file \`$arg' does not exist"
+ prev=
+ continue
+ ;;
+ expsyms_regex)
+- export_symbols_regex=$arg
++ export_symbols_regex="$arg"
+ prev=
+ continue
+ ;;
+@@ -6696,13 +5297,7 @@
+ continue
+ ;;
+ inst_prefix)
+- inst_prefix_dir=$arg
+- prev=
+- continue
+- ;;
+- mllvm)
+- # Clang does not use LLVM to link, so we can simply discard any
+- # '-mllvm $arg' options when doing the link step.
++ inst_prefix_dir="$arg"
+ prev=
+ continue
+ ;;
+@@ -6726,21 +5321,21 @@
+
+ if test -z "$pic_object" ||
+ test -z "$non_pic_object" ||
+- test none = "$pic_object" &&
+- test none = "$non_pic_object"; then
+- func_fatal_error "cannot find name of object for '$arg'"
++ test "$pic_object" = none &&
++ test "$non_pic_object" = none; then
++ func_fatal_error "cannot find name of object for \`$arg'"
+ fi
+
+ # Extract subdirectory from the argument.
+ func_dirname "$arg" "/" ""
+- xdir=$func_dirname_result
++ xdir="$func_dirname_result"
+
+- if test none != "$pic_object"; then
++ if test "$pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+- pic_object=$xdir$pic_object
++ pic_object="$xdir$pic_object"
+
+- if test dlfiles = "$prev"; then
+- if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
++ if test "$prev" = dlfiles; then
++ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ func_append dlfiles " $pic_object"
+ prev=
+ continue
+@@ -6751,7 +5346,7 @@
+ fi
+
+ # CHECK ME: I think I busted this. -Ossama
+- if test dlprefiles = "$prev"; then
++ if test "$prev" = dlprefiles; then
+ # Preload the old-style object.
+ func_append dlprefiles " $pic_object"
+ prev=
+@@ -6759,23 +5354,23 @@
+
+ # A PIC object.
+ func_append libobjs " $pic_object"
+- arg=$pic_object
++ arg="$pic_object"
+ fi
+
+ # Non-PIC object.
+- if test none != "$non_pic_object"; then
++ if test "$non_pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+- non_pic_object=$xdir$non_pic_object
++ non_pic_object="$xdir$non_pic_object"
+
+ # A standard non-PIC object
+ func_append non_pic_objects " $non_pic_object"
+- if test -z "$pic_object" || test none = "$pic_object"; then
+- arg=$non_pic_object
++ if test -z "$pic_object" || test "$pic_object" = none ; then
++ arg="$non_pic_object"
+ fi
+ else
+ # If the PIC object exists, use it instead.
+ # $xdir was prepended to $pic_object above.
+- non_pic_object=$pic_object
++ non_pic_object="$pic_object"
+ func_append non_pic_objects " $non_pic_object"
+ fi
+ else
+@@ -6783,7 +5378,7 @@
+ if $opt_dry_run; then
+ # Extract subdirectory from the argument.
+ func_dirname "$arg" "/" ""
+- xdir=$func_dirname_result
++ xdir="$func_dirname_result"
+
+ func_lo2o "$arg"
+ pic_object=$xdir$objdir/$func_lo2o_result
+@@ -6791,29 +5386,24 @@
+ func_append libobjs " $pic_object"
+ func_append non_pic_objects " $non_pic_object"
+ else
+- func_fatal_error "'$arg' is not a valid libtool object"
++ func_fatal_error "\`$arg' is not a valid libtool object"
+ fi
+ fi
+ done
+ else
+- func_fatal_error "link input file '$arg' does not exist"
++ func_fatal_error "link input file \`$arg' does not exist"
+ fi
+ arg=$save_arg
+ prev=
+ continue
+ ;;
+- os2dllname)
+- os2dllname=$arg
+- prev=
+- continue
+- ;;
+ precious_regex)
+- precious_files_regex=$arg
++ precious_files_regex="$arg"
+ prev=
+ continue
+ ;;
+ release)
+- release=-$arg
++ release="-$arg"
+ prev=
+ continue
+ ;;
+@@ -6825,7 +5415,7 @@
+ func_fatal_error "only absolute run-paths are allowed"
+ ;;
+ esac
+- if test rpath = "$prev"; then
++ if test "$prev" = rpath; then
+ case "$rpath " in
+ *" $arg "*) ;;
+ *) func_append rpath " $arg" ;;
+@@ -6840,7 +5430,7 @@
+ continue
+ ;;
+ shrext)
+- shrext_cmds=$arg
++ shrext_cmds="$arg"
+ prev=
+ continue
+ ;;
+@@ -6880,7 +5470,7 @@
+ esac
+ fi # test -n "$prev"
+
+- prevarg=$arg
++ prevarg="$arg"
+
+ case $arg in
+ -all-static)
+@@ -6894,7 +5484,7 @@
+
+ -allow-undefined)
+ # FIXME: remove this flag sometime in the future.
+- func_fatal_error "'-allow-undefined' must not be used because it is the default"
++ func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+ ;;
+
+ -avoid-version)
+@@ -6926,7 +5516,7 @@
+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ func_fatal_error "more than one -exported-symbols argument is not allowed"
+ fi
+- if test X-export-symbols = "X$arg"; then
++ if test "X$arg" = "X-export-symbols"; then
+ prev=expsyms
+ else
+ prev=expsyms_regex
+@@ -6960,9 +5550,9 @@
+ func_stripname "-L" '' "$arg"
+ if test -z "$func_stripname_result"; then
+ if test "$#" -gt 0; then
+- func_fatal_error "require no space between '-L' and '$1'"
++ func_fatal_error "require no space between \`-L' and \`$1'"
+ else
+- func_fatal_error "need path for '-L' option"
++ func_fatal_error "need path for \`-L' option"
+ fi
+ fi
+ func_resolve_sysroot "$func_stripname_result"
+@@ -6973,8 +5563,8 @@
+ *)
+ absdir=`cd "$dir" && pwd`
+ test -z "$absdir" && \
+- func_fatal_error "cannot determine absolute directory name of '$dir'"
+- dir=$absdir
++ func_fatal_error "cannot determine absolute directory name of \`$dir'"
++ dir="$absdir"
+ ;;
+ esac
+ case "$deplibs " in
+@@ -7009,7 +5599,7 @@
+ ;;
+
+ -l*)
+- if test X-lc = "X$arg" || test X-lm = "X$arg"; then
++ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ # These systems don't actually have a C or math library (as such)
+@@ -7017,11 +5607,11 @@
+ ;;
+ *-*-os2*)
+ # These systems don't actually have a C library (as such)
+- test X-lc = "X$arg" && continue
++ test "X$arg" = "X-lc" && continue
+ ;;
+- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc due to us having libc/libc_r.
+- test X-lc = "X$arg" && continue
++ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C and math libraries are in the System framework
+@@ -7030,16 +5620,16 @@
+ ;;
+ *-*-sco3.2v5* | *-*-sco5v6*)
+ # Causes problems with __ctype
+- test X-lc = "X$arg" && continue
++ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+ # Compiler inserts libc in the correct place for threads to work
+- test X-lc = "X$arg" && continue
++ test "X$arg" = "X-lc" && continue
+ ;;
+ esac
+- elif test X-lc_r = "X$arg"; then
++ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -7049,11 +5639,6 @@
+ continue
+ ;;
+
+- -mllvm)
+- prev=mllvm
+- continue
+- ;;
+-
+ -module)
+ module=yes
+ continue
+@@ -7083,7 +5668,7 @@
+ ;;
+
+ -multi_module)
+- single_module=$wl-multi_module
++ single_module="${wl}-multi_module"
+ continue
+ ;;
+
+@@ -7097,8 +5682,8 @@
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+ # The PATH hackery in wrapper scripts is required on Windows
+ # and Darwin in order for the loader to find any dlls it needs.
+- func_warning "'-no-install' is ignored for $host"
+- func_warning "assuming '-no-fast-install' instead"
++ func_warning "\`-no-install' is ignored for $host"
++ func_warning "assuming \`-no-fast-install' instead"
+ fast_install=no
+ ;;
+ *) no_install=yes ;;
+@@ -7116,11 +5701,6 @@
+ continue
+ ;;
+
+- -os2dllname)
+- prev=os2dllname
+- continue
+- ;;
+-
+ -o) prev=output ;;
+
+ -precious-files-regex)
+@@ -7208,14 +5788,14 @@
+ func_stripname '-Wc,' '' "$arg"
+ args=$func_stripname_result
+ arg=
+- save_ifs=$IFS; IFS=,
++ save_ifs="$IFS"; IFS=','
+ for flag in $args; do
+- IFS=$save_ifs
++ IFS="$save_ifs"
+ func_quote_for_eval "$flag"
+ func_append arg " $func_quote_for_eval_result"
+ func_append compiler_flags " $func_quote_for_eval_result"
+ done
+- IFS=$save_ifs
++ IFS="$save_ifs"
+ func_stripname ' ' '' "$arg"
+ arg=$func_stripname_result
+ ;;
+@@ -7224,15 +5804,15 @@
+ func_stripname '-Wl,' '' "$arg"
+ args=$func_stripname_result
+ arg=
+- save_ifs=$IFS; IFS=,
++ save_ifs="$IFS"; IFS=','
+ for flag in $args; do
+- IFS=$save_ifs
++ IFS="$save_ifs"
+ func_quote_for_eval "$flag"
+ func_append arg " $wl$func_quote_for_eval_result"
+ func_append compiler_flags " $wl$func_quote_for_eval_result"
+ func_append linker_flags " $func_quote_for_eval_result"
+ done
+- IFS=$save_ifs
++ IFS="$save_ifs"
+ func_stripname ' ' '' "$arg"
+ arg=$func_stripname_result
+ ;;
+@@ -7255,7 +5835,7 @@
+ # -msg_* for osf cc
+ -msg_*)
+ func_quote_for_eval "$arg"
+- arg=$func_quote_for_eval_result
++ arg="$func_quote_for_eval_result"
+ ;;
+
+ # Flags to be passed through unchanged, with rationale:
+@@ -7267,46 +5847,25 @@
+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+ # -F/path path to uninstalled frameworks, gcc on darwin
+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
+- # -fstack-protector* stack protector flags for GCC
+ # @file GCC response files
+ # -tp=* Portland pgcc target processor selection
+ # --sysroot=* for sysroot support
+- # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+- # -stdlib=* select c++ std lib with clang
++ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+ func_quote_for_eval "$arg"
+- arg=$func_quote_for_eval_result
++ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ func_append compiler_flags " $arg"
+ continue
+ ;;
+
+- -Z*)
+- if test os2 = "`expr $host : '.*\(os2\)'`"; then
+- # OS/2 uses -Zxxx to specify OS/2-specific options
+- compiler_flags="$compiler_flags $arg"
+- func_append compile_command " $arg"
+- func_append finalize_command " $arg"
+- case $arg in
+- -Zlinker | -Zstack)
+- prev=xcompiler
+- ;;
+- esac
+- continue
+- else
+- # Otherwise treat like 'Some other compiler flag' below
+- func_quote_for_eval "$arg"
+- arg=$func_quote_for_eval_result
+- fi
+- ;;
+-
+ # Some other compiler flag.
+ -* | +*)
+ func_quote_for_eval "$arg"
+- arg=$func_quote_for_eval_result
++ arg="$func_quote_for_eval_result"
+ ;;
+
+ *.$objext)
+@@ -7327,21 +5886,21 @@
+
+ if test -z "$pic_object" ||
+ test -z "$non_pic_object" ||
+- test none = "$pic_object" &&
+- test none = "$non_pic_object"; then
+- func_fatal_error "cannot find name of object for '$arg'"
++ test "$pic_object" = none &&
++ test "$non_pic_object" = none; then
++ func_fatal_error "cannot find name of object for \`$arg'"
+ fi
+
+ # Extract subdirectory from the argument.
+ func_dirname "$arg" "/" ""
+- xdir=$func_dirname_result
++ xdir="$func_dirname_result"
+
+- test none = "$pic_object" || {
++ if test "$pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+- pic_object=$xdir$pic_object
++ pic_object="$xdir$pic_object"
+
+- if test dlfiles = "$prev"; then
+- if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
++ if test "$prev" = dlfiles; then
++ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ func_append dlfiles " $pic_object"
+ prev=
+ continue
+@@ -7352,7 +5911,7 @@
+ fi
+
+ # CHECK ME: I think I busted this. -Ossama
+- if test dlprefiles = "$prev"; then
++ if test "$prev" = dlprefiles; then
+ # Preload the old-style object.
+ func_append dlprefiles " $pic_object"
+ prev=
+@@ -7360,23 +5919,23 @@
+
+ # A PIC object.
+ func_append libobjs " $pic_object"
+- arg=$pic_object
+- }
++ arg="$pic_object"
++ fi
+
+ # Non-PIC object.
+- if test none != "$non_pic_object"; then
++ if test "$non_pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+- non_pic_object=$xdir$non_pic_object
++ non_pic_object="$xdir$non_pic_object"
+
+ # A standard non-PIC object
+ func_append non_pic_objects " $non_pic_object"
+- if test -z "$pic_object" || test none = "$pic_object"; then
+- arg=$non_pic_object
++ if test -z "$pic_object" || test "$pic_object" = none ; then
++ arg="$non_pic_object"
+ fi
+ else
+ # If the PIC object exists, use it instead.
+ # $xdir was prepended to $pic_object above.
+- non_pic_object=$pic_object
++ non_pic_object="$pic_object"
+ func_append non_pic_objects " $non_pic_object"
+ fi
+ else
+@@ -7384,7 +5943,7 @@
+ if $opt_dry_run; then
+ # Extract subdirectory from the argument.
+ func_dirname "$arg" "/" ""
+- xdir=$func_dirname_result
++ xdir="$func_dirname_result"
+
+ func_lo2o "$arg"
+ pic_object=$xdir$objdir/$func_lo2o_result
+@@ -7392,7 +5951,7 @@
+ func_append libobjs " $pic_object"
+ func_append non_pic_objects " $non_pic_object"
+ else
+- func_fatal_error "'$arg' is not a valid libtool object"
++ func_fatal_error "\`$arg' is not a valid libtool object"
+ fi
+ fi
+ ;;
+@@ -7408,11 +5967,11 @@
+ # A libtool-controlled library.
+
+ func_resolve_sysroot "$arg"
+- if test dlfiles = "$prev"; then
++ if test "$prev" = dlfiles; then
+ # This library was specified with -dlopen.
+ func_append dlfiles " $func_resolve_sysroot_result"
+ prev=
+- elif test dlprefiles = "$prev"; then
++ elif test "$prev" = dlprefiles; then
+ # The library was specified with -dlpreopen.
+ func_append dlprefiles " $func_resolve_sysroot_result"
+ prev=
+@@ -7427,7 +5986,7 @@
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ func_quote_for_eval "$arg"
+- arg=$func_quote_for_eval_result
++ arg="$func_quote_for_eval_result"
+ ;;
+ esac # arg
+
+@@ -7439,9 +5998,9 @@
+ done # argument parsing loop
+
+ test -n "$prev" && \
+- func_fatal_help "the '$prevarg' option requires an argument"
++ func_fatal_help "the \`$prevarg' option requires an argument"
+
+- if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
++ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+ eval arg=\"$export_dynamic_flag_spec\"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+@@ -7450,23 +6009,20 @@
+ oldlibs=
+ # calculate the name of the file, without its directory
+ func_basename "$output"
+- outputname=$func_basename_result
+- libobjs_save=$libobjs
++ outputname="$func_basename_result"
++ libobjs_save="$libobjs"
+
+ if test -n "$shlibpath_var"; then
+ # get the directories listed in $shlibpath_var
+- eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
++ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+ else
+ shlib_search_path=
+ fi
+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+- # Definition is injected by LT_CONFIG during libtool generation.
+- func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+-
+ func_dirname "$output" "/" ""
+- output_objdir=$func_dirname_result$objdir
++ output_objdir="$func_dirname_result$objdir"
+ func_to_tool_file "$output_objdir/"
+ tool_output_objdir=$func_to_tool_file_result
+ # Create the object directory.
+@@ -7489,7 +6045,7 @@
+ # Find all interdependent deplibs by searching for libraries
+ # that are linked more than once (e.g. -la -lb -la)
+ for deplib in $deplibs; do
+- if $opt_preserve_dup_deps; then
++ if $opt_preserve_dup_deps ; then
+ case "$libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+@@ -7497,7 +6053,7 @@
+ func_append libs " $deplib"
+ done
+
+- if test lib = "$linkmode"; then
++ if test "$linkmode" = lib; then
+ libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+ # Compute libraries that are listed more than once in $predeps
+@@ -7529,7 +6085,7 @@
+ case $file in
+ *.la) ;;
+ *)
+- func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
++ func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+ ;;
+ esac
+ done
+@@ -7537,7 +6093,7 @@
+ prog)
+ compile_deplibs=
+ finalize_deplibs=
+- alldeplibs=false
++ alldeplibs=no
+ newdlfiles=
+ newdlprefiles=
+ passes="conv scan dlopen dlpreopen link"
+@@ -7549,29 +6105,29 @@
+ for pass in $passes; do
+ # The preopen pass in lib mode reverses $deplibs; put it back here
+ # so that -L comes before libs that need it for instance...
+- if test lib,link = "$linkmode,$pass"; then
++ if test "$linkmode,$pass" = "lib,link"; then
+ ## FIXME: Find the place where the list is rebuilt in the wrong
+ ## order, and fix it there properly
+ tmp_deplibs=
+ for deplib in $deplibs; do
+ tmp_deplibs="$deplib $tmp_deplibs"
+ done
+- deplibs=$tmp_deplibs
++ deplibs="$tmp_deplibs"
+ fi
+
+- if test lib,link = "$linkmode,$pass" ||
+- test prog,scan = "$linkmode,$pass"; then
+- libs=$deplibs
++ if test "$linkmode,$pass" = "lib,link" ||
++ test "$linkmode,$pass" = "prog,scan"; then
++ libs="$deplibs"
+ deplibs=
+ fi
+- if test prog = "$linkmode"; then
++ if test "$linkmode" = prog; then
+ case $pass in
+- dlopen) libs=$dlfiles ;;
+- dlpreopen) libs=$dlprefiles ;;
++ dlopen) libs="$dlfiles" ;;
++ dlpreopen) libs="$dlprefiles" ;;
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ esac
+ fi
+- if test lib,dlpreopen = "$linkmode,$pass"; then
++ if test "$linkmode,$pass" = "lib,dlpreopen"; then
+ # Collect and forward deplibs of preopened libtool libs
+ for lib in $dlprefiles; do
+ # Ignore non-libtool-libs
+@@ -7592,26 +6148,26 @@
+ esac
+ done
+ done
+- libs=$dlprefiles
++ libs="$dlprefiles"
+ fi
+- if test dlopen = "$pass"; then
++ if test "$pass" = dlopen; then
+ # Collect dlpreopened libraries
+- save_deplibs=$deplibs
++ save_deplibs="$deplibs"
+ deplibs=
+ fi
+
+ for deplib in $libs; do
+ lib=
+- found=false
++ found=no
+ case $deplib in
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+- if test prog,link = "$linkmode,$pass"; then
++ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ func_append compiler_flags " $deplib"
+- if test lib = "$linkmode"; then
++ if test "$linkmode" = lib ; then
+ case "$new_inherited_linker_flags " in
+ *" $deplib "*) ;;
+ * ) func_append new_inherited_linker_flags " $deplib" ;;
+@@ -7621,13 +6177,13 @@
+ continue
+ ;;
+ -l*)
+- if test lib != "$linkmode" && test prog != "$linkmode"; then
+- func_warning "'-l' is ignored for archives/objects"
++ if test "$linkmode" != lib && test "$linkmode" != prog; then
++ func_warning "\`-l' is ignored for archives/objects"
+ continue
+ fi
+ func_stripname '-l' '' "$deplib"
+ name=$func_stripname_result
+- if test lib = "$linkmode"; then
++ if test "$linkmode" = lib; then
+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+ else
+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+@@ -7635,22 +6191,31 @@
+ for searchdir in $searchdirs; do
+ for search_ext in .la $std_shrext .so .a; do
+ # Search the libtool library
+- lib=$searchdir/lib$name$search_ext
++ lib="$searchdir/lib${name}${search_ext}"
+ if test -f "$lib"; then
+- if test .la = "$search_ext"; then
+- found=:
++ if test "$search_ext" = ".la"; then
++ found=yes
+ else
+- found=false
++ found=no
+ fi
+ break 2
+ fi
+ done
+ done
+- if $found; then
+- # deplib is a libtool library
++ if test "$found" != yes; then
++ # deplib doesn't seem to be a libtool library
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ deplibs="$deplib $deplibs"
++ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
++ fi
++ continue
++ else # deplib is a libtool library
+ # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+ # We need to do some special things here, and not later.
+- if test yes = "$allow_libtool_libs_with_static_runtimes"; then
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $deplib "*)
+ if func_lalib_p "$lib"; then
+@@ -7658,19 +6223,19 @@
+ old_library=
+ func_source "$lib"
+ for l in $old_library $library_names; do
+- ll=$l
++ ll="$l"
+ done
+- if test "X$ll" = "X$old_library"; then # only static version available
+- found=false
++ if test "X$ll" = "X$old_library" ; then # only static version available
++ found=no
+ func_dirname "$lib" "" "."
+- ladir=$func_dirname_result
++ ladir="$func_dirname_result"
+ lib=$ladir/$old_library
+- if test prog,link = "$linkmode,$pass"; then
++ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+- test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
++ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
+ fi
+@@ -7679,25 +6244,15 @@
+ *) ;;
+ esac
+ fi
+- else
+- # deplib doesn't seem to be a libtool library
+- if test prog,link = "$linkmode,$pass"; then
+- compile_deplibs="$deplib $compile_deplibs"
+- finalize_deplibs="$deplib $finalize_deplibs"
+- else
+- deplibs="$deplib $deplibs"
+- test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+- fi
+- continue
+ fi
+ ;; # -l
+ *.ltframework)
+- if test prog,link = "$linkmode,$pass"; then
++ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+- if test lib = "$linkmode"; then
++ if test "$linkmode" = lib ; then
+ case "$new_inherited_linker_flags " in
+ *" $deplib "*) ;;
+ * ) func_append new_inherited_linker_flags " $deplib" ;;
+@@ -7710,18 +6265,18 @@
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+- test conv = "$pass" && continue
++ test "$pass" = conv && continue
+ newdependency_libs="$deplib $newdependency_libs"
+ func_stripname '-L' '' "$deplib"
+ func_resolve_sysroot "$func_stripname_result"
+ func_append newlib_search_path " $func_resolve_sysroot_result"
+ ;;
+ prog)
+- if test conv = "$pass"; then
++ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ continue
+ fi
+- if test scan = "$pass"; then
++ if test "$pass" = scan; then
+ deplibs="$deplib $deplibs"
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+@@ -7732,13 +6287,13 @@
+ func_append newlib_search_path " $func_resolve_sysroot_result"
+ ;;
+ *)
+- func_warning "'-L' is ignored for archives/objects"
++ func_warning "\`-L' is ignored for archives/objects"
+ ;;
+ esac # linkmode
+ continue
+ ;; # -L
+ -R*)
+- if test link = "$pass"; then
++ if test "$pass" = link; then
+ func_stripname '-R' '' "$deplib"
+ func_resolve_sysroot "$func_stripname_result"
+ dir=$func_resolve_sysroot_result
+@@ -7756,7 +6311,7 @@
+ lib=$func_resolve_sysroot_result
+ ;;
+ *.$libext)
+- if test conv = "$pass"; then
++ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ continue
+ fi
+@@ -7767,26 +6322,21 @@
+ case " $dlpreconveniencelibs " in
+ *" $deplib "*) ;;
+ *)
+- valid_a_lib=false
++ valid_a_lib=no
+ case $deplibs_check_method in
+ match_pattern*)
+ set dummy $deplibs_check_method; shift
+ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+ | $EGREP "$match_pattern_regex" > /dev/null; then
+- valid_a_lib=:
++ valid_a_lib=yes
+ fi
+ ;;
+ pass_all)
+- valid_a_lib=:
++ valid_a_lib=yes
+ ;;
+ esac
+- if $valid_a_lib; then
+- echo
+- $ECHO "*** Warning: Linking the shared library $output against the"
+- $ECHO "*** static library $deplib is not portable!"
+- deplibs="$deplib $deplibs"
+- else
++ if test "$valid_a_lib" != yes; then
+ echo
+ $ECHO "*** Warning: Trying to link with static lib archive $deplib."
+ echo "*** I have the capability to make that library automatically link in when"
+@@ -7794,13 +6344,18 @@
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because the file extensions .$libext of this argument makes me believe"
+ echo "*** that it is just a static archive that I should not use here."
++ else
++ echo
++ $ECHO "*** Warning: Linking the shared library $output against the"
++ $ECHO "*** static library $deplib is not portable!"
++ deplibs="$deplib $deplibs"
+ fi
+ ;;
+ esac
+ continue
+ ;;
+ prog)
+- if test link != "$pass"; then
++ if test "$pass" != link; then
+ deplibs="$deplib $deplibs"
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+@@ -7811,10 +6366,10 @@
+ esac # linkmode
+ ;; # *.$libext
+ *.lo | *.$objext)
+- if test conv = "$pass"; then
++ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+- elif test prog = "$linkmode"; then
+- if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
++ elif test "$linkmode" = prog; then
++ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ # If there is no dlopen support or we're linking statically,
+ # we need to preload.
+ func_append newdlprefiles " $deplib"
+@@ -7827,20 +6382,22 @@
+ continue
+ ;;
+ %DEPLIBS%)
+- alldeplibs=:
++ alldeplibs=yes
+ continue
+ ;;
+ esac # case $deplib
+
+- $found || test -f "$lib" \
+- || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
++ if test "$found" = yes || test -f "$lib"; then :
++ else
++ func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
++ fi
+
+ # Check to see that this really is a libtool archive.
+ func_lalib_unsafe_p "$lib" \
+- || func_fatal_error "'$lib' is not a valid libtool archive"
++ || func_fatal_error "\`$lib' is not a valid libtool archive"
+
+ func_dirname "$lib" "" "."
+- ladir=$func_dirname_result
++ ladir="$func_dirname_result"
+
+ dlname=
+ dlopen=
+@@ -7870,30 +6427,30 @@
+ done
+ fi
+ dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+- if test lib,link = "$linkmode,$pass" ||
+- test prog,scan = "$linkmode,$pass" ||
+- { test prog != "$linkmode" && test lib != "$linkmode"; }; then
++ if test "$linkmode,$pass" = "lib,link" ||
++ test "$linkmode,$pass" = "prog,scan" ||
++ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ test -n "$dlopen" && func_append dlfiles " $dlopen"
+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+ fi
+
+- if test conv = "$pass"; then
++ if test "$pass" = conv; then
+ # Only check for convenience libraries
+ deplibs="$lib $deplibs"
+ if test -z "$libdir"; then
+ if test -z "$old_library"; then
+- func_fatal_error "cannot find name of link library for '$lib'"
++ func_fatal_error "cannot find name of link library for \`$lib'"
+ fi
+ # It is a libtool convenience library, so add in its objects.
+ func_append convenience " $ladir/$objdir/$old_library"
+ func_append old_convenience " $ladir/$objdir/$old_library"
+- elif test prog != "$linkmode" && test lib != "$linkmode"; then
+- func_fatal_error "'$lib' is not a convenience library"
++ elif test "$linkmode" != prog && test "$linkmode" != lib; then
++ func_fatal_error "\`$lib' is not a convenience library"
+ fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+- if $opt_preserve_dup_deps; then
++ if $opt_preserve_dup_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+@@ -7907,26 +6464,26 @@
+ # Get the name of the library we link against.
+ linklib=
+ if test -n "$old_library" &&
+- { test yes = "$prefer_static_libs" ||
+- test built,no = "$prefer_static_libs,$installed"; }; then
++ { test "$prefer_static_libs" = yes ||
++ test "$prefer_static_libs,$installed" = "built,no"; }; then
+ linklib=$old_library
+ else
+ for l in $old_library $library_names; do
+- linklib=$l
++ linklib="$l"
+ done
+ fi
+ if test -z "$linklib"; then
+- func_fatal_error "cannot find name of link library for '$lib'"
++ func_fatal_error "cannot find name of link library for \`$lib'"
+ fi
+
+ # This library was specified with -dlopen.
+- if test dlopen = "$pass"; then
+- test -z "$libdir" \
+- && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
++ if test "$pass" = dlopen; then
++ if test -z "$libdir"; then
++ func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
++ fi
+ if test -z "$dlname" ||
+- test yes != "$dlopen_support" ||
+- test no = "$build_libtool_libs"
+- then
++ test "$dlopen_support" != yes ||
++ test "$build_libtool_libs" = no; then
+ # If there is no dlname, no dlopen support or we're linking
+ # statically, we need to preload. We also need to preload any
+ # dependent libraries so libltdl's deplib preloader doesn't
+@@ -7940,40 +6497,40 @@
+
+ # We need an absolute path.
+ case $ladir in
+- [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
++ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ *)
+ abs_ladir=`cd "$ladir" && pwd`
+ if test -z "$abs_ladir"; then
+- func_warning "cannot determine absolute directory name of '$ladir'"
++ func_warning "cannot determine absolute directory name of \`$ladir'"
+ func_warning "passing it literally to the linker, although it might fail"
+- abs_ladir=$ladir
++ abs_ladir="$ladir"
+ fi
+ ;;
+ esac
+ func_basename "$lib"
+- laname=$func_basename_result
++ laname="$func_basename_result"
+
+ # Find the relevant object directory and library name.
+- if test yes = "$installed"; then
++ if test "X$installed" = Xyes; then
+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+- func_warning "library '$lib' was moved."
+- dir=$ladir
+- absdir=$abs_ladir
+- libdir=$abs_ladir
++ func_warning "library \`$lib' was moved."
++ dir="$ladir"
++ absdir="$abs_ladir"
++ libdir="$abs_ladir"
+ else
+- dir=$lt_sysroot$libdir
+- absdir=$lt_sysroot$libdir
++ dir="$lt_sysroot$libdir"
++ absdir="$lt_sysroot$libdir"
+ fi
+- test yes = "$hardcode_automatic" && avoidtemprpath=yes
++ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+- dir=$ladir
+- absdir=$abs_ladir
++ dir="$ladir"
++ absdir="$abs_ladir"
+ # Remove this search path later
+ func_append notinst_path " $abs_ladir"
+ else
+- dir=$ladir/$objdir
+- absdir=$abs_ladir/$objdir
++ dir="$ladir/$objdir"
++ absdir="$abs_ladir/$objdir"
+ # Remove this search path later
+ func_append notinst_path " $abs_ladir"
+ fi
+@@ -7982,11 +6539,11 @@
+ name=$func_stripname_result
+
+ # This library was specified with -dlpreopen.
+- if test dlpreopen = "$pass"; then
+- if test -z "$libdir" && test prog = "$linkmode"; then
+- func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
++ if test "$pass" = dlpreopen; then
++ if test -z "$libdir" && test "$linkmode" = prog; then
++ func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+ fi
+- case $host in
++ case "$host" in
+ # special handling for platforms with PE-DLLs.
+ *cygwin* | *mingw* | *cegcc* )
+ # Linker will automatically link against shared library if both
+@@ -8030,9 +6587,9 @@
+
+ if test -z "$libdir"; then
+ # Link the convenience library
+- if test lib = "$linkmode"; then
++ if test "$linkmode" = lib; then
+ deplibs="$dir/$old_library $deplibs"
+- elif test prog,link = "$linkmode,$pass"; then
++ elif test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$dir/$old_library $compile_deplibs"
+ finalize_deplibs="$dir/$old_library $finalize_deplibs"
+ else
+@@ -8042,14 +6599,14 @@
+ fi
+
+
+- if test prog = "$linkmode" && test link != "$pass"; then
++ if test "$linkmode" = prog && test "$pass" != link; then
+ func_append newlib_search_path " $ladir"
+ deplibs="$lib $deplibs"
+
+- linkalldeplibs=false
+- if test no != "$link_all_deplibs" || test -z "$library_names" ||
+- test no = "$build_libtool_libs"; then
+- linkalldeplibs=:
++ linkalldeplibs=no
++ if test "$link_all_deplibs" != no || test -z "$library_names" ||
++ test "$build_libtool_libs" = no; then
++ linkalldeplibs=yes
+ fi
+
+ tmp_libs=
+@@ -8061,14 +6618,14 @@
+ ;;
+ esac
+ # Need to link against all dependency_libs?
+- if $linkalldeplibs; then
++ if test "$linkalldeplibs" = yes; then
+ deplibs="$deplib $deplibs"
+ else
+ # Need to hardcode shared library paths
+ # or/and link against static libraries
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+- if $opt_preserve_dup_deps; then
++ if $opt_preserve_dup_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+@@ -8078,15 +6635,15 @@
+ continue
+ fi # $linkmode = prog...
+
+- if test prog,link = "$linkmode,$pass"; then
++ if test "$linkmode,$pass" = "prog,link"; then
+ if test -n "$library_names" &&
+- { { test no = "$prefer_static_libs" ||
+- test built,yes = "$prefer_static_libs,$installed"; } ||
++ { { test "$prefer_static_libs" = no ||
++ test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ test -z "$old_library"; }; then
+ # We need to hardcode the library path
+- if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
++ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ # Make sure the rpath contains only unique directories.
+- case $temp_rpath: in
++ case "$temp_rpath:" in
+ *"$absdir:"*) ;;
+ *) func_append temp_rpath "$absdir:" ;;
+ esac
+@@ -8115,9 +6672,9 @@
+ esac
+ fi # $linkmode,$pass = prog,link...
+
+- if $alldeplibs &&
+- { test pass_all = "$deplibs_check_method" ||
+- { test yes = "$build_libtool_libs" &&
++ if test "$alldeplibs" = yes &&
++ { test "$deplibs_check_method" = pass_all ||
++ { test "$build_libtool_libs" = yes &&
+ test -n "$library_names"; }; }; then
+ # We only need to search for static libraries
+ continue
+@@ -8126,19 +6683,19 @@
+
+ link_static=no # Whether the deplib will be linked statically
+ use_static_libs=$prefer_static_libs
+- if test built = "$use_static_libs" && test yes = "$installed"; then
++ if test "$use_static_libs" = built && test "$installed" = yes; then
+ use_static_libs=no
+ fi
+ if test -n "$library_names" &&
+- { test no = "$use_static_libs" || test -z "$old_library"; }; then
++ { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ case $host in
+- *cygwin* | *mingw* | *cegcc* | *os2*)
++ *cygwin* | *mingw* | *cegcc*)
+ # No point in relinking DLLs because paths are not encoded
+ func_append notinst_deplibs " $lib"
+ need_relink=no
+ ;;
+ *)
+- if test no = "$installed"; then
++ if test "$installed" = no; then
+ func_append notinst_deplibs " $lib"
+ need_relink=yes
+ fi
+@@ -8148,24 +6705,24 @@
+
+ # Warn about portability, can't link against -module's on some
+ # systems (darwin). Don't bleat about dlopened modules though!
+- dlopenmodule=
++ dlopenmodule=""
+ for dlpremoduletest in $dlprefiles; do
+ if test "X$dlpremoduletest" = "X$lib"; then
+- dlopenmodule=$dlpremoduletest
++ dlopenmodule="$dlpremoduletest"
+ break
+ fi
+ done
+- if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
++ if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+ echo
+- if test prog = "$linkmode"; then
++ if test "$linkmode" = prog; then
+ $ECHO "*** Warning: Linking the executable $output against the loadable module"
+ else
+ $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+ fi
+ $ECHO "*** $linklib is not portable!"
+ fi
+- if test lib = "$linkmode" &&
+- test yes = "$hardcode_into_libs"; then
++ if test "$linkmode" = lib &&
++ test "$hardcode_into_libs" = yes; then
+ # Hardcode the library path.
+ # Skip directories that are in the system default run-time
+ # search path.
+@@ -8193,43 +6750,43 @@
+ # figure out the soname
+ set dummy $library_names
+ shift
+- realname=$1
++ realname="$1"
+ shift
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ # use dlname if we got it. it's perfectly good, no?
+ if test -n "$dlname"; then
+- soname=$dlname
++ soname="$dlname"
+ elif test -n "$soname_spec"; then
+ # bleh windows
+ case $host in
+- *cygwin* | mingw* | *cegcc* | *os2*)
++ *cygwin* | mingw* | *cegcc*)
+ func_arith $current - $age
+ major=$func_arith_result
+- versuffix=-$major
++ versuffix="-$major"
+ ;;
+ esac
+ eval soname=\"$soname_spec\"
+ else
+- soname=$realname
++ soname="$realname"
+ fi
+
+ # Make a new name for the extract_expsyms_cmds to use
+- soroot=$soname
++ soroot="$soname"
+ func_basename "$soroot"
+- soname=$func_basename_result
++ soname="$func_basename_result"
+ func_stripname 'lib' '.dll' "$soname"
+ newlib=libimp-$func_stripname_result.a
+
+ # If the library has no export list, then create one now
+ if test -f "$output_objdir/$soname-def"; then :
+ else
+- func_verbose "extracting exported symbol list from '$soname'"
++ func_verbose "extracting exported symbol list from \`$soname'"
+ func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+ fi
+
+ # Create $newlib
+ if test -f "$output_objdir/$newlib"; then :; else
+- func_verbose "generating import library for '$soname'"
++ func_verbose "generating import library for \`$soname'"
+ func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+ fi
+ # make sure the library variables are pointing to the new library
+@@ -8237,58 +6794,58 @@
+ linklib=$newlib
+ fi # test -n "$old_archive_from_expsyms_cmds"
+
+- if test prog = "$linkmode" || test relink != "$opt_mode"; then
++ if test "$linkmode" = prog || test "$opt_mode" != relink; then
+ add_shlibpath=
+ add_dir=
+ add=
+ lib_linked=yes
+ case $hardcode_action in
+ immediate | unsupported)
+- if test no = "$hardcode_direct"; then
+- add=$dir/$linklib
++ if test "$hardcode_direct" = no; then
++ add="$dir/$linklib"
+ case $host in
+- *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+- *-*-sysv4*uw2*) add_dir=-L$dir ;;
++ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
++ *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+- *-*-unixware7*) add_dir=-L$dir ;;
++ *-*-unixware7*) add_dir="-L$dir" ;;
+ *-*-darwin* )
+- # if the lib is a (non-dlopened) module then we cannot
++ # if the lib is a (non-dlopened) module then we can not
+ # link against it, someone is ignoring the earlier warnings
+ if /usr/bin/file -L $add 2> /dev/null |
+- $GREP ": [^:]* bundle" >/dev/null; then
++ $GREP ": [^:]* bundle" >/dev/null ; then
+ if test "X$dlopenmodule" != "X$lib"; then
+ $ECHO "*** Warning: lib $linklib is a module, not a shared library"
+- if test -z "$old_library"; then
++ if test -z "$old_library" ; then
+ echo
+ echo "*** And there doesn't seem to be a static archive available"
+ echo "*** The link will probably fail, sorry"
+ else
+- add=$dir/$old_library
++ add="$dir/$old_library"
+ fi
+ elif test -n "$old_library"; then
+- add=$dir/$old_library
++ add="$dir/$old_library"
+ fi
+ fi
+ esac
+- elif test no = "$hardcode_minus_L"; then
++ elif test "$hardcode_minus_L" = no; then
+ case $host in
+- *-*-sunos*) add_shlibpath=$dir ;;
++ *-*-sunos*) add_shlibpath="$dir" ;;
+ esac
+- add_dir=-L$dir
+- add=-l$name
+- elif test no = "$hardcode_shlibpath_var"; then
+- add_shlibpath=$dir
+- add=-l$name
++ add_dir="-L$dir"
++ add="-l$name"
++ elif test "$hardcode_shlibpath_var" = no; then
++ add_shlibpath="$dir"
++ add="-l$name"
+ else
+ lib_linked=no
+ fi
+ ;;
+ relink)
+- if test yes = "$hardcode_direct" &&
+- test no = "$hardcode_direct_absolute"; then
+- add=$dir/$linklib
+- elif test yes = "$hardcode_minus_L"; then
+- add_dir=-L$absdir
++ if test "$hardcode_direct" = yes &&
++ test "$hardcode_direct_absolute" = no; then
++ add="$dir/$linklib"
++ elif test "$hardcode_minus_L" = yes; then
++ add_dir="-L$absdir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+ case $libdir in
+@@ -8297,10 +6854,10 @@
+ ;;
+ esac
+ fi
+- add=-l$name
+- elif test yes = "$hardcode_shlibpath_var"; then
+- add_shlibpath=$dir
+- add=-l$name
++ add="-l$name"
++ elif test "$hardcode_shlibpath_var" = yes; then
++ add_shlibpath="$dir"
++ add="-l$name"
+ else
+ lib_linked=no
+ fi
+@@ -8308,7 +6865,7 @@
+ *) lib_linked=no ;;
+ esac
+
+- if test yes != "$lib_linked"; then
++ if test "$lib_linked" != yes; then
+ func_fatal_configuration "unsupported hardcode properties"
+ fi
+
+@@ -8318,15 +6875,15 @@
+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
+ esac
+ fi
+- if test prog = "$linkmode"; then
++ if test "$linkmode" = prog; then
+ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+ test -n "$add" && compile_deplibs="$add $compile_deplibs"
+ else
+ test -n "$add_dir" && deplibs="$add_dir $deplibs"
+ test -n "$add" && deplibs="$add $deplibs"
+- if test yes != "$hardcode_direct" &&
+- test yes != "$hardcode_minus_L" &&
+- test yes = "$hardcode_shlibpath_var"; then
++ if test "$hardcode_direct" != yes &&
++ test "$hardcode_minus_L" != yes &&
++ test "$hardcode_shlibpath_var" = yes; then
+ case :$finalize_shlibpath: in
+ *":$libdir:"*) ;;
+ *) func_append finalize_shlibpath "$libdir:" ;;
+@@ -8335,33 +6892,33 @@
+ fi
+ fi
+
+- if test prog = "$linkmode" || test relink = "$opt_mode"; then
++ if test "$linkmode" = prog || test "$opt_mode" = relink; then
+ add_shlibpath=
+ add_dir=
+ add=
+ # Finalize command for both is simple: just hardcode it.
+- if test yes = "$hardcode_direct" &&
+- test no = "$hardcode_direct_absolute"; then
+- add=$libdir/$linklib
+- elif test yes = "$hardcode_minus_L"; then
+- add_dir=-L$libdir
+- add=-l$name
+- elif test yes = "$hardcode_shlibpath_var"; then
++ if test "$hardcode_direct" = yes &&
++ test "$hardcode_direct_absolute" = no; then
++ add="$libdir/$linklib"
++ elif test "$hardcode_minus_L" = yes; then
++ add_dir="-L$libdir"
++ add="-l$name"
++ elif test "$hardcode_shlibpath_var" = yes; then
+ case :$finalize_shlibpath: in
+ *":$libdir:"*) ;;
+ *) func_append finalize_shlibpath "$libdir:" ;;
+ esac
+- add=-l$name
+- elif test yes = "$hardcode_automatic"; then
++ add="-l$name"
++ elif test "$hardcode_automatic" = yes; then
+ if test -n "$inst_prefix_dir" &&
+- test -f "$inst_prefix_dir$libdir/$linklib"; then
+- add=$inst_prefix_dir$libdir/$linklib
++ test -f "$inst_prefix_dir$libdir/$linklib" ; then
++ add="$inst_prefix_dir$libdir/$linklib"
+ else
+- add=$libdir/$linklib
++ add="$libdir/$linklib"
+ fi
+ else
+ # We cannot seem to hardcode it, guess we'll fake it.
+- add_dir=-L$libdir
++ add_dir="-L$libdir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+ case $libdir in
+@@ -8370,10 +6927,10 @@
+ ;;
+ esac
+ fi
+- add=-l$name
++ add="-l$name"
+ fi
+
+- if test prog = "$linkmode"; then
++ if test "$linkmode" = prog; then
+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ else
+@@ -8381,43 +6938,43 @@
+ test -n "$add" && deplibs="$add $deplibs"
+ fi
+ fi
+- elif test prog = "$linkmode"; then
++ elif test "$linkmode" = prog; then
+ # Here we assume that one of hardcode_direct or hardcode_minus_L
+ # is not unsupported. This is valid on all known static and
+ # shared platforms.
+- if test unsupported != "$hardcode_direct"; then
+- test -n "$old_library" && linklib=$old_library
++ if test "$hardcode_direct" != unsupported; then
++ test -n "$old_library" && linklib="$old_library"
+ compile_deplibs="$dir/$linklib $compile_deplibs"
+ finalize_deplibs="$dir/$linklib $finalize_deplibs"
+ else
+ compile_deplibs="-l$name -L$dir $compile_deplibs"
+ finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+ fi
+- elif test yes = "$build_libtool_libs"; then
++ elif test "$build_libtool_libs" = yes; then
+ # Not a shared library
+- if test pass_all != "$deplibs_check_method"; then
++ if test "$deplibs_check_method" != pass_all; then
+ # We're trying link a shared library against a static one
+ # but the system doesn't support it.
+
+ # Just print a warning and add the library to dependency_libs so
+ # that the program can be linked against the static library.
+ echo
+- $ECHO "*** Warning: This system cannot link to static lib archive $lib."
++ $ECHO "*** Warning: This system can not link to static lib archive $lib."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have."
+- if test yes = "$module"; then
++ if test "$module" = yes; then
+ echo "*** But as you try to build a module library, libtool will still create "
+ echo "*** a static module, that should work as long as the dlopening application"
+ echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ if test -z "$global_symbol_pipe"; then
+ echo
+ echo "*** However, this would only work if libtool was able to extract symbol"
+- echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
++ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** not find such a program. So, this module is probably useless."
+- echo "*** 'nm' from GNU binutils and a full rebuild may help."
++ echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+- if test no = "$build_old_libs"; then
++ if test "$build_old_libs" = no; then
+ build_libtool_libs=module
+ build_old_libs=yes
+ else
+@@ -8430,11 +6987,11 @@
+ fi
+ fi # link shared/static library?
+
+- if test lib = "$linkmode"; then
++ if test "$linkmode" = lib; then
+ if test -n "$dependency_libs" &&
+- { test yes != "$hardcode_into_libs" ||
+- test yes = "$build_old_libs" ||
+- test yes = "$link_static"; }; then
++ { test "$hardcode_into_libs" != yes ||
++ test "$build_old_libs" = yes ||
++ test "$link_static" = yes; }; then
+ # Extract -R from dependency_libs
+ temp_deplibs=
+ for libdir in $dependency_libs; do
+@@ -8448,12 +7005,12 @@
+ *) func_append temp_deplibs " $libdir";;
+ esac
+ done
+- dependency_libs=$temp_deplibs
++ dependency_libs="$temp_deplibs"
+ fi
+
+ func_append newlib_search_path " $absdir"
+ # Link against this library
+- test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
++ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+ # ... and its dependency_libs
+ tmp_libs=
+ for deplib in $dependency_libs; do
+@@ -8463,7 +7020,7 @@
+ func_resolve_sysroot "$func_stripname_result";;
+ *) func_resolve_sysroot "$deplib" ;;
+ esac
+- if $opt_preserve_dup_deps; then
++ if $opt_preserve_dup_deps ; then
+ case "$tmp_libs " in
+ *" $func_resolve_sysroot_result "*)
+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+@@ -8472,12 +7029,12 @@
+ func_append tmp_libs " $func_resolve_sysroot_result"
+ done
+
+- if test no != "$link_all_deplibs"; then
++ if test "$link_all_deplibs" != no; then
+ # Add the search paths of all dependency libraries
+ for deplib in $dependency_libs; do
+ path=
+ case $deplib in
+- -L*) path=$deplib ;;
++ -L*) path="$deplib" ;;
+ *.la)
+ func_resolve_sysroot "$deplib"
+ deplib=$func_resolve_sysroot_result
+@@ -8485,12 +7042,12 @@
+ dir=$func_dirname_result
+ # We need an absolute path.
+ case $dir in
+- [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
++ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ *)
+ absdir=`cd "$dir" && pwd`
+ if test -z "$absdir"; then
+- func_warning "cannot determine absolute directory name of '$dir'"
+- absdir=$dir
++ func_warning "cannot determine absolute directory name of \`$dir'"
++ absdir="$dir"
+ fi
+ ;;
+ esac
+@@ -8498,35 +7055,35 @@
+ case $host in
+ *-*-darwin*)
+ depdepl=
+- eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+- if test -n "$deplibrary_names"; then
+- for tmp in $deplibrary_names; do
++ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++ if test -n "$deplibrary_names" ; then
++ for tmp in $deplibrary_names ; do
+ depdepl=$tmp
+ done
+- if test -f "$absdir/$objdir/$depdepl"; then
+- depdepl=$absdir/$objdir/$depdepl
+- darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
++ if test -f "$absdir/$objdir/$depdepl" ; then
++ depdepl="$absdir/$objdir/$depdepl"
++ darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ if test -z "$darwin_install_name"; then
+- darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
++ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ fi
+- func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+- func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
++ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
++ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+ path=
+ fi
+ fi
+ ;;
+ *)
+- path=-L$absdir/$objdir
++ path="-L$absdir/$objdir"
+ ;;
+ esac
+ else
+- eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ test -z "$libdir" && \
+- func_fatal_error "'$deplib' is not a valid libtool archive"
++ func_fatal_error "\`$deplib' is not a valid libtool archive"
+ test "$absdir" != "$libdir" && \
+- func_warning "'$deplib' seems to be moved"
++ func_warning "\`$deplib' seems to be moved"
+
+- path=-L$absdir
++ path="-L$absdir"
+ fi
+ ;;
+ esac
+@@ -8538,23 +7095,23 @@
+ fi # link_all_deplibs != no
+ fi # linkmode = lib
+ done # for deplib in $libs
+- if test link = "$pass"; then
+- if test prog = "$linkmode"; then
++ if test "$pass" = link; then
++ if test "$linkmode" = "prog"; then
+ compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+ finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+ else
+ compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ fi
+ fi
+- dependency_libs=$newdependency_libs
+- if test dlpreopen = "$pass"; then
++ dependency_libs="$newdependency_libs"
++ if test "$pass" = dlpreopen; then
+ # Link the dlpreopened libraries before other libraries
+ for deplib in $save_deplibs; do
+ deplibs="$deplib $deplibs"
+ done
+ fi
+- if test dlopen != "$pass"; then
+- test conv = "$pass" || {
++ if test "$pass" != dlopen; then
++ if test "$pass" != conv; then
+ # Make sure lib_search_path contains only unique directories.
+ lib_search_path=
+ for dir in $newlib_search_path; do
+@@ -8564,12 +7121,12 @@
+ esac
+ done
+ newlib_search_path=
+- }
++ fi
+
+- if test prog,link = "$linkmode,$pass"; then
+- vars="compile_deplibs finalize_deplibs"
++ if test "$linkmode,$pass" != "prog,link"; then
++ vars="deplibs"
+ else
+- vars=deplibs
++ vars="compile_deplibs finalize_deplibs"
+ fi
+ for var in $vars dependency_libs; do
+ # Add libraries to $var in reverse order
+@@ -8627,93 +7184,62 @@
+ eval $var=\"$tmp_libs\"
+ done # for var
+ fi
+-
+- # Add Sun CC postdeps if required:
+- test CXX = "$tagname" && {
+- case $host_os in
+- linux*)
+- case `$CC -V 2>&1 | sed 5q` in
+- *Sun\ C*) # Sun C++ 5.9
+- func_suncc_cstd_abi
+-
+- if test no != "$suncc_use_cstd_abi"; then
+- func_append postdeps ' -library=Cstd -library=Crun'
+- fi
+- ;;
+- esac
+- ;;
+-
+- solaris*)
+- func_cc_basename "$CC"
+- case $func_cc_basename_result in
+- CC* | sunCC*)
+- func_suncc_cstd_abi
+-
+- if test no != "$suncc_use_cstd_abi"; then
+- func_append postdeps ' -library=Cstd -library=Crun'
+- fi
+- ;;
+- esac
+- ;;
+- esac
+- }
+-
+ # Last step: remove runtime libs from dependency_libs
+ # (they stay in deplibs)
+ tmp_libs=
+- for i in $dependency_libs; do
++ for i in $dependency_libs ; do
+ case " $predeps $postdeps $compiler_lib_search_path " in
+ *" $i "*)
+- i=
++ i=""
+ ;;
+ esac
+- if test -n "$i"; then
++ if test -n "$i" ; then
+ func_append tmp_libs " $i"
+ fi
+ done
+ dependency_libs=$tmp_libs
+ done # for pass
+- if test prog = "$linkmode"; then
+- dlfiles=$newdlfiles
++ if test "$linkmode" = prog; then
++ dlfiles="$newdlfiles"
+ fi
+- if test prog = "$linkmode" || test lib = "$linkmode"; then
+- dlprefiles=$newdlprefiles
++ if test "$linkmode" = prog || test "$linkmode" = lib; then
++ dlprefiles="$newdlprefiles"
+ fi
+
+ case $linkmode in
+ oldlib)
+- if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+- func_warning "'-dlopen' is ignored for archives"
++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++ func_warning "\`-dlopen' is ignored for archives"
+ fi
+
+ case " $deplibs" in
+ *\ -l* | *\ -L*)
+- func_warning "'-l' and '-L' are ignored for archives" ;;
++ func_warning "\`-l' and \`-L' are ignored for archives" ;;
+ esac
+
+ test -n "$rpath" && \
+- func_warning "'-rpath' is ignored for archives"
++ func_warning "\`-rpath' is ignored for archives"
+
+ test -n "$xrpath" && \
+- func_warning "'-R' is ignored for archives"
++ func_warning "\`-R' is ignored for archives"
+
+ test -n "$vinfo" && \
+- func_warning "'-version-info/-version-number' is ignored for archives"
++ func_warning "\`-version-info/-version-number' is ignored for archives"
+
+ test -n "$release" && \
+- func_warning "'-release' is ignored for archives"
++ func_warning "\`-release' is ignored for archives"
+
+ test -n "$export_symbols$export_symbols_regex" && \
+- func_warning "'-export-symbols' is ignored for archives"
++ func_warning "\`-export-symbols' is ignored for archives"
+
+ # Now set the variables for building old libraries.
+ build_libtool_libs=no
+- oldlibs=$output
++ oldlibs="$output"
+ func_append objs "$old_deplibs"
+ ;;
+
+ lib)
+- # Make sure we only generate libraries of the form 'libNAME.la'.
++ # Make sure we only generate libraries of the form `libNAME.la'.
+ case $outputname in
+ lib*)
+ func_stripname 'lib' '.la' "$outputname"
+@@ -8722,10 +7248,10 @@
+ eval libname=\"$libname_spec\"
+ ;;
+ *)
+- test no = "$module" \
+- && func_fatal_help "libtool library '$output' must begin with 'lib'"
++ test "$module" = no && \
++ func_fatal_help "libtool library \`$output' must begin with \`lib'"
+
+- if test no != "$need_lib_prefix"; then
++ if test "$need_lib_prefix" != no; then
+ # Add the "lib" prefix for modules if required
+ func_stripname '' '.la' "$outputname"
+ name=$func_stripname_result
+@@ -8739,8 +7265,8 @@
+ esac
+
+ if test -n "$objs"; then
+- if test pass_all != "$deplibs_check_method"; then
+- func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
++ if test "$deplibs_check_method" != pass_all; then
++ func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+ else
+ echo
+ $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+@@ -8749,21 +7275,21 @@
+ fi
+ fi
+
+- test no = "$dlself" \
+- || func_warning "'-dlopen self' is ignored for libtool libraries"
++ test "$dlself" != no && \
++ func_warning "\`-dlopen self' is ignored for libtool libraries"
+
+ set dummy $rpath
+ shift
+- test 1 -lt "$#" \
+- && func_warning "ignoring multiple '-rpath's for a libtool library"
++ test "$#" -gt 1 && \
++ func_warning "ignoring multiple \`-rpath's for a libtool library"
+
+- install_libdir=$1
++ install_libdir="$1"
+
+ oldlibs=
+ if test -z "$rpath"; then
+- if test yes = "$build_libtool_libs"; then
++ if test "$build_libtool_libs" = yes; then
+ # Building a libtool convenience library.
+- # Some compilers have problems with a '.al' extension so
++ # Some compilers have problems with a `.al' extension so
+ # convenience libraries should have the same extension an
+ # archive normally would.
+ oldlibs="$output_objdir/$libname.$libext $oldlibs"
+@@ -8772,20 +7298,20 @@
+ fi
+
+ test -n "$vinfo" && \
+- func_warning "'-version-info/-version-number' is ignored for convenience libraries"
++ func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+
+ test -n "$release" && \
+- func_warning "'-release' is ignored for convenience libraries"
++ func_warning "\`-release' is ignored for convenience libraries"
+ else
+
+ # Parse the version information argument.
+- save_ifs=$IFS; IFS=:
++ save_ifs="$IFS"; IFS=':'
+ set dummy $vinfo 0 0 0
+ shift
+- IFS=$save_ifs
++ IFS="$save_ifs"
+
+ test -n "$7" && \
+- func_fatal_help "too many parameters to '-version-info'"
++ func_fatal_help "too many parameters to \`-version-info'"
+
+ # convert absolute version numbers to libtool ages
+ # this retains compatibility with .la files and attempts
+@@ -8793,42 +7319,42 @@
+
+ case $vinfo_number in
+ yes)
+- number_major=$1
+- number_minor=$2
+- number_revision=$3
++ number_major="$1"
++ number_minor="$2"
++ number_revision="$3"
+ #
+ # There are really only two kinds -- those that
+ # use the current revision as the major version
+ # and those that subtract age and use age as
+ # a minor version. But, then there is irix
+- # that has an extra 1 added just for fun
++ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+ # correct linux to gnu/linux during the next big refactor
+- darwin|freebsd-elf|linux|osf|windows|none)
++ darwin|linux|osf|windows|none)
+ func_arith $number_major + $number_minor
+ current=$func_arith_result
+- age=$number_minor
+- revision=$number_revision
++ age="$number_minor"
++ revision="$number_revision"
+ ;;
+- freebsd-aout|qnx|sunos)
+- current=$number_major
+- revision=$number_minor
+- age=0
++ freebsd-aout|freebsd-elf|qnx|sunos)
++ current="$number_major"
++ revision="$number_minor"
++ age="0"
+ ;;
+ irix|nonstopux)
+ func_arith $number_major + $number_minor
+ current=$func_arith_result
+- age=$number_minor
+- revision=$number_minor
++ age="$number_minor"
++ revision="$number_minor"
+ lt_irix_increment=no
+ ;;
+ esac
+ ;;
+ no)
+- current=$1
+- revision=$2
+- age=$3
++ current="$1"
++ revision="$2"
++ age="$3"
+ ;;
+ esac
+
+@@ -8836,30 +7362,30 @@
+ case $current in
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- func_error "CURRENT '$current' must be a nonnegative integer"
+- func_fatal_error "'$vinfo' is not valid version information"
++ func_error "CURRENT \`$current' must be a nonnegative integer"
++ func_fatal_error "\`$vinfo' is not valid version information"
+ ;;
+ esac
+
+ case $revision in
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- func_error "REVISION '$revision' must be a nonnegative integer"
+- func_fatal_error "'$vinfo' is not valid version information"
++ func_error "REVISION \`$revision' must be a nonnegative integer"
++ func_fatal_error "\`$vinfo' is not valid version information"
+ ;;
+ esac
+
+ case $age in
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- func_error "AGE '$age' must be a nonnegative integer"
+- func_fatal_error "'$vinfo' is not valid version information"
++ func_error "AGE \`$age' must be a nonnegative integer"
++ func_fatal_error "\`$vinfo' is not valid version information"
+ ;;
+ esac
+
+ if test "$age" -gt "$current"; then
+- func_error "AGE '$age' is greater than the current interface number '$current'"
+- func_fatal_error "'$vinfo' is not valid version information"
++ func_error "AGE \`$age' is greater than the current interface number \`$current'"
++ func_fatal_error "\`$vinfo' is not valid version information"
+ fi
+
+ # Calculate the version variables.
+@@ -8874,36 +7400,26 @@
+ # verstring for coding it into the library header
+ func_arith $current - $age
+ major=.$func_arith_result
+- versuffix=$major.$age.$revision
++ versuffix="$major.$age.$revision"
+ # Darwin ld doesn't like 0 for these options...
+ func_arith $current + 1
+ minor_current=$func_arith_result
+- xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
++ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+- # On Darwin other compilers
+- case $CC in
+- nagfor*)
+- verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+- ;;
+- *)
+- verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+- ;;
+- esac
+ ;;
+
+ freebsd-aout)
+- major=.$current
+- versuffix=.$current.$revision
++ major=".$current"
++ versuffix=".$current.$revision";
+ ;;
+
+ freebsd-elf)
+- func_arith $current - $age
+- major=.$func_arith_result
+- versuffix=$major.$age.$revision
++ major=".$current"
++ versuffix=".$current"
+ ;;
+
+ irix | nonstopux)
+- if test no = "$lt_irix_increment"; then
++ if test "X$lt_irix_increment" = "Xno"; then
+ func_arith $current - $age
+ else
+ func_arith $current - $age + 1
+@@ -8914,74 +7430,69 @@
+ nonstopux) verstring_prefix=nonstopux ;;
+ *) verstring_prefix=sgi ;;
+ esac
+- verstring=$verstring_prefix$major.$revision
++ verstring="$verstring_prefix$major.$revision"
+
+ # Add in all the interfaces that we are compatible with.
+ loop=$revision
+- while test 0 -ne "$loop"; do
++ while test "$loop" -ne 0; do
+ func_arith $revision - $loop
+ iface=$func_arith_result
+ func_arith $loop - 1
+ loop=$func_arith_result
+- verstring=$verstring_prefix$major.$iface:$verstring
++ verstring="$verstring_prefix$major.$iface:$verstring"
+ done
+
+- # Before this point, $major must not contain '.'.
++ # Before this point, $major must not contain `.'.
+ major=.$major
+- versuffix=$major.$revision
++ versuffix="$major.$revision"
+ ;;
+
+ linux) # correct to gnu/linux during the next big refactor
+ func_arith $current - $age
+ major=.$func_arith_result
+- versuffix=$major.$age.$revision
++ versuffix="$major.$age.$revision"
+ ;;
+
+ osf)
+ func_arith $current - $age
+ major=.$func_arith_result
+- versuffix=.$current.$age.$revision
+- verstring=$current.$age.$revision
++ versuffix=".$current.$age.$revision"
++ verstring="$current.$age.$revision"
+
+ # Add in all the interfaces that we are compatible with.
+ loop=$age
+- while test 0 -ne "$loop"; do
++ while test "$loop" -ne 0; do
+ func_arith $current - $loop
+ iface=$func_arith_result
+ func_arith $loop - 1
+ loop=$func_arith_result
+- verstring=$verstring:$iface.0
++ verstring="$verstring:${iface}.0"
+ done
+
+ # Make executables depend on our current version.
+- func_append verstring ":$current.0"
++ func_append verstring ":${current}.0"
+ ;;
+
+ qnx)
+- major=.$current
+- versuffix=.$current
+- ;;
+-
+- sco)
+- major=.$current
+- versuffix=.$current
++ major=".$current"
++ versuffix=".$current"
+ ;;
+
+ sunos)
+- major=.$current
+- versuffix=.$current.$revision
++ major=".$current"
++ versuffix=".$current.$revision"
+ ;;
+
+ windows)
+ # Use '-' rather than '.', since we only want one
+- # extension on DOS 8.3 file systems.
++ # extension on DOS 8.3 filesystems.
+ func_arith $current - $age
+ major=$func_arith_result
+- versuffix=-$major
++ versuffix="-$major"
+ ;;
+
+ *)
+- func_fatal_configuration "unknown library version type '$version_type'"
++ func_fatal_configuration "unknown library version type \`$version_type'"
+ ;;
+ esac
+
+@@ -8995,45 +7506,42 @@
+ verstring=
+ ;;
+ *)
+- verstring=0.0
++ verstring="0.0"
+ ;;
+ esac
+- if test no = "$need_version"; then
++ if test "$need_version" = no; then
+ versuffix=
+ else
+- versuffix=.0.0
++ versuffix=".0.0"
+ fi
+ fi
+
+ # Remove version info from name if versioning should be avoided
+- if test yes,no = "$avoid_version,$need_version"; then
++ if test "$avoid_version" = yes && test "$need_version" = no; then
+ major=
+ versuffix=
+- verstring=
++ verstring=""
+ fi
+
+ # Check to see if the archive will have undefined symbols.
+- if test yes = "$allow_undefined"; then
+- if test unsupported = "$allow_undefined_flag"; then
+- if test yes = "$build_old_libs"; then
+- func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+- build_libtool_libs=no
+- else
+- func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+- fi
++ if test "$allow_undefined" = yes; then
++ if test "$allow_undefined_flag" = unsupported; then
++ func_warning "undefined symbols not allowed in $host shared libraries"
++ build_libtool_libs=no
++ build_old_libs=yes
+ fi
+ else
+ # Don't allow undefined symbols.
+- allow_undefined_flag=$no_undefined_flag
++ allow_undefined_flag="$no_undefined_flag"
+ fi
+
+ fi
+
+- func_generate_dlsyms "$libname" "$libname" :
++ func_generate_dlsyms "$libname" "$libname" "yes"
+ func_append libobjs " $symfileobj"
+- test " " = "$libobjs" && libobjs=
++ test "X$libobjs" = "X " && libobjs=
+
+- if test relink != "$opt_mode"; then
++ if test "$opt_mode" != relink; then
+ # Remove our outputs, but don't remove object files since they
+ # may have been created when compiling PIC objects.
+ removelist=
+@@ -9042,8 +7550,8 @@
+ case $p in
+ *.$objext | *.gcno)
+ ;;
+- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+- if test -n "$precious_files_regex"; then
++ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
++ if test "X$precious_files_regex" != "X"; then
+ if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+ then
+ continue
+@@ -9059,11 +7567,11 @@
+ fi
+
+ # Now set the variables for building old libraries.
+- if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
++ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+ func_append oldlibs " $output_objdir/$libname.$libext"
+
+ # Transform .lo files to .o files.
+- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
++ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+ fi
+
+ # Eliminate all temporary directories.
+@@ -9084,13 +7592,13 @@
+ *) func_append finalize_rpath " $libdir" ;;
+ esac
+ done
+- if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
++ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ dependency_libs="$temp_xrpath $dependency_libs"
+ fi
+ fi
+
+ # Make sure dlfiles contains only unique files that won't be dlpreopened
+- old_dlfiles=$dlfiles
++ old_dlfiles="$dlfiles"
+ dlfiles=
+ for lib in $old_dlfiles; do
+ case " $dlprefiles $dlfiles " in
+@@ -9100,7 +7608,7 @@
+ done
+
+ # Make sure dlprefiles contains only unique files
+- old_dlprefiles=$dlprefiles
++ old_dlprefiles="$dlprefiles"
+ dlprefiles=
+ for lib in $old_dlprefiles; do
+ case "$dlprefiles " in
+@@ -9109,7 +7617,7 @@
+ esac
+ done
+
+- if test yes = "$build_libtool_libs"; then
++ if test "$build_libtool_libs" = yes; then
+ if test -n "$rpath"; then
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+@@ -9133,7 +7641,7 @@
+ ;;
+ *)
+ # Add libc to deplibs on all other systems if necessary.
+- if test yes = "$build_libtool_need_lc"; then
++ if test "$build_libtool_need_lc" = "yes"; then
+ func_append deplibs " -lc"
+ fi
+ ;;
+@@ -9149,9 +7657,9 @@
+ # I'm not sure if I'm treating the release correctly. I think
+ # release should show up in the -l (ie -lgmp5) so we don't want to
+ # add it in twice. Is that correct?
+- release=
+- versuffix=
+- major=
++ release=""
++ versuffix=""
++ major=""
+ newdeplibs=
+ droppeddeps=no
+ case $deplibs_check_method in
+@@ -9180,20 +7688,20 @@
+ -l*)
+ func_stripname -l '' "$i"
+ name=$func_stripname_result
+- if test yes = "$allow_libtool_libs_with_static_runtimes"; then
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+ func_append newdeplibs " $i"
+- i=
++ i=""
+ ;;
+ esac
+ fi
+- if test -n "$i"; then
++ if test -n "$i" ; then
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+ set dummy $deplib_matches; shift
+ deplib_match=$1
+- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
++ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ func_append newdeplibs " $i"
+ else
+ droppeddeps=yes
+@@ -9223,20 +7731,20 @@
+ $opt_dry_run || $RM conftest
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+ ldd_output=`ldd conftest`
+- if test yes = "$allow_libtool_libs_with_static_runtimes"; then
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+ func_append newdeplibs " $i"
+- i=
++ i=""
+ ;;
+ esac
+ fi
+- if test -n "$i"; then
++ if test -n "$i" ; then
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+ set dummy $deplib_matches; shift
+ deplib_match=$1
+- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
++ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ func_append newdeplibs " $i"
+ else
+ droppeddeps=yes
+@@ -9273,24 +7781,24 @@
+ -l*)
+ func_stripname -l '' "$a_deplib"
+ name=$func_stripname_result
+- if test yes = "$allow_libtool_libs_with_static_runtimes"; then
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $a_deplib "*)
+ func_append newdeplibs " $a_deplib"
+- a_deplib=
++ a_deplib=""
+ ;;
+ esac
+ fi
+- if test -n "$a_deplib"; then
++ if test -n "$a_deplib" ; then
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ if test -n "$file_magic_glob"; then
+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+ else
+ libnameglob=$libname
+ fi
+- test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
++ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+- if test yes = "$want_nocaseglob"; then
++ if test "$want_nocaseglob" = yes; then
+ shopt -s nocaseglob
+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+ $nocaseglob
+@@ -9308,25 +7816,25 @@
+ # We might still enter an endless loop, since a link
+ # loop can be closed while we follow links,
+ # but so what?
+- potlib=$potent_lib
++ potlib="$potent_lib"
+ while test -h "$potlib" 2>/dev/null; do
+- potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
++ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ case $potliblink in
+- [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+- *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
++ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
++ *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+ esac
+ done
+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+ $SED -e 10q |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ func_append newdeplibs " $a_deplib"
+- a_deplib=
++ a_deplib=""
+ break 2
+ fi
+ done
+ done
+ fi
+- if test -n "$a_deplib"; then
++ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+ echo
+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+@@ -9334,7 +7842,7 @@
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because I did check the linker path looking for a file starting"
+- if test -z "$potlib"; then
++ if test -z "$potlib" ; then
+ $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+ else
+ $ECHO "*** with $libname and none of the candidates passed a file format test"
+@@ -9357,30 +7865,30 @@
+ -l*)
+ func_stripname -l '' "$a_deplib"
+ name=$func_stripname_result
+- if test yes = "$allow_libtool_libs_with_static_runtimes"; then
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $a_deplib "*)
+ func_append newdeplibs " $a_deplib"
+- a_deplib=
++ a_deplib=""
+ ;;
+ esac
+ fi
+- if test -n "$a_deplib"; then
++ if test -n "$a_deplib" ; then
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ for potent_lib in $potential_libs; do
+- potlib=$potent_lib # see symlink-check above in file_magic test
++ potlib="$potent_lib" # see symlink-check above in file_magic test
+ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+ $EGREP "$match_pattern_regex" > /dev/null; then
+ func_append newdeplibs " $a_deplib"
+- a_deplib=
++ a_deplib=""
+ break 2
+ fi
+ done
+ done
+ fi
+- if test -n "$a_deplib"; then
++ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+ echo
+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+@@ -9388,7 +7896,7 @@
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because I did check the linker path looking for a file starting"
+- if test -z "$potlib"; then
++ if test -z "$potlib" ; then
+ $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+ else
+ $ECHO "*** with $libname and none of the candidates passed a file format test"
+@@ -9404,18 +7912,18 @@
+ done # Gone through all deplibs.
+ ;;
+ none | unknown | *)
+- newdeplibs=
++ newdeplibs=""
+ tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+- if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+- for i in $predeps $postdeps; do
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++ for i in $predeps $postdeps ; do
+ # can't use Xsed below, because $i might contain '/'
+- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
++ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+ done
+ fi
+ case $tmp_deplibs in
+ *[!\ \ ]*)
+ echo
+- if test none = "$deplibs_check_method"; then
++ if test "X$deplibs_check_method" = "Xnone"; then
+ echo "*** Warning: inter-library dependencies are not supported in this platform."
+ else
+ echo "*** Warning: inter-library dependencies are not known to be supported."
+@@ -9439,8 +7947,8 @@
+ ;;
+ esac
+
+- if test yes = "$droppeddeps"; then
+- if test yes = "$module"; then
++ if test "$droppeddeps" = yes; then
++ if test "$module" = yes; then
+ echo
+ echo "*** Warning: libtool could not satisfy all declared inter-library"
+ $ECHO "*** dependencies of module $libname. Therefore, libtool will create"
+@@ -9449,12 +7957,12 @@
+ if test -z "$global_symbol_pipe"; then
+ echo
+ echo "*** However, this would only work if libtool was able to extract symbol"
+- echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
++ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** not find such a program. So, this module is probably useless."
+- echo "*** 'nm' from GNU binutils and a full rebuild may help."
++ echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+- if test no = "$build_old_libs"; then
+- oldlibs=$output_objdir/$libname.$libext
++ if test "$build_old_libs" = no; then
++ oldlibs="$output_objdir/$libname.$libext"
+ build_libtool_libs=module
+ build_old_libs=yes
+ else
+@@ -9465,14 +7973,14 @@
+ echo "*** automatically added whenever a program is linked with this library"
+ echo "*** or is declared to -dlopen it."
+
+- if test no = "$allow_undefined"; then
++ if test "$allow_undefined" = no; then
+ echo
+ echo "*** Since this library must not contain undefined symbols,"
+ echo "*** because either the platform does not support them or"
+ echo "*** it was explicitly requested with -no-undefined,"
+ echo "*** libtool will only create a static version of it."
+- if test no = "$build_old_libs"; then
+- oldlibs=$output_objdir/$libname.$libext
++ if test "$build_old_libs" = no; then
++ oldlibs="$output_objdir/$libname.$libext"
+ build_libtool_libs=module
+ build_old_libs=yes
+ else
+@@ -9518,7 +8026,7 @@
+ *) func_append new_libs " $deplib" ;;
+ esac
+ done
+- deplibs=$new_libs
++ deplibs="$new_libs"
+
+ # All the library-specific variables (install_libdir is set above).
+ library_names=
+@@ -9526,25 +8034,25 @@
+ dlname=
+
+ # Test again, we may have decided not to build it any more
+- if test yes = "$build_libtool_libs"; then
+- # Remove $wl instances when linking with ld.
++ if test "$build_libtool_libs" = yes; then
++ # Remove ${wl} instances when linking with ld.
+ # FIXME: should test the right _cmds variable.
+ case $archive_cmds in
+ *\$LD\ *) wl= ;;
+ esac
+- if test yes = "$hardcode_into_libs"; then
++ if test "$hardcode_into_libs" = yes; then
+ # Hardcode the library paths
+ hardcode_libdirs=
+ dep_rpath=
+- rpath=$finalize_rpath
+- test relink = "$opt_mode" || rpath=$compile_rpath$rpath
++ rpath="$finalize_rpath"
++ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+ for libdir in $rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ func_replace_sysroot "$libdir"
+ libdir=$func_replace_sysroot_result
+ if test -z "$hardcode_libdirs"; then
+- hardcode_libdirs=$libdir
++ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+@@ -9569,7 +8077,7 @@
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+- libdir=$hardcode_libdirs
++ libdir="$hardcode_libdirs"
+ eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+ fi
+ if test -n "$runpath_var" && test -n "$perm_rpath"; then
+@@ -9583,8 +8091,8 @@
+ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+ fi
+
+- shlibpath=$finalize_shlibpath
+- test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
++ shlibpath="$finalize_shlibpath"
++ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ if test -n "$shlibpath"; then
+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+ fi
+@@ -9594,19 +8102,19 @@
+ eval library_names=\"$library_names_spec\"
+ set dummy $library_names
+ shift
+- realname=$1
++ realname="$1"
+ shift
+
+ if test -n "$soname_spec"; then
+ eval soname=\"$soname_spec\"
+ else
+- soname=$realname
++ soname="$realname"
+ fi
+ if test -z "$dlname"; then
+ dlname=$soname
+ fi
+
+- lib=$output_objdir/$realname
++ lib="$output_objdir/$realname"
+ linknames=
+ for link
+ do
+@@ -9620,7 +8128,7 @@
+ delfiles=
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+- export_symbols=$output_objdir/$libname.uexp
++ export_symbols="$output_objdir/$libname.uexp"
+ func_append delfiles " $export_symbols"
+ fi
+
+@@ -9629,31 +8137,31 @@
+ cygwin* | mingw* | cegcc*)
+ if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+ # exporting using user supplied symfile
+- func_dll_def_p "$export_symbols" || {
++ if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+ # and it's NOT already a .def file. Must figure out
+ # which of the given symbols are data symbols and tag
+ # them as such. So, trigger use of export_symbols_cmds.
+ # export_symbols gets reassigned inside the "prepare
+ # the list of exported symbols" if statement, so the
+ # include_expsyms logic still works.
+- orig_export_symbols=$export_symbols
++ orig_export_symbols="$export_symbols"
+ export_symbols=
+ always_export_symbols=yes
+- }
++ fi
+ fi
+ ;;
+ esac
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+- if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+- func_verbose "generating symbol list for '$libname.la'"
+- export_symbols=$output_objdir/$libname.exp
++ if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
++ func_verbose "generating symbol list for \`$libname.la'"
++ export_symbols="$output_objdir/$libname.exp"
+ $opt_dry_run || $RM $export_symbols
+ cmds=$export_symbols_cmds
+- save_ifs=$IFS; IFS='~'
++ save_ifs="$IFS"; IFS='~'
+ for cmd1 in $cmds; do
+- IFS=$save_ifs
++ IFS="$save_ifs"
+ # Take the normal branch if the nm_file_list_spec branch
+ # doesn't work or if tool conversion is not needed.
+ case $nm_file_list_spec~$to_tool_file_cmd in
+@@ -9667,7 +8175,7 @@
+ try_normal_branch=no
+ ;;
+ esac
+- if test yes = "$try_normal_branch" \
++ if test "$try_normal_branch" = yes \
+ && { test "$len" -lt "$max_cmd_len" \
+ || test "$max_cmd_len" -le -1; }
+ then
+@@ -9678,7 +8186,7 @@
+ output_la=$func_basename_result
+ save_libobjs=$libobjs
+ save_output=$output
+- output=$output_objdir/$output_la.nm
++ output=${output_objdir}/${output_la}.nm
+ func_to_tool_file "$output"
+ libobjs=$nm_file_list_spec$func_to_tool_file_result
+ func_append delfiles " $output"
+@@ -9701,8 +8209,8 @@
+ break
+ fi
+ done
+- IFS=$save_ifs
+- if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
++ IFS="$save_ifs"
++ if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+ func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+ fi
+@@ -9710,16 +8218,16 @@
+ fi
+
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+- tmp_export_symbols=$export_symbols
+- test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
++ tmp_export_symbols="$export_symbols"
++ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+ fi
+
+- if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
++ if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+ # The given exports_symbols file has to be filtered, so filter it.
+- func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
++ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ # FIXME: $output_objdir/$libname.filter potentially contains lots of
+- # 's' commands, which not all seds can handle. GNU sed should be fine
++ # 's' commands which not all seds can handle. GNU sed should be fine
+ # though. Also, the filter scales superlinearly with the number of
+ # global variables. join(1) would be nice here, but unfortunately
+ # isn't a blessed tool.
+@@ -9738,11 +8246,11 @@
+ ;;
+ esac
+ done
+- deplibs=$tmp_deplibs
++ deplibs="$tmp_deplibs"
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec" &&
+- test yes = "$compiler_needs_object" &&
++ test "$compiler_needs_object" = yes &&
+ test -z "$libobjs"; then
+ # extract the archives, so we have objects to list.
+ # TODO: could optimize this to just extract one archive.
+@@ -9753,7 +8261,7 @@
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ test "X$libobjs" = "X " && libobjs=
+ else
+- gentop=$output_objdir/${outputname}x
++ gentop="$output_objdir/${outputname}x"
+ func_append generated " $gentop"
+
+ func_extract_archives $gentop $convenience
+@@ -9762,18 +8270,18 @@
+ fi
+ fi
+
+- if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
++ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ eval flag=\"$thread_safe_flag_spec\"
+ func_append linker_flags " $flag"
+ fi
+
+ # Make a backup of the uninstalled library when relinking
+- if test relink = "$opt_mode"; then
++ if test "$opt_mode" = relink; then
+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+ fi
+
+ # Do each of the archive commands.
+- if test yes = "$module" && test -n "$module_cmds"; then
++ if test "$module" = yes && test -n "$module_cmds" ; then
+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+ eval test_cmds=\"$module_expsym_cmds\"
+ cmds=$module_expsym_cmds
+@@ -9791,7 +8299,7 @@
+ fi
+ fi
+
+- if test : != "$skipped_export" &&
++ if test "X$skipped_export" != "X:" &&
+ func_len " $test_cmds" &&
+ len=$func_len_result &&
+ test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+@@ -9824,8 +8332,8 @@
+ last_robj=
+ k=1
+
+- if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+- output=$output_objdir/$output_la.lnkscript
++ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
++ output=${output_objdir}/${output_la}.lnkscript
+ func_verbose "creating GNU ld script: $output"
+ echo 'INPUT (' > $output
+ for obj in $save_libobjs
+@@ -9837,14 +8345,14 @@
+ func_append delfiles " $output"
+ func_to_tool_file "$output"
+ output=$func_to_tool_file_result
+- elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+- output=$output_objdir/$output_la.lnk
++ elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
++ output=${output_objdir}/${output_la}.lnk
+ func_verbose "creating linker input file list: $output"
+ : > $output
+ set x $save_libobjs
+ shift
+ firstobj=
+- if test yes = "$compiler_needs_object"; then
++ if test "$compiler_needs_object" = yes; then
+ firstobj="$1 "
+ shift
+ fi
+@@ -9859,7 +8367,7 @@
+ else
+ if test -n "$save_libobjs"; then
+ func_verbose "creating reloadable object files..."
+- output=$output_objdir/$output_la-$k.$objext
++ output=$output_objdir/$output_la-${k}.$objext
+ eval test_cmds=\"$reload_cmds\"
+ func_len " $test_cmds"
+ len0=$func_len_result
+@@ -9871,13 +8379,13 @@
+ func_len " $obj"
+ func_arith $len + $func_len_result
+ len=$func_arith_result
+- if test -z "$objlist" ||
++ if test "X$objlist" = X ||
+ test "$len" -lt "$max_cmd_len"; then
+ func_append objlist " $obj"
+ else
+ # The command $test_cmds is almost too long, add a
+ # command to the queue.
+- if test 1 -eq "$k"; then
++ if test "$k" -eq 1 ; then
+ # The first file doesn't have a previous command to add.
+ reload_objs=$objlist
+ eval concat_cmds=\"$reload_cmds\"
+@@ -9887,10 +8395,10 @@
+ reload_objs="$objlist $last_robj"
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+ fi
+- last_robj=$output_objdir/$output_la-$k.$objext
++ last_robj=$output_objdir/$output_la-${k}.$objext
+ func_arith $k + 1
+ k=$func_arith_result
+- output=$output_objdir/$output_la-$k.$objext
++ output=$output_objdir/$output_la-${k}.$objext
+ objlist=" $obj"
+ func_len " $last_robj"
+ func_arith $len0 + $func_len_result
+@@ -9902,9 +8410,9 @@
+ # files will link in the last one created.
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ reload_objs="$objlist $last_robj"
+- eval concat_cmds=\"\$concat_cmds$reload_cmds\"
++ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+ if test -n "$last_robj"; then
+- eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
++ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+ fi
+ func_append delfiles " $output"
+
+@@ -9912,9 +8420,9 @@
+ output=
+ fi
+
+- ${skipped_export-false} && {
+- func_verbose "generating symbol list for '$libname.la'"
+- export_symbols=$output_objdir/$libname.exp
++ if ${skipped_export-false}; then
++ func_verbose "generating symbol list for \`$libname.la'"
++ export_symbols="$output_objdir/$libname.exp"
+ $opt_dry_run || $RM $export_symbols
+ libobjs=$output
+ # Append the command to create the export file.
+@@ -9923,16 +8431,16 @@
+ if test -n "$last_robj"; then
+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+ fi
+- }
++ fi
+
+ test -n "$save_libobjs" &&
+ func_verbose "creating a temporary reloadable object file: $output"
+
+ # Loop through the commands generated above and execute them.
+- save_ifs=$IFS; IFS='~'
++ save_ifs="$IFS"; IFS='~'
+ for cmd in $concat_cmds; do
+- IFS=$save_ifs
+- $opt_quiet || {
++ IFS="$save_ifs"
++ $opt_silent || {
+ func_quote_for_expand "$cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+@@ -9940,7 +8448,7 @@
+ lt_exit=$?
+
+ # Restore the uninstalled library and exit
+- if test relink = "$opt_mode"; then
++ if test "$opt_mode" = relink; then
+ ( cd "$output_objdir" && \
+ $RM "${realname}T" && \
+ $MV "${realname}U" "$realname" )
+@@ -9949,7 +8457,7 @@
+ exit $lt_exit
+ }
+ done
+- IFS=$save_ifs
++ IFS="$save_ifs"
+
+ if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+@@ -9957,18 +8465,18 @@
+ fi
+ fi
+
+- ${skipped_export-false} && {
++ if ${skipped_export-false}; then
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+- tmp_export_symbols=$export_symbols
+- test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
++ tmp_export_symbols="$export_symbols"
++ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+ fi
+
+ if test -n "$orig_export_symbols"; then
+ # The given exports_symbols file has to be filtered, so filter it.
+- func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
++ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ # FIXME: $output_objdir/$libname.filter potentially contains lots of
+- # 's' commands, which not all seds can handle. GNU sed should be fine
++ # 's' commands which not all seds can handle. GNU sed should be fine
+ # though. Also, the filter scales superlinearly with the number of
+ # global variables. join(1) would be nice here, but unfortunately
+ # isn't a blessed tool.
+@@ -9977,7 +8485,7 @@
+ export_symbols=$output_objdir/$libname.def
+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+ fi
+- }
++ fi
+
+ libobjs=$output
+ # Restore the value of output.
+@@ -9991,7 +8499,7 @@
+ # value of $libobjs for piecewise linking.
+
+ # Do each of the archive commands.
+- if test yes = "$module" && test -n "$module_cmds"; then
++ if test "$module" = yes && test -n "$module_cmds" ; then
+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+ cmds=$module_expsym_cmds
+ else
+@@ -10013,7 +8521,7 @@
+
+ # Add any objects from preloaded convenience libraries
+ if test -n "$dlprefiles"; then
+- gentop=$output_objdir/${outputname}x
++ gentop="$output_objdir/${outputname}x"
+ func_append generated " $gentop"
+
+ func_extract_archives $gentop $dlprefiles
+@@ -10021,12 +8529,11 @@
+ test "X$libobjs" = "X " && libobjs=
+ fi
+
+- save_ifs=$IFS; IFS='~'
++ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+- IFS=$sp$nl
++ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+- IFS=$save_ifs
+- $opt_quiet || {
++ $opt_silent || {
+ func_quote_for_expand "$cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+@@ -10034,7 +8541,7 @@
+ lt_exit=$?
+
+ # Restore the uninstalled library and exit
+- if test relink = "$opt_mode"; then
++ if test "$opt_mode" = relink; then
+ ( cd "$output_objdir" && \
+ $RM "${realname}T" && \
+ $MV "${realname}U" "$realname" )
+@@ -10043,10 +8550,10 @@
+ exit $lt_exit
+ }
+ done
+- IFS=$save_ifs
++ IFS="$save_ifs"
+
+ # Restore the uninstalled library and exit
+- if test relink = "$opt_mode"; then
++ if test "$opt_mode" = relink; then
+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+ if test -n "$convenience"; then
+@@ -10066,39 +8573,39 @@
+ done
+
+ # If -module or -export-dynamic was specified, set the dlname.
+- if test yes = "$module" || test yes = "$export_dynamic"; then
++ if test "$module" = yes || test "$export_dynamic" = yes; then
+ # On all known operating systems, these are identical.
+- dlname=$soname
++ dlname="$soname"
+ fi
+ fi
+ ;;
+
+ obj)
+- if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+- func_warning "'-dlopen' is ignored for objects"
++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++ func_warning "\`-dlopen' is ignored for objects"
+ fi
+
+ case " $deplibs" in
+ *\ -l* | *\ -L*)
+- func_warning "'-l' and '-L' are ignored for objects" ;;
++ func_warning "\`-l' and \`-L' are ignored for objects" ;;
+ esac
+
+ test -n "$rpath" && \
+- func_warning "'-rpath' is ignored for objects"
++ func_warning "\`-rpath' is ignored for objects"
+
+ test -n "$xrpath" && \
+- func_warning "'-R' is ignored for objects"
++ func_warning "\`-R' is ignored for objects"
+
+ test -n "$vinfo" && \
+- func_warning "'-version-info' is ignored for objects"
++ func_warning "\`-version-info' is ignored for objects"
+
+ test -n "$release" && \
+- func_warning "'-release' is ignored for objects"
++ func_warning "\`-release' is ignored for objects"
+
+ case $output in
+ *.lo)
+ test -n "$objs$old_deplibs" && \
+- func_fatal_error "cannot build library object '$output' from non-libtool objects"
++ func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+
+ libobj=$output
+ func_lo2o "$libobj"
+@@ -10106,7 +8613,7 @@
+ ;;
+ *)
+ libobj=
+- obj=$output
++ obj="$output"
+ ;;
+ esac
+
+@@ -10119,19 +8626,17 @@
+ # the extraction.
+ reload_conv_objs=
+ gentop=
+- # if reload_cmds runs $LD directly, get rid of -Wl from
+- # whole_archive_flag_spec and hope we can get by with turning comma
+- # into space.
+- case $reload_cmds in
+- *\$LD[\ \$]*) wl= ;;
+- esac
++ # reload_cmds runs $LD directly, so let us get rid of
++ # -Wl from whole_archive_flag_spec and hope we can get by with
++ # turning comma into space..
++ wl=
++
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+- test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+- reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
++ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ else
+- gentop=$output_objdir/${obj}x
++ gentop="$output_objdir/${obj}x"
+ func_append generated " $gentop"
+
+ func_extract_archives $gentop $convenience
+@@ -10140,12 +8645,12 @@
+ fi
+
+ # If we're not building shared, we need to use non_pic_objs
+- test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
++ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
+ # Create the old-style object.
+- reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
++ reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+- output=$obj
++ output="$obj"
+ func_execute_cmds "$reload_cmds" 'exit $?'
+
+ # Exit if we aren't doing a library object file.
+@@ -10157,7 +8662,7 @@
+ exit $EXIT_SUCCESS
+ fi
+
+- test yes = "$build_libtool_libs" || {
++ if test "$build_libtool_libs" != yes; then
+ if test -n "$gentop"; then
+ func_show_eval '${RM}r "$gentop"'
+ fi
+@@ -10167,12 +8672,12 @@
+ # $show "echo timestamp > $libobj"
+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+ exit $EXIT_SUCCESS
+- }
++ fi
+
+- if test -n "$pic_flag" || test default != "$pic_mode"; then
++ if test -n "$pic_flag" || test "$pic_mode" != default; then
+ # Only do commands if we really have different PIC objects.
+ reload_objs="$libobjs $reload_conv_objs"
+- output=$libobj
++ output="$libobj"
+ func_execute_cmds "$reload_cmds" 'exit $?'
+ fi
+
+@@ -10189,14 +8694,16 @@
+ output=$func_stripname_result.exe;;
+ esac
+ test -n "$vinfo" && \
+- func_warning "'-version-info' is ignored for programs"
++ func_warning "\`-version-info' is ignored for programs"
+
+ test -n "$release" && \
+- func_warning "'-release' is ignored for programs"
++ func_warning "\`-release' is ignored for programs"
+
+- $preload \
+- && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+- && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
++ test "$preload" = yes \
++ && test "$dlopen_support" = unknown \
++ && test "$dlopen_self" = unknown \
++ && test "$dlopen_self_static" = unknown && \
++ func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+@@ -10210,11 +8717,11 @@
+ *-*-darwin*)
+ # Don't allow lazy linking, it breaks C++ global constructors
+ # But is supposedly fixed on 10.4 or later (yay!).
+- if test CXX = "$tagname"; then
++ if test "$tagname" = CXX ; then
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+ 10.[0123])
+- func_append compile_command " $wl-bind_at_load"
+- func_append finalize_command " $wl-bind_at_load"
++ func_append compile_command " ${wl}-bind_at_load"
++ func_append finalize_command " ${wl}-bind_at_load"
+ ;;
+ esac
+ fi
+@@ -10250,7 +8757,7 @@
+ *) func_append new_libs " $deplib" ;;
+ esac
+ done
+- compile_deplibs=$new_libs
++ compile_deplibs="$new_libs"
+
+
+ func_append compile_command " $compile_deplibs"
+@@ -10274,7 +8781,7 @@
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+- hardcode_libdirs=$libdir
++ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+@@ -10297,7 +8804,7 @@
+ fi
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+- testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
++ testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$libdir:"*) ;;
+ ::) dllsearchpath=$libdir;;
+@@ -10314,10 +8821,10 @@
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+- libdir=$hardcode_libdirs
++ libdir="$hardcode_libdirs"
+ eval rpath=\" $hardcode_libdir_flag_spec\"
+ fi
+- compile_rpath=$rpath
++ compile_rpath="$rpath"
+
+ rpath=
+ hardcode_libdirs=
+@@ -10325,7 +8832,7 @@
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+- hardcode_libdirs=$libdir
++ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+@@ -10350,43 +8857,45 @@
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+- libdir=$hardcode_libdirs
++ libdir="$hardcode_libdirs"
+ eval rpath=\" $hardcode_libdir_flag_spec\"
+ fi
+- finalize_rpath=$rpath
++ finalize_rpath="$rpath"
+
+- if test -n "$libobjs" && test yes = "$build_old_libs"; then
++ if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ # Transform all the library objects into standard objects.
+ compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ fi
+
+- func_generate_dlsyms "$outputname" "@PROGRAM@" false
++ func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+
+ # template prelinking step
+ if test -n "$prelink_cmds"; then
+ func_execute_cmds "$prelink_cmds" 'exit $?'
+ fi
+
+- wrappers_required=:
++ wrappers_required=yes
+ case $host in
+ *cegcc* | *mingw32ce*)
+ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+- wrappers_required=false
++ wrappers_required=no
+ ;;
+ *cygwin* | *mingw* )
+- test yes = "$build_libtool_libs" || wrappers_required=false
++ if test "$build_libtool_libs" != yes; then
++ wrappers_required=no
++ fi
+ ;;
+ *)
+- if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+- wrappers_required=false
++ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
++ wrappers_required=no
+ fi
+ ;;
+ esac
+- $wrappers_required || {
++ if test "$wrappers_required" = no; then
+ # Replace the output file specification.
+ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+- link_command=$compile_command$compile_rpath
++ link_command="$compile_command$compile_rpath"
+
+ # We have no uninstalled library dependencies, so finalize right now.
+ exit_status=0
+@@ -10399,12 +8908,12 @@
+ fi
+
+ # Delete the generated files.
+- if test -f "$output_objdir/${outputname}S.$objext"; then
+- func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
++ if test -f "$output_objdir/${outputname}S.${objext}"; then
++ func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+ fi
+
+ exit $exit_status
+- }
++ fi
+
+ if test -n "$compile_shlibpath$finalize_shlibpath"; then
+ compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+@@ -10434,9 +8943,9 @@
+ fi
+ fi
+
+- if test yes = "$no_install"; then
++ if test "$no_install" = yes; then
+ # We don't need to create a wrapper script.
+- link_command=$compile_var$compile_command$compile_rpath
++ link_command="$compile_var$compile_command$compile_rpath"
+ # Replace the output file specification.
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+ # Delete the old output file.
+@@ -10453,28 +8962,27 @@
+ exit $EXIT_SUCCESS
+ fi
+
+- case $hardcode_action,$fast_install in
+- relink,*)
+- # Fast installation is not supported
+- link_command=$compile_var$compile_command$compile_rpath
+- relink_command=$finalize_var$finalize_command$finalize_rpath
+-
+- func_warning "this platform does not like uninstalled shared libraries"
+- func_warning "'$output' will be relinked during installation"
+- ;;
+- *,yes)
+- link_command=$finalize_var$compile_command$finalize_rpath
+- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+- ;;
+- *,no)
+- link_command=$compile_var$compile_command$compile_rpath
+- relink_command=$finalize_var$finalize_command$finalize_rpath
+- ;;
+- *,needless)
+- link_command=$finalize_var$compile_command$finalize_rpath
+- relink_command=
+- ;;
+- esac
++ if test "$hardcode_action" = relink; then
++ # Fast installation is not supported
++ link_command="$compile_var$compile_command$compile_rpath"
++ relink_command="$finalize_var$finalize_command$finalize_rpath"
++
++ func_warning "this platform does not like uninstalled shared libraries"
++ func_warning "\`$output' will be relinked during installation"
++ else
++ if test "$fast_install" != no; then
++ link_command="$finalize_var$compile_command$finalize_rpath"
++ if test "$fast_install" = yes; then
++ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
++ else
++ # fast_install is set to needless
++ relink_command=
++ fi
++ else
++ link_command="$compile_var$compile_command$compile_rpath"
++ relink_command="$finalize_var$finalize_command$finalize_rpath"
++ fi
++ fi
+
+ # Replace the output file specification.
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+@@ -10531,8 +9039,8 @@
+ func_dirname_and_basename "$output" "" "."
+ output_name=$func_basename_result
+ output_path=$func_dirname_result
+- cwrappersource=$output_path/$objdir/lt-$output_name.c
+- cwrapper=$output_path/$output_name.exe
++ cwrappersource="$output_path/$objdir/lt-$output_name.c"
++ cwrapper="$output_path/$output_name.exe"
+ $RM $cwrappersource $cwrapper
+ trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+@@ -10553,7 +9061,7 @@
+ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+ $opt_dry_run || {
+ # note: this script will not be executed, so do not chmod.
+- if test "x$build" = "x$host"; then
++ if test "x$build" = "x$host" ; then
+ $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+ else
+ func_emit_wrapper no > $func_ltwrapper_scriptname_result
+@@ -10576,27 +9084,25 @@
+ # See if we need to build an old-fashioned archive.
+ for oldlib in $oldlibs; do
+
+- case $build_libtool_libs in
+- convenience)
+- oldobjs="$libobjs_save $symfileobj"
+- addlibs=$convenience
+- build_libtool_libs=no
+- ;;
+- module)
+- oldobjs=$libobjs_save
+- addlibs=$old_convenience
++ if test "$build_libtool_libs" = convenience; then
++ oldobjs="$libobjs_save $symfileobj"
++ addlibs="$convenience"
++ build_libtool_libs=no
++ else
++ if test "$build_libtool_libs" = module; then
++ oldobjs="$libobjs_save"
+ build_libtool_libs=no
+- ;;
+- *)
++ else
+ oldobjs="$old_deplibs $non_pic_objects"
+- $preload && test -f "$symfileobj" \
+- && func_append oldobjs " $symfileobj"
+- addlibs=$old_convenience
+- ;;
+- esac
++ if test "$preload" = yes && test -f "$symfileobj"; then
++ func_append oldobjs " $symfileobj"
++ fi
++ fi
++ addlibs="$old_convenience"
++ fi
+
+ if test -n "$addlibs"; then
+- gentop=$output_objdir/${outputname}x
++ gentop="$output_objdir/${outputname}x"
+ func_append generated " $gentop"
+
+ func_extract_archives $gentop $addlibs
+@@ -10604,13 +9110,13 @@
+ fi
+
+ # Do each command in the archive commands.
+- if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
++ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ cmds=$old_archive_from_new_cmds
+ else
+
+ # Add any objects from preloaded convenience libraries
+ if test -n "$dlprefiles"; then
+- gentop=$output_objdir/${outputname}x
++ gentop="$output_objdir/${outputname}x"
+ func_append generated " $gentop"
+
+ func_extract_archives $gentop $dlprefiles
+@@ -10631,7 +9137,7 @@
+ :
+ else
+ echo "copying selected object files to avoid basename conflicts..."
+- gentop=$output_objdir/${outputname}x
++ gentop="$output_objdir/${outputname}x"
+ func_append generated " $gentop"
+ func_mkdir_p "$gentop"
+ save_oldobjs=$oldobjs
+@@ -10640,7 +9146,7 @@
+ for obj in $save_oldobjs
+ do
+ func_basename "$obj"
+- objbase=$func_basename_result
++ objbase="$func_basename_result"
+ case " $oldobjs " in
+ " ") oldobjs=$obj ;;
+ *[\ /]"$objbase "*)
+@@ -10709,18 +9215,18 @@
+ else
+ # the above command should be used before it gets too long
+ oldobjs=$objlist
+- if test "$obj" = "$last_oldobj"; then
++ if test "$obj" = "$last_oldobj" ; then
+ RANLIB=$save_RANLIB
+ fi
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+- eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
++ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ objlist=
+ len=$len0
+ fi
+ done
+ RANLIB=$save_RANLIB
+ oldobjs=$objlist
+- if test -z "$oldobjs"; then
++ if test "X$oldobjs" = "X" ; then
+ eval cmds=\"\$concat_cmds\"
+ else
+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+@@ -10737,7 +9243,7 @@
+ case $output in
+ *.la)
+ old_library=
+- test yes = "$build_old_libs" && old_library=$libname.$libext
++ test "$build_old_libs" = yes && old_library="$libname.$libext"
+ func_verbose "creating $output"
+
+ # Preserve any variables that may affect compiler behavior
+@@ -10752,31 +9258,31 @@
+ fi
+ done
+ # Quote the link command for shipping.
+- relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
++ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+- if test yes = "$hardcode_automatic"; then
++ if test "$hardcode_automatic" = yes ; then
+ relink_command=
+ fi
+
+ # Only create the output if not a dry run.
+ $opt_dry_run || {
+ for installed in no yes; do
+- if test yes = "$installed"; then
++ if test "$installed" = yes; then
+ if test -z "$install_libdir"; then
+ break
+ fi
+- output=$output_objdir/${outputname}i
++ output="$output_objdir/$outputname"i
+ # Replace all uninstalled libtool libraries with the installed ones
+ newdependency_libs=
+ for deplib in $dependency_libs; do
+ case $deplib in
+ *.la)
+ func_basename "$deplib"
+- name=$func_basename_result
++ name="$func_basename_result"
+ func_resolve_sysroot "$deplib"
+- eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+ test -z "$libdir" && \
+- func_fatal_error "'$deplib' is not a valid libtool archive"
++ func_fatal_error "\`$deplib' is not a valid libtool archive"
+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+ ;;
+ -L*)
+@@ -10792,23 +9298,23 @@
+ *) func_append newdependency_libs " $deplib" ;;
+ esac
+ done
+- dependency_libs=$newdependency_libs
++ dependency_libs="$newdependency_libs"
+ newdlfiles=
+
+ for lib in $dlfiles; do
+ case $lib in
+ *.la)
+ func_basename "$lib"
+- name=$func_basename_result
+- eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++ name="$func_basename_result"
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ test -z "$libdir" && \
+- func_fatal_error "'$lib' is not a valid libtool archive"
++ func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+ ;;
+ *) func_append newdlfiles " $lib" ;;
+ esac
+ done
+- dlfiles=$newdlfiles
++ dlfiles="$newdlfiles"
+ newdlprefiles=
+ for lib in $dlprefiles; do
+ case $lib in
+@@ -10818,34 +9324,34 @@
+ # didn't already link the preopened objects directly into
+ # the library:
+ func_basename "$lib"
+- name=$func_basename_result
+- eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++ name="$func_basename_result"
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ test -z "$libdir" && \
+- func_fatal_error "'$lib' is not a valid libtool archive"
++ func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+ ;;
+ esac
+ done
+- dlprefiles=$newdlprefiles
++ dlprefiles="$newdlprefiles"
+ else
+ newdlfiles=
+ for lib in $dlfiles; do
+ case $lib in
+- [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ *) abs=`pwd`"/$lib" ;;
+ esac
+ func_append newdlfiles " $abs"
+ done
+- dlfiles=$newdlfiles
++ dlfiles="$newdlfiles"
+ newdlprefiles=
+ for lib in $dlprefiles; do
+ case $lib in
+- [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ *) abs=`pwd`"/$lib" ;;
+ esac
+ func_append newdlprefiles " $abs"
+ done
+- dlprefiles=$newdlprefiles
++ dlprefiles="$newdlprefiles"
+ fi
+ $RM $output
+ # place dlname in correct position for cygwin
+@@ -10861,9 +9367,10 @@
+ case $host,$output,$installed,$module,$dlname in
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+ # If a -bindir argument was supplied, place the dll there.
+- if test -n "$bindir"; then
++ if test "x$bindir" != x ;
++ then
+ func_relative_path "$install_libdir" "$bindir"
+- tdlname=$func_relative_path_result/$dlname
++ tdlname=$func_relative_path_result$dlname
+ else
+ # Otherwise fall back on heuristic.
+ tdlname=../bin/$dlname
+@@ -10872,7 +9379,7 @@
+ esac
+ $ECHO > $output "\
+ # $outputname - a libtool library file
+-# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ #
+ # Please DO NOT delete this file!
+ # It is necessary for linking the library.
+@@ -10886,7 +9393,7 @@
+ # The name of the static archive.
+ old_library='$old_library'
+
+-# Linker flags that cannot go in dependency_libs.
++# Linker flags that can not go in dependency_libs.
+ inherited_linker_flags='$new_inherited_linker_flags'
+
+ # Libraries that this one depends upon.
+@@ -10912,7 +9419,7 @@
+
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+- if test no,yes = "$installed,$need_relink"; then
++ if test "$installed" = no && test "$need_relink" = yes; then
+ $ECHO >> $output "\
+ relink_command=\"$relink_command\""
+ fi
+@@ -10927,29 +9434,27 @@
+ exit $EXIT_SUCCESS
+ }
+
+-if test link = "$opt_mode" || test relink = "$opt_mode"; then
+- func_mode_link ${1+"$@"}
+-fi
++{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
++ func_mode_link ${1+"$@"}
+
+
+ # func_mode_uninstall arg...
+ func_mode_uninstall ()
+ {
+- $debug_cmd
+-
+- RM=$nonopt
++ $opt_debug
++ RM="$nonopt"
+ files=
+- rmforce=false
++ rmforce=
+ exit_status=0
+
+ # This variable tells wrapper scripts just to set variables rather
+ # than running their programs.
+- libtool_install_magic=$magic
++ libtool_install_magic="$magic"
+
+ for arg
+ do
+ case $arg in
+- -f) func_append RM " $arg"; rmforce=: ;;
++ -f) func_append RM " $arg"; rmforce=yes ;;
+ -*) func_append RM " $arg" ;;
+ *) func_append files " $arg" ;;
+ esac
+@@ -10962,18 +9467,18 @@
+
+ for file in $files; do
+ func_dirname "$file" "" "."
+- dir=$func_dirname_result
+- if test . = "$dir"; then
+- odir=$objdir
++ dir="$func_dirname_result"
++ if test "X$dir" = X.; then
++ odir="$objdir"
+ else
+- odir=$dir/$objdir
++ odir="$dir/$objdir"
+ fi
+ func_basename "$file"
+- name=$func_basename_result
+- test uninstall = "$opt_mode" && odir=$dir
++ name="$func_basename_result"
++ test "$opt_mode" = uninstall && odir="$dir"
+
+ # Remember odir for removal later, being careful to avoid duplicates
+- if test clean = "$opt_mode"; then
++ if test "$opt_mode" = clean; then
+ case " $rmdirs " in
+ *" $odir "*) ;;
+ *) func_append rmdirs " $odir" ;;
+@@ -10988,11 +9493,11 @@
+ elif test -d "$file"; then
+ exit_status=1
+ continue
+- elif $rmforce; then
++ elif test "$rmforce" = yes; then
+ continue
+ fi
+
+- rmfiles=$file
++ rmfiles="$file"
+
+ case $name in
+ *.la)
+@@ -11006,7 +9511,7 @@
+ done
+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+
+- case $opt_mode in
++ case "$opt_mode" in
+ clean)
+ case " $library_names " in
+ *" $dlname "*) ;;
+@@ -11017,12 +9522,12 @@
+ uninstall)
+ if test -n "$library_names"; then
+ # Do each command in the postuninstall commands.
+- func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
++ func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ fi
+
+ if test -n "$old_library"; then
+ # Do each command in the old_postuninstall commands.
+- func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
++ func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ fi
+ # FIXME: should reinstall the best remaining shared library.
+ ;;
+@@ -11038,19 +9543,21 @@
+ func_source $dir/$name
+
+ # Add PIC object to the list of files to remove.
+- if test -n "$pic_object" && test none != "$pic_object"; then
++ if test -n "$pic_object" &&
++ test "$pic_object" != none; then
+ func_append rmfiles " $dir/$pic_object"
+ fi
+
+ # Add non-PIC object to the list of files to remove.
+- if test -n "$non_pic_object" && test none != "$non_pic_object"; then
++ if test -n "$non_pic_object" &&
++ test "$non_pic_object" != none; then
+ func_append rmfiles " $dir/$non_pic_object"
+ fi
+ fi
+ ;;
+
+ *)
+- if test clean = "$opt_mode"; then
++ if test "$opt_mode" = clean ; then
+ noexename=$name
+ case $file in
+ *.exe)
+@@ -11077,12 +9584,12 @@
+
+ # note $name still contains .exe if it was in $file originally
+ # as does the version of $file that was added into $rmfiles
+- func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+- if test yes = "$fast_install" && test -n "$relink_command"; then
++ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
++ if test "$fast_install" = yes && test -n "$relink_command"; then
+ func_append rmfiles " $odir/lt-$name"
+ fi
+- if test "X$noexename" != "X$name"; then
+- func_append rmfiles " $odir/lt-$noexename.c"
++ if test "X$noexename" != "X$name" ; then
++ func_append rmfiles " $odir/lt-${noexename}.c"
+ fi
+ fi
+ fi
+@@ -11091,7 +9598,7 @@
+ func_show_eval "$RM $rmfiles" 'exit_status=1'
+ done
+
+- # Try to remove the $objdir's in the directories where we deleted files
++ # Try to remove the ${objdir}s in the directories where we deleted files
+ for dir in $rmdirs; do
+ if test -d "$dir"; then
+ func_show_eval "rmdir $dir >/dev/null 2>&1"
+@@ -11101,17 +9608,16 @@
+ exit $exit_status
+ }
+
+-if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+- func_mode_uninstall ${1+"$@"}
+-fi
++{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
++ func_mode_uninstall ${1+"$@"}
+
+ test -z "$opt_mode" && {
+- help=$generic_help
++ help="$generic_help"
+ func_fatal_help "you must specify a MODE"
+ }
+
+ test -z "$exec_cmd" && \
+- func_fatal_help "invalid operation mode '$opt_mode'"
++ func_fatal_help "invalid operation mode \`$opt_mode'"
+
+ if test -n "$exec_cmd"; then
+ eval exec "$exec_cmd"
+@@ -11122,7 +9628,7 @@
+
+
+ # The TAGs below are defined such that we never get into a situation
+-# where we disable both kinds of libraries. Given conflicting
++# in which we disable both kinds of libraries. Given conflicting
+ # choices, we go for a static library, that is the most portable,
+ # since we can't tell whether shared libraries were disabled because
+ # the user asked for that or because the platform doesn't support
+@@ -11145,3 +9651,5 @@
+ # mode:shell-script
+ # sh-indentation:2
+ # End:
++# vi:sw=2
++
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/lt~obsolete.m4 psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/lt~obsolete.m4
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/lt~obsolete.m4 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/lt~obsolete.m4 2020-07-16 10:48:35.382806000 +0200
+@@ -1,7 +1,6 @@
+ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+ #
+-# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+-# Foundation, Inc.
++# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+ # Written by Scott James Remnant, 2004.
+ #
+ # This file is free software; the Free Software Foundation gives
+@@ -12,7 +11,7 @@
+
+ # These exist entirely to fool aclocal when bootstrapping libtool.
+ #
+-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
++# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+ # which have later been changed to m4_define as they aren't part of the
+ # exported API, or moved to Autoconf or Automake where they belong.
+ #
+@@ -26,7 +25,7 @@
+ # included after everything else. This provides aclocal with the
+ # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+ # because those macros already exist, or will be overwritten later.
+-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
++# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+ #
+ # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+ # Yes, that means every name once taken will need to remain here until
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/ltoptions.m4 psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/ltoptions.m4
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/ltoptions.m4 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/ltoptions.m4 2020-07-16 10:48:35.379441667 +0200
+@@ -1,14 +1,14 @@
+ # Helper functions for option handling. -*- Autoconf -*-
+ #
+-# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+-# Foundation, Inc.
++# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
+ # Written by Gary V. Vaughan, 2004
+ #
+ # 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.
+
+-# serial 8 ltoptions.m4
++# serial 7 ltoptions.m4
+
+ # This is to help aclocal find these macros, as it can't see m4_define.
+ AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+@@ -29,7 +29,7 @@
+ [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+ m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+ _LT_MANGLE_DEFUN([$1], [$2]),
+- [m4_warning([Unknown $1 option '$2'])])[]dnl
++ [m4_warning([Unknown $1 option `$2'])])[]dnl
+ ])
+
+
+@@ -75,15 +75,13 @@
+ dnl
+ dnl If no reference was made to various pairs of opposing options, then
+ dnl we run the default mode handler for the pair. For example, if neither
+- dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
++ dnl `shared' nor `disable-shared' was passed, we enable building of shared
+ dnl archives by default:
+ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+- [_LT_ENABLE_FAST_INSTALL])
+- _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+- [_LT_WITH_AIX_SONAME([aix])])
++ [_LT_ENABLE_FAST_INSTALL])
+ ])
+ ])# _LT_SET_OPTIONS
+
+@@ -114,7 +112,7 @@
+ [_LT_SET_OPTION([LT_INIT], [dlopen])
+ AC_DIAGNOSE([obsolete],
+ [$0: Remove this warning and the call to _LT_SET_OPTION when you
+-put the 'dlopen' option into LT_INIT's first parameter.])
++put the `dlopen' option into LT_INIT's first parameter.])
+ ])
+
+ dnl aclocal-1.4 backwards compatibility:
+@@ -150,7 +148,7 @@
+ _LT_SET_OPTION([LT_INIT], [win32-dll])
+ AC_DIAGNOSE([obsolete],
+ [$0: Remove this warning and the call to _LT_SET_OPTION when you
+-put the 'win32-dll' option into LT_INIT's first parameter.])
++put the `win32-dll' option into LT_INIT's first parameter.])
+ ])
+
+ dnl aclocal-1.4 backwards compatibility:
+@@ -159,9 +157,9 @@
+
+ # _LT_ENABLE_SHARED([DEFAULT])
+ # ----------------------------
+-# implement the --enable-shared flag, and supports the 'shared' and
+-# 'disable-shared' LT_INIT options.
+-# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
++# implement the --enable-shared flag, and supports the `shared' and
++# `disable-shared' LT_INIT options.
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+ m4_define([_LT_ENABLE_SHARED],
+ [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+ AC_ARG_ENABLE([shared],
+@@ -174,14 +172,14 @@
+ *)
+ enable_shared=no
+ # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_shared=yes
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ ;;
+ esac],
+ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+@@ -213,9 +211,9 @@
+
+ # _LT_ENABLE_STATIC([DEFAULT])
+ # ----------------------------
+-# implement the --enable-static flag, and support the 'static' and
+-# 'disable-static' LT_INIT options.
+-# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
++# implement the --enable-static flag, and support the `static' and
++# `disable-static' LT_INIT options.
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+ m4_define([_LT_ENABLE_STATIC],
+ [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+ AC_ARG_ENABLE([static],
+@@ -228,14 +226,14 @@
+ *)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ ;;
+ esac],
+ [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+@@ -267,9 +265,9 @@
+
+ # _LT_ENABLE_FAST_INSTALL([DEFAULT])
+ # ----------------------------------
+-# implement the --enable-fast-install flag, and support the 'fast-install'
+-# and 'disable-fast-install' LT_INIT options.
+-# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
++# implement the --enable-fast-install flag, and support the `fast-install'
++# and `disable-fast-install' LT_INIT options.
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+ m4_define([_LT_ENABLE_FAST_INSTALL],
+ [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+ AC_ARG_ENABLE([fast-install],
+@@ -282,14 +280,14 @@
+ *)
+ enable_fast_install=no
+ # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_fast_install=yes
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ ;;
+ esac],
+ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+@@ -306,14 +304,14 @@
+ [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+ AC_DIAGNOSE([obsolete],
+ [$0: Remove this warning and the call to _LT_SET_OPTION when you put
+-the 'fast-install' option into LT_INIT's first parameter.])
++the `fast-install' option into LT_INIT's first parameter.])
+ ])
+
+ AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+ [_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+ AC_DIAGNOSE([obsolete],
+ [$0: Remove this warning and the call to _LT_SET_OPTION when you put
+-the 'disable-fast-install' option into LT_INIT's first parameter.])
++the `disable-fast-install' option into LT_INIT's first parameter.])
+ ])
+
+ dnl aclocal-1.4 backwards compatibility:
+@@ -321,64 +319,11 @@
+ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+-# _LT_WITH_AIX_SONAME([DEFAULT])
+-# ----------------------------------
+-# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+-# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+-# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
+-m4_define([_LT_WITH_AIX_SONAME],
+-[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+-shared_archive_member_spec=
+-case $host,$enable_shared in
+-power*-*-aix[[5-9]]*,yes)
+- AC_MSG_CHECKING([which variant of shared library versioning to provide])
+- AC_ARG_WITH([aix-soname],
+- [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+- [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+- [case $withval in
+- aix|svr4|both)
+- ;;
+- *)
+- AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+- ;;
+- esac
+- lt_cv_with_aix_soname=$with_aix_soname],
+- [AC_CACHE_VAL([lt_cv_with_aix_soname],
+- [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+- with_aix_soname=$lt_cv_with_aix_soname])
+- AC_MSG_RESULT([$with_aix_soname])
+- if test aix != "$with_aix_soname"; then
+- # For the AIX way of multilib, we name the shared archive member
+- # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+- # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+- # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+- # the AIX toolchain works better with OBJECT_MODE set (default 32).
+- if test 64 = "${OBJECT_MODE-32}"; then
+- shared_archive_member_spec=shr_64
+- else
+- shared_archive_member_spec=shr
+- fi
+- fi
+- ;;
+-*)
+- with_aix_soname=aix
+- ;;
+-esac
+-
+-_LT_DECL([], [shared_archive_member_spec], [0],
+- [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+-])# _LT_WITH_AIX_SONAME
+-
+-LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+-LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+-LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+-
+-
+ # _LT_WITH_PIC([MODE])
+ # --------------------
+-# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
++# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+ # LT_INIT options.
+-# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'.
++# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+ m4_define([_LT_WITH_PIC],
+ [AC_ARG_WITH([pic],
+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+@@ -389,17 +334,19 @@
+ *)
+ pic_mode=default
+ # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for lt_pkg in $withval; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ if test "X$lt_pkg" = "X$lt_p"; then
+ pic_mode=yes
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ ;;
+ esac],
+- [pic_mode=m4_default([$1], [default])])
++ [pic_mode=default])
++
++test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+ _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+ ])# _LT_WITH_PIC
+@@ -412,7 +359,7 @@
+ [_LT_SET_OPTION([LT_INIT], [pic-only])
+ AC_DIAGNOSE([obsolete],
+ [$0: Remove this warning and the call to _LT_SET_OPTION when you
+-put the 'pic-only' option into LT_INIT's first parameter.])
++put the `pic-only' option into LT_INIT's first parameter.])
+ ])
+
+ dnl aclocal-1.4 backwards compatibility:
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/ltsugar.m4 psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/ltsugar.m4
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/ltsugar.m4 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/ltsugar.m4 2020-07-16 10:48:35.380937000 +0200
+@@ -1,7 +1,6 @@
+ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
+ #
+-# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+-# Foundation, Inc.
++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+ # Written by Gary V. Vaughan, 2004
+ #
+ # This file is free software; the Free Software Foundation gives
+@@ -34,7 +33,7 @@
+ # ------------
+ # Manipulate m4 lists.
+ # These macros are necessary as long as will still need to support
+-# Autoconf-2.59, which quotes differently.
++# Autoconf-2.59 which quotes differently.
+ m4_define([lt_car], [[$1]])
+ m4_define([lt_cdr],
+ [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+@@ -45,7 +44,7 @@
+
+ # lt_append(MACRO-NAME, STRING, [SEPARATOR])
+ # ------------------------------------------
+-# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
++# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+ # Note that neither SEPARATOR nor STRING are expanded; they are appended
+ # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+ # No SEPARATOR is output if MACRO-NAME was previously undefined (different
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/ltversion.m4 psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/ltversion.m4
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/ltversion.m4 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/ltversion.m4 2020-07-16 10:48:35.381648000 +0200
+@@ -1,6 +1,6 @@
+ # ltversion.m4 -- version numbers -*- Autoconf -*-
+ #
+-# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
++# Copyright (C) 2004 Free Software Foundation, Inc.
+ # Written by Scott James Remnant, 2004
+ #
+ # This file is free software; the Free Software Foundation gives
+@@ -9,15 +9,15 @@
+
+ # @configure_input@
+
+-# serial 4179 ltversion.m4
++# serial 3337 ltversion.m4
+ # This file is part of GNU Libtool
+
+-m4_define([LT_PACKAGE_VERSION], [2.4.6])
+-m4_define([LT_PACKAGE_REVISION], [2.4.6])
++m4_define([LT_PACKAGE_VERSION], [2.4.2])
++m4_define([LT_PACKAGE_REVISION], [1.3337])
+
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.4.6'
+-macro_revision='2.4.6'
++[macro_version='2.4.2'
++macro_revision='1.3337'
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/missing psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/missing
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/confdb/missing 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/confdb/missing 2020-07-16 10:48:35.383853000 +0200
+@@ -160,7 +160,7 @@
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+- echo "the 'autom4te' program to be rebuilt."
++ echo "the 'automa4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+@@ -210,6 +210,6 @@
+ # eval: (add-hook 'before-save-hook 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+-# time-stamp-time-zone: "UTC0"
++# time-stamp-time-zone: "UTC"
+ # time-stamp-end: "; # UTC"
+ # End:
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/configure psmpi-5.4.6-1/mpich2/src/mpi/romio/configure
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/configure 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/configure 2020-07-16 10:48:35.417269955 +0200
+@@ -737,6 +737,7 @@
+ BUILD_AD_NFS_FALSE
+ BUILD_AD_NFS_TRUE
+ PVFS2_CONFIG
++IME_INSTALL_PATH
+ BUILD_F77_TESTS_FALSE
+ BUILD_F77_TESTS_TRUE
+ BUILD_F77_BINDINGS_FALSE
+@@ -770,7 +771,6 @@
+ FROM_LAM
+ FROM_MPICH
+ MPI_H_INCLUDE
+-LT_SYS_LIBRARY_PATH
+ OTOOL64
+ OTOOL
+ LIPO
+@@ -898,7 +898,6 @@
+ enable_static
+ with_pic
+ enable_fast_install
+-with_aix_soname
+ with_gnu_ld
+ with_sysroot
+ enable_libtool_lock
+@@ -912,6 +911,7 @@
+ with_file_system
+ with_pvfs2
+ with_mpi_impl
++with_ime
+ with_mpi
+ with_aio_lite
+ enable_largefile
+@@ -926,7 +926,6 @@
+ LIBS
+ CPPFLAGS
+ CPP
+-LT_SYS_LIBRARY_PATH
+ FROM_MPICH
+ FROM_LAM
+ FROM_OMPI
+@@ -1588,12 +1587,9 @@
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
+ both]
+- --with-aix-soname=aix|svr4|both
+- shared library versioning (aka "SONAME") variant to
+- provide on AIX, [default=aix].
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
+- --with-sysroot[=DIR] Search for dependent libraries within DIR (or the
+- compiler's sysroot if not specified).
++ --with-sysroot=DIR Search for dependent libraries within DIR
++ (or the compiler's sysroot if not specified).
+ --with-mpl-prefix[=DIR] use the MPL library installed in DIR. Pass
+ "embedded" to force usage of the MPL source
+ distributed with Hydra.
+@@ -1604,6 +1600,8 @@
+
+ --with-mpi-impl=name - Specify MPI implementation to build ROMIO for
+
++--with-ime=PATH - Path to installation of IME
++
+ --with-mpi=path - Path to instalation of MPI (headers, libs, etc)
+ --with-aio-lite use alternate external aio implementation
+
+@@ -1616,8 +1614,6 @@
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+- LT_SYS_LIBRARY_PATH
+- User-defined run-time library search path.
+ FROM_MPICH set to "yes" if building ROMIO inside of MPICH
+ FROM_LAM set to "yes" if building ROMIO inside of LAM
+ FROM_OMPI set to "yes" if building ROMIO inside of Open MPI
+@@ -3129,8 +3125,8 @@
+ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+-# Expand $ac_aux_dir to an absolute path.
+-am_aux_dir=`cd "$ac_aux_dir" && pwd`
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
+
+ if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+@@ -3149,7 +3145,7 @@
+ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+ fi
+
+-if test x"${install_sh+set}" != xset; then
++if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+@@ -3477,8 +3473,8 @@
+ # <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+ mkdir_p='$(MKDIR_P)'
+
+-# We need awk for the "check" target (and possibly the TAP driver). The
+-# system "awk" is bad on some platforms.
++# We need awk for the "check" target. The system "awk" is bad on
++# some platforms.
+ # Always define AMTAR for backward compatibility. Yes, it's still used
+ # in the wild :-( We should find a proper way to deprecate it ...
+ AMTAR='$${TAR-tar}'
+@@ -4229,65 +4225,6 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+-if ${am_cv_prog_cc_c_o+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+- # Make sure it works both with $CC and with simple cc.
+- # Following AC_PROG_CC_C_O, we do the test twice because some
+- # compilers refuse to overwrite an existing .o file with -o,
+- # though they will create one.
+- am_cv_prog_cc_c_o=yes
+- for am_i in 1 2; do
+- if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+- ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } \
+- && test -f conftest2.$ac_objext; then
+- : OK
+- else
+- am_cv_prog_cc_c_o=no
+- break
+- fi
+- done
+- rm -f core conftest*
+- unset am_i
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+-$as_echo "$am_cv_prog_cc_c_o" >&6; }
+-if test "$am_cv_prog_cc_c_o" != yes; then
+- # Losing compiler, so override with the script.
+- # FIXME: It is wrong to rewrite CC.
+- # But if we don't then we get into trouble of one sort or another.
+- # A longer-term fix would be to have automake use am__CC in this case,
+- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+- CC="$am_aux_dir/compile $CC"
+-fi
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+ depcc="$CC" am_compiler_list=
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+@@ -4422,6 +4359,131 @@
+ eval pac_save_CFLAGS_${pac_save_CFLAGS_nesting}=""
+
+
++if test "x$CC" != xcc; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
++$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
++$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
++fi
++set dummy $CC; ac_cc=`$as_echo "$2" |
++ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
++if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++# Make sure it works both with $CC and with simple cc.
++# We do the test twice because some compilers refuse to overwrite an
++# existing .o file with -o, though they will create one.
++ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
++rm -f conftest2.*
++if { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; } &&
++ test -f conftest2.$ac_objext && { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; };
++then
++ eval ac_cv_prog_cc_${ac_cc}_c_o=yes
++ if test "x$CC" != xcc; then
++ # Test first that cc exists at all.
++ if { ac_try='cc -c conftest.$ac_ext >&5'
++ { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; }; then
++ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
++ rm -f conftest2.*
++ if { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; } &&
++ test -f conftest2.$ac_objext && { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; };
++ then
++ # cc works too.
++ :
++ else
++ # cc exists but doesn't like -o.
++ eval ac_cv_prog_cc_${ac_cc}_c_o=no
++ fi
++ fi
++ fi
++else
++ eval ac_cv_prog_cc_${ac_cc}_c_o=no
++fi
++rm -f core conftest*
++
++fi
++if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
++
++fi
++
++# FIXME: we rely on the cache variable name because
++# there is no other way.
++set dummy $CC
++am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
++if test "$am_t" != yes; then
++ # Losing compiler, so override with the script.
++ # FIXME: It is wrong to rewrite CC.
++ # But if we don't then we get into trouble of one sort or another.
++ # A longer-term fix would be to have automake use am__CC in this case,
++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
++ CC="$am_aux_dir/compile $CC"
++fi
++
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+@@ -5087,13 +5149,7 @@
+ if ${am_cv_ar_interface+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+- ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+- am_cv_ar_interface=ar
++ am_cv_ar_interface=ar
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ int some_variable = 0;
+@@ -5124,11 +5180,6 @@
+
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+@@ -5160,8 +5211,8 @@
+
+
+
+-macro_version='2.4.6'
+-macro_revision='2.4.6'
++macro_version='2.4.2'
++macro_revision='1.3337'
+
+
+
+@@ -5175,7 +5226,7 @@
+
+
+
+-ltmain=$ac_aux_dir/ltmain.sh
++ltmain="$ac_aux_dir/ltmain.sh"
+
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+@@ -5295,7 +5346,7 @@
+ $ECHO ""
+ }
+
+-case $ECHO in
++case "$ECHO" in
+ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+ $as_echo "printf" >&6; } ;;
+ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+@@ -5488,19 +5539,19 @@
+
+ # Check whether --with-gnu-ld was given.
+ if test "${with_gnu_ld+set}" = set; then :
+- withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ else
+ with_gnu_ld=no
+ fi
+
+ ac_prog=ld
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+ $as_echo_n "checking for ld used by $CC... " >&6; }
+ case $host in
+ *-*-mingw*)
+- # gcc leaves a trailing carriage return, which upsets mingw
++ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+@@ -5514,7 +5565,7 @@
+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+ done
+- test -z "$LD" && LD=$ac_prog
++ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+@@ -5525,7 +5576,7 @@
+ with_gnu_ld=unknown
+ ;;
+ esac
+-elif test yes = "$with_gnu_ld"; then
++elif test "$with_gnu_ld" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+ $as_echo_n "checking for GNU ld... " >&6; }
+ else
+@@ -5536,32 +5587,32 @@
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$LD"; then
+- lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+- lt_cv_path_LD=$ac_dir/$ac_prog
++ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+- test no != "$with_gnu_ld" && break
++ test "$with_gnu_ld" != no && break
+ ;;
+ *)
+- test yes != "$with_gnu_ld" && break
++ test "$with_gnu_ld" != yes && break
+ ;;
+ esac
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ else
+- lt_cv_path_LD=$LD # Let the user override the test with a path.
++ lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ fi
+ fi
+
+-LD=$lt_cv_path_LD
++LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+ $as_echo "$LD" >&6; }
+@@ -5604,38 +5655,33 @@
+ else
+ if test -n "$NM"; then
+ # Let the user override the test.
+- lt_cv_path_NM=$NM
++ lt_cv_path_NM="$NM"
+ else
+- lt_nm_to_check=${ac_tool_prefix}nm
++ lt_nm_to_check="${ac_tool_prefix}nm"
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
+- lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+- tmp_nm=$ac_dir/$lt_tmp_nm
+- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
++ tmp_nm="$ac_dir/$lt_tmp_nm"
++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ # Check to see if the nm accepts a BSD-compat flag.
+- # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
++ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # nm: unknown option "B" ignored
+ # Tru64's nm complains that /dev/null is an invalid object file
+- # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+- case $build_os in
+- mingw*) lt_bad_file=conftest.nm/nofile ;;
+- *) lt_bad_file=/dev/null ;;
+- esac
+- case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+- *$lt_bad_file* | *'Invalid file or object type'*)
++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++ */dev/null* | *'Invalid file or object type'*)
+ lt_cv_path_NM="$tmp_nm -B"
+- break 2
++ break
+ ;;
+ *)
+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+ */dev/null*)
+ lt_cv_path_NM="$tmp_nm -p"
+- break 2
++ break
+ ;;
+ *)
+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+@@ -5646,15 +5692,15 @@
+ esac
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ done
+ : ${lt_cv_path_NM=no}
+ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+ $as_echo "$lt_cv_path_NM" >&6; }
+-if test no != "$lt_cv_path_NM"; then
+- NM=$lt_cv_path_NM
++if test "$lt_cv_path_NM" != "no"; then
++ NM="$lt_cv_path_NM"
+ else
+ # Didn't find any BSD compatible name lister, look for dumpbin.
+ if test -n "$DUMPBIN"; then :
+@@ -5760,9 +5806,9 @@
+ fi
+ fi
+
+- case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
++ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ *COFF*)
+- DUMPBIN="$DUMPBIN -symbols -headers"
++ DUMPBIN="$DUMPBIN -symbols"
+ ;;
+ *)
+ DUMPBIN=:
+@@ -5770,8 +5816,8 @@
+ esac
+ fi
+
+- if test : != "$DUMPBIN"; then
+- NM=$DUMPBIN
++ if test "$DUMPBIN" != ":"; then
++ NM="$DUMPBIN"
+ fi
+ fi
+ test -z "$NM" && NM=nm
+@@ -5822,7 +5868,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ i=0
+- teststring=ABCD
++ teststring="ABCD"
+
+ case $build_os in
+ msdosdjgpp*)
+@@ -5862,7 +5908,7 @@
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+- bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+@@ -5912,23 +5958,22 @@
+ ;;
+ *)
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+- if test -n "$lt_cv_sys_max_cmd_len" && \
+- test undefined != "$lt_cv_sys_max_cmd_len"; then
++ if test -n "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ # Make teststring a little bigger before we do anything with it.
+ # a 1K string should be a reasonable start.
+- for i in 1 2 3 4 5 6 7 8; do
++ for i in 1 2 3 4 5 6 7 8 ; do
+ teststring=$teststring$teststring
+ done
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+- while { test X`env echo "$teststring$teststring" 2>/dev/null` \
++ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+- test 17 != "$i" # 1/2 MB should be enough
++ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+@@ -5946,7 +5991,7 @@
+
+ fi
+
+-if test -n "$lt_cv_sys_max_cmd_len"; then
++if test -n $lt_cv_sys_max_cmd_len ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+ $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+ else
+@@ -5964,6 +6009,30 @@
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
++$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%"$_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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
++$as_echo "$xsi_shell" >&6; }
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
++$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
++lt_shell_append=no
++( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
++ >/dev/null 2>&1 \
++ && lt_shell_append=yes
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
++$as_echo "$lt_shell_append" >&6; }
++
++
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ lt_unset=unset
+ else
+@@ -6086,13 +6155,13 @@
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+- if test yes != "$GCC"; then
++ if test "$GCC" != yes; then
+ reload_cmds=false
+ fi
+ ;;
+ darwin*)
+- if test yes = "$GCC"; then
+- reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
++ if test "$GCC" = yes; then
++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ else
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ fi
+@@ -6220,13 +6289,13 @@
+ # Need to set the preceding variable on all platforms that support
+ # interlibrary dependencies.
+ # 'none' -- dependencies not supported.
+-# 'unknown' -- same as none, but documents that we really don't know.
++# `unknown' -- same as none, but documents that we really don't know.
+ # 'pass_all' -- all dependencies passed with no checks.
+ # 'test_compile' -- check by making test program.
+ # 'file_magic [[regex]]' -- check by looking for files in library path
+-# that responds to the $file_magic_cmd with a given extended regex.
+-# If you have 'file' or equivalent on your system and you're not sure
+-# whether 'pass_all' will *always* work, you probably want this one.
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+ aix[4-9]*)
+@@ -6253,7 +6322,8 @@
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+- if ( file / ) >/dev/null 2>&1; then
++ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
++ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+@@ -6289,6 +6359,10 @@
+ fi
+ ;;
+
++gnu*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
+ haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+@@ -6327,7 +6401,7 @@
+ ;;
+
+ # This must be glibc/ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -6349,8 +6423,8 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-openbsd* | bitrig*)
+- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++openbsd*)
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+@@ -6403,9 +6477,6 @@
+ tpf*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+-os2*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+ esac
+
+ fi
+@@ -6563,8 +6634,8 @@
+
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+- # two different shell functions defined in ltmain.sh;
+- # decide which one to use based on capabilities of $DLLTOOL
++ # 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
+@@ -6576,7 +6647,7 @@
+ ;;
+ *)
+ # fallback: assume linklib IS sharedlib
+- lt_cv_sharedlib_from_linklib_cmd=$ECHO
++ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ ;;
+ esac
+
+@@ -6730,7 +6801,7 @@
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+- if test 0 -eq "$ac_status"; then
++ 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
+@@ -6738,7 +6809,7 @@
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+- if test 0 -ne "$ac_status"; then
++ if test "$ac_status" -ne 0; then
+ lt_cv_ar_at_file=@
+ fi
+ fi
+@@ -6751,7 +6822,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+ $as_echo "$lt_cv_ar_at_file" >&6; }
+
+-if test no = "$lt_cv_ar_at_file"; then
++if test "x$lt_cv_ar_at_file" = xno; then
+ archiver_list_spec=
+ else
+ archiver_list_spec=$lt_cv_ar_at_file
+@@ -6968,7 +7039,7 @@
+
+ if test -n "$RANLIB"; then
+ case $host_os in
+- bitrig* | openbsd*)
++ openbsd*)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+ ;;
+ *)
+@@ -7058,7 +7129,7 @@
+ symcode='[ABCDGISTW]'
+ ;;
+ hpux*)
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ symcode='[ABCDEGRST]'
+ fi
+ ;;
+@@ -7091,44 +7162,14 @@
+ symcode='[ABCDGIRSTW]' ;;
+ esac
+
+-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+- # Gets list of data symbols to import.
+- lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+- # Adjust the below global symbol transforms to fixup imported variables.
+- lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+- lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+- lt_c_name_lib_hook="\
+- -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+- -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+-else
+- # Disable hooks by default.
+- lt_cv_sys_global_symbol_to_import=
+- lt_cdecl_hook=
+- lt_c_name_hook=
+- lt_c_name_lib_hook=
+-fi
+-
+ # Transform an extracted symbol line into a proper C declaration.
+ # Some systems (esp. on ia64) link data and code symbols differently,
+ # so use this general approach.
+-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+-$lt_cdecl_hook\
+-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
++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"\
+-$lt_c_name_hook\
+-" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+-" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+-
+-# Transform an extracted symbol line into symbol name with lib prefix and
+-# symbol address.
+-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+-$lt_c_name_lib_hook\
+-" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+-" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+-" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/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=
+@@ -7146,24 +7187,21 @@
+
+ # Write the raw and C identifiers.
+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+- # Fake it for dumpbin and say T for any non-static function,
+- # D for any global variable and I for any imported variable.
++ # Fake it for dumpbin and say T for any non-static function
++ # and D for any global variable.
+ # Also find C++ and __fastcall symbols from MSVC++,
+ # which start with @ or ?.
+ lt_cv_sys_global_symbol_pipe="$AWK '"\
+ " {last_section=section; section=\$ 3};"\
+ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+-" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+-" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+-" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+ " \$ 0!~/External *\|/{next};"\
+ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+ " {if(hide[section]) next};"\
+-" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+-" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+-" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+-" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
++" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
++" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
++" s[1]~/^[@?]/{print s[1], s[1]; next};"\
++" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+ " ' prfx=^$ac_symprfx"
+ else
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+@@ -7211,11 +7249,11 @@
+ 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 can't be const, because runtime
++#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__
++#elif defined(__osf__)
+ /* This system does not cope well with relocations in const data. */
+ # define LT_DLSYM_CONST
+ #else
+@@ -7241,7 +7279,7 @@
+ {
+ { "@PROGRAM@", (void *) 0 },
+ _LT_EOF
+- $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ cat <<\_LT_EOF >> conftest.$ac_ext
+ {0, (void *) 0}
+ };
+@@ -7261,13 +7299,13 @@
+ mv conftest.$ac_objext conftstm.$ac_objext
+ lt_globsym_save_LIBS=$LIBS
+ lt_globsym_save_CFLAGS=$CFLAGS
+- LIBS=conftstm.$ac_objext
++ LIBS="conftstm.$ac_objext"
+ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } && test -s conftest$ac_exeext; then
++ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+ pipe_works=yes
+ fi
+ LIBS=$lt_globsym_save_LIBS
+@@ -7288,7 +7326,7 @@
+ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+- if test yes = "$pipe_works"; then
++ if test "$pipe_works" = yes; then
+ break
+ else
+ lt_cv_sys_global_symbol_pipe=
+@@ -7341,16 +7379,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+ $as_echo_n "checking for sysroot... " >&6; }
+
+@@ -7363,9 +7391,9 @@
+
+
+ lt_sysroot=
+-case $with_sysroot in #(
++case ${with_sysroot} in #(
+ yes)
+- if test yes = "$GCC"; then
++ if test "$GCC" = yes; then
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+ fi
+ ;; #(
+@@ -7375,8 +7403,8 @@
+ no|'')
+ ;; #(
+ *)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+-$as_echo "$with_sysroot" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
++$as_echo "${with_sysroot}" >&6; }
+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+ ;;
+ esac
+@@ -7388,99 +7416,18 @@
+
+
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+-$as_echo_n "checking for a working dd... " >&6; }
+-if ${ac_cv_path_lt_DD+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- printf 0123456789abcdef0123456789abcdef >conftest.i
+-cat conftest.i conftest.i >conftest2.i
+-: ${lt_DD:=$DD}
+-if test -z "$lt_DD"; then
+- ac_path_lt_DD_found=false
+- # Loop through the user's path and test for each of PROGNAME-LIST
+- 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_prog in dd; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+- as_fn_executable_p "$ac_path_lt_DD" || continue
+-if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+- cmp -s conftest.i conftest.out \
+- && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+-fi
+- $ac_path_lt_DD_found && break 3
+- done
+- done
+- done
+-IFS=$as_save_IFS
+- if test -z "$ac_cv_path_lt_DD"; then
+- :
+- fi
+-else
+- ac_cv_path_lt_DD=$lt_DD
+-fi
+-
+-rm -f conftest.i conftest2.i conftest.out
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+-$as_echo "$ac_cv_path_lt_DD" >&6; }
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+-$as_echo_n "checking how to truncate binary pipes... " >&6; }
+-if ${lt_cv_truncate_bin+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- printf 0123456789abcdef0123456789abcdef >conftest.i
+-cat conftest.i conftest.i >conftest2.i
+-lt_cv_truncate_bin=
+-if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+- cmp -s conftest.i conftest.out \
+- && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+-fi
+-rm -f conftest.i conftest2.i conftest.out
+-test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+-$as_echo "$lt_cv_truncate_bin" >&6; }
+-
+-
+-
+-
+-
+-
+-
+-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+-func_cc_basename ()
+-{
+- for cc_temp in $*""; do
+- case $cc_temp in
+- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+- \-*) ;;
+- *) break;;
+- esac
+- done
+- func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+-}
+-
+ # Check whether --enable-libtool-lock was given.
+ if test "${enable_libtool_lock+set}" = set; then :
+ enableval=$enable_libtool_lock;
+ fi
+
+-test no = "$enable_libtool_lock" || enable_libtool_lock=yes
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+ # Some flags need to be propagated to the compiler or linker for good
+ # libtool support.
+ case $host in
+ ia64-*-hpux*)
+- # Find out what ABI is being produced by ac_compile, and set mode
+- # options accordingly.
++ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+@@ -7489,25 +7436,24 @@
+ test $ac_status = 0; }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *ELF-32*)
+- HPUX_IA64_MODE=32
++ HPUX_IA64_MODE="32"
+ ;;
+ *ELF-64*)
+- HPUX_IA64_MODE=64
++ HPUX_IA64_MODE="64"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ *-*-irix6*)
+- # Find out what ABI is being produced by ac_compile, and set linker
+- # options accordingly.
++ # Find out which ABI we are using.
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- if test yes = "$lt_cv_prog_gnu_ld"; then
++ if test "$lt_cv_prog_gnu_ld" = yes; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -melf32bsmip"
+@@ -7536,50 +7482,9 @@
+ rm -rf conftest*
+ ;;
+
+-mips64*-*linux*)
+- # Find out what ABI is being produced by ac_compile, and set linker
+- # options accordingly.
+- echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+- (eval $ac_compile) 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- emul=elf
+- case `/usr/bin/file conftest.$ac_objext` in
+- *32-bit*)
+- emul="${emul}32"
+- ;;
+- *64-bit*)
+- emul="${emul}64"
+- ;;
+- esac
+- case `/usr/bin/file conftest.$ac_objext` in
+- *MSB*)
+- emul="${emul}btsmip"
+- ;;
+- *LSB*)
+- emul="${emul}ltsmip"
+- ;;
+- esac
+- case `/usr/bin/file conftest.$ac_objext` in
+- *N32*)
+- emul="${emul}n32"
+- ;;
+- esac
+- LD="${LD-ld} -m $emul"
+- fi
+- rm -rf conftest*
+- ;;
+-
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+- # Find out what ABI is being produced by ac_compile, and set linker
+- # options accordingly. Note that the listed cases only cover the
+- # situations where additional linker options are needed (such as when
+- # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+- # vice versa); the common cases where no linker options are needed do
+- # not appear in the list.
++ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+@@ -7593,19 +7498,9 @@
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
+ x86_64-*linux*)
+- case `/usr/bin/file conftest.o` in
+- *x86-64*)
+- LD="${LD-ld} -m elf32_x86_64"
+- ;;
+- *)
+- LD="${LD-ld} -m elf_i386"
+- ;;
+- esac
++ LD="${LD-ld} -m elf_i386"
+ ;;
+- powerpc64le-*linux*)
+- LD="${LD-ld} -m elf32lppclinux"
+- ;;
+- powerpc64-*linux*)
++ ppc64-*linux*|powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+@@ -7624,10 +7519,7 @@
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+- powerpcle-*linux*)
+- LD="${LD-ld} -m elf64lppc"
+- ;;
+- powerpc-*linux*)
++ ppc*-*linux*|powerpc*-*linux*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*|s390*-*tpf*)
+@@ -7645,7 +7537,7 @@
+
+ *-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+- SAVE_CFLAGS=$CFLAGS
++ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+ $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+@@ -7685,14 +7577,13 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+- if test yes != "$lt_cv_cc_needs_belf"; then
++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+- CFLAGS=$SAVE_CFLAGS
++ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+ *-*solaris*)
+- # Find out what ABI is being produced by ac_compile, and set linker
+- # options accordingly.
++ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+@@ -7704,7 +7595,7 @@
+ case $lt_cv_prog_gnu_ld in
+ yes*)
+ case $host in
+- i?86-*-solaris*|x86_64-*-solaris*)
++ i?86-*-solaris*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ sparc*-*-solaris*)
+@@ -7713,7 +7604,7 @@
+ esac
+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+- LD=${LD-ld}_sol2
++ LD="${LD-ld}_sol2"
+ fi
+ ;;
+ *)
+@@ -7729,7 +7620,7 @@
+ ;;
+ esac
+
+-need_locks=$enable_libtool_lock
++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.
+@@ -7840,7 +7731,7 @@
+ 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 yes != "$lt_cv_path_mainfest_tool"; then
++if test "x$lt_cv_path_mainfest_tool" != xyes; then
+ MANIFEST_TOOL=:
+ fi
+
+@@ -8343,7 +8234,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_apple_cc_single_mod=no
+- if test -z "$LT_MULTI_MODULE"; then
++ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+@@ -8361,7 +8252,7 @@
+ cat conftest.err >&5
+ # Otherwise, if the output was created with a 0 exit code from
+ # the compiler, it worked.
+- elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
++ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ lt_cv_apple_cc_single_mod=yes
+ else
+ cat conftest.err >&5
+@@ -8400,7 +8291,7 @@
+ 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_ld_exported_symbols_list" >&5
+@@ -8429,7 +8320,7 @@
+ _lt_result=$?
+ if test -s conftest.err && $GREP force_load conftest.err; then
+ cat conftest.err >&5
+- elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
++ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&5
+@@ -8442,32 +8333,32 @@
+ $as_echo "$lt_cv_ld_force_load" >&6; }
+ case $host_os in
+ rhapsody* | darwin1.[012])
+- _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*) # darwin 5.x on
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+- 10.[012][,.]*)
+- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[012]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+- if test yes = "$lt_cv_apple_cc_single_mod"; then
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+- if test yes = "$lt_cv_ld_exported_symbols_list"; then
+- _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+- if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
++ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
+ else
+ _lt_dsymutil=
+@@ -8475,41 +8366,6 @@
+ ;;
+ esac
+
+-# func_munge_path_list VARIABLE PATH
+-# -----------------------------------
+-# VARIABLE is name of variable containing _space_ separated list of
+-# directories to be munged by the contents of PATH, which is string
+-# having a format:
+-# "DIR[:DIR]:"
+-# string "DIR[ DIR]" will be prepended to VARIABLE
+-# ":DIR[:DIR]"
+-# string "DIR[ DIR]" will be appended to VARIABLE
+-# "DIRP[:DIRP]::[DIRA:]DIRA"
+-# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+-# "DIRA[ DIRA]" will be appended to VARIABLE
+-# "DIR[:DIR]"
+-# VARIABLE will be replaced by "DIR[ DIR]"
+-func_munge_path_list ()
+-{
+- case x$2 in
+- x)
+- ;;
+- *:)
+- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+- ;;
+- x:*)
+- eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+- ;;
+- *::*)
+- eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+- eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+- ;;
+- *)
+- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+- ;;
+- esac
+-}
+-
+ for ac_header in dlfcn.h
+ do :
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+@@ -8546,14 +8402,14 @@
+ *)
+ enable_shared=no
+ # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_shared=yes
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ ;;
+ esac
+ else
+@@ -8577,14 +8433,14 @@
+ *)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ ;;
+ esac
+ else
+@@ -8608,14 +8464,14 @@
+ *)
+ pic_mode=default
+ # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for lt_pkg in $withval; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ if test "X$lt_pkg" = "X$lt_p"; then
+ pic_mode=yes
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ ;;
+ esac
+ else
+@@ -8623,6 +8479,8 @@
+ fi
+
+
++test -z "$pic_mode" && pic_mode=default
++
+
+
+
+@@ -8638,14 +8496,14 @@
+ *)
+ enable_fast_install=no
+ # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_fast_install=yes
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ ;;
+ esac
+ else
+@@ -8659,63 +8517,11 @@
+
+
+
+- shared_archive_member_spec=
+-case $host,$enable_shared in
+-power*-*-aix[5-9]*,yes)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+-$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+-
+-# Check whether --with-aix-soname was given.
+-if test "${with_aix_soname+set}" = set; then :
+- withval=$with_aix_soname; case $withval in
+- aix|svr4|both)
+- ;;
+- *)
+- as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+- ;;
+- esac
+- lt_cv_with_aix_soname=$with_aix_soname
+-else
+- if ${lt_cv_with_aix_soname+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- lt_cv_with_aix_soname=aix
+-fi
+-
+- with_aix_soname=$lt_cv_with_aix_soname
+-fi
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+-$as_echo "$with_aix_soname" >&6; }
+- if test aix != "$with_aix_soname"; then
+- # For the AIX way of multilib, we name the shared archive member
+- # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+- # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+- # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+- # the AIX toolchain works better with OBJECT_MODE set (default 32).
+- if test 64 = "${OBJECT_MODE-32}"; then
+- shared_archive_member_spec=shr_64
+- else
+- shared_archive_member_spec=shr
+- fi
+- fi
+- ;;
+-*)
+- with_aix_soname=aix
+- ;;
+-esac
+-
+-
+-
+-
+-
+-
+-
+
+
+
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS=$ltmain
++LIBTOOL_DEPS="$ltmain"
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -8764,7 +8570,7 @@
+
+
+
+-if test -n "${ZSH_VERSION+set}"; then
++if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+
+@@ -8803,7 +8609,7 @@
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+- if test set != "${COLLECT_NAMES+set}"; then
++ if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+@@ -8814,14 +8620,14 @@
+ ofile=libtool
+ can_build_shared=yes
+
+-# All known linkers require a '.a' archive for static linking (except MSVC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+
+-with_gnu_ld=$lt_cv_prog_gnu_ld
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+-old_CC=$CC
+-old_CFLAGS=$CFLAGS
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
+
+ # Set sane defaults for various variables
+ test -z "$CC" && CC=cc
+@@ -8830,8 +8636,15 @@
+ test -z "$LD" && LD=ld
+ test -z "$ac_objext" && ac_objext=o
+
+-func_cc_basename $compiler
+-cc_basename=$func_cc_basename_result
++for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+ # Only perform the check for file, if the check method requires it
+@@ -8846,22 +8659,22 @@
+ else
+ case $MAGIC_CMD in
+ [\\/*] | ?:[\\/]*)
+- lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ ;;
+ *)
+- lt_save_MAGIC_CMD=$MAGIC_CMD
+- lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++ lt_save_MAGIC_CMD="$MAGIC_CMD"
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+ for ac_dir in $ac_dummy; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+- if test -f "$ac_dir/${ac_tool_prefix}file"; then
+- lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
++ if test -f $ac_dir/${ac_tool_prefix}file; then
++ lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+- MAGIC_CMD=$lt_cv_path_MAGIC_CMD
++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ :
+@@ -8884,13 +8697,13 @@
+ break
+ fi
+ done
+- IFS=$lt_save_ifs
+- MAGIC_CMD=$lt_save_MAGIC_CMD
++ IFS="$lt_save_ifs"
++ MAGIC_CMD="$lt_save_MAGIC_CMD"
+ ;;
+ esac
+ fi
+
+-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+ $as_echo "$MAGIC_CMD" >&6; }
+@@ -8912,22 +8725,22 @@
+ else
+ case $MAGIC_CMD in
+ [\\/*] | ?:[\\/]*)
+- lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ ;;
+ *)
+- lt_save_MAGIC_CMD=$MAGIC_CMD
+- lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++ lt_save_MAGIC_CMD="$MAGIC_CMD"
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+ for ac_dir in $ac_dummy; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+- if test -f "$ac_dir/file"; then
+- lt_cv_path_MAGIC_CMD=$ac_dir/"file"
++ if test -f $ac_dir/file; then
++ lt_cv_path_MAGIC_CMD="$ac_dir/file"
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+- MAGIC_CMD=$lt_cv_path_MAGIC_CMD
++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ :
+@@ -8950,13 +8763,13 @@
+ break
+ fi
+ done
+- IFS=$lt_save_ifs
+- MAGIC_CMD=$lt_save_MAGIC_CMD
++ IFS="$lt_save_ifs"
++ MAGIC_CMD="$lt_save_MAGIC_CMD"
+ ;;
+ esac
+ fi
+
+-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+ $as_echo "$MAGIC_CMD" >&6; }
+@@ -8977,7 +8790,7 @@
+
+ # Use C for the default configuration in the libtool script
+
+-lt_save_CC=$CC
++lt_save_CC="$CC"
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -9035,7 +8848,7 @@
+
+ lt_prog_compiler_no_builtin_flag=
+
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ case $cc_basename in
+ nvcc*)
+ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+@@ -9051,7 +8864,7 @@
+ lt_cv_prog_compiler_rtti_exceptions=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+- lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment
++ lt_compiler_flag="-fno-rtti -fno-exceptions"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+@@ -9081,7 +8894,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+ $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+-if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+ else
+ :
+@@ -9099,18 +8912,17 @@
+ lt_prog_compiler_static=
+
+
+- if test yes = "$GCC"; then
++ if test "$GCC" = yes; then
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_static='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ lt_prog_compiler_static='-Bstatic'
+ fi
+- lt_prog_compiler_pic='-fPIC'
+ ;;
+
+ amigaos*)
+@@ -9121,8 +8933,8 @@
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+- # adding the '-m68020' flag to GCC prevents building anything better,
+- # like '-m68040'.
++ # adding the `-m68020' flag to GCC prevents building anything better,
++ # like `-m68040'.
+ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
+@@ -9138,11 +8950,6 @@
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+- case $host_os in
+- os2*)
+- lt_prog_compiler_static='$wl-static'
+- ;;
+- esac
+ ;;
+
+ darwin* | rhapsody*)
+@@ -9213,7 +9020,7 @@
+ case $host_os in
+ aix*)
+ lt_prog_compiler_wl='-Wl,'
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ lt_prog_compiler_static='-Bstatic'
+ else
+@@ -9221,29 +9028,10 @@
+ fi
+ ;;
+
+- darwin* | rhapsody*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- lt_prog_compiler_pic='-fno-common'
+- case $cc_basename in
+- nagfor*)
+- # NAG Fortran compiler
+- lt_prog_compiler_wl='-Wl,-Wl,,'
+- lt_prog_compiler_pic='-PIC'
+- lt_prog_compiler_static='-Bstatic'
+- ;;
+- esac
+- ;;
+-
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+- case $host_os in
+- os2*)
+- lt_prog_compiler_static='$wl-static'
+- ;;
+- esac
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -9259,7 +9047,7 @@
+ ;;
+ esac
+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
+- lt_prog_compiler_static='$wl-a ${wl}archive'
++ lt_prog_compiler_static='${wl}-a ${wl}archive'
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+@@ -9268,9 +9056,9 @@
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+- # old Intel for x86_64, which still supported -KPIC.
++ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+@@ -9295,12 +9083,6 @@
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+- tcc*)
+- # Fabrice Bellard et al's Tiny C Compiler
+- lt_prog_compiler_wl='-Wl,'
+- lt_prog_compiler_pic='-fPIC'
+- lt_prog_compiler_static='-static'
+- ;;
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+@@ -9398,7 +9180,7 @@
+ ;;
+
+ sysv4*MP*)
+- if test -d /usr/nec; then
++ if test -d /usr/nec ;then
+ lt_prog_compiler_pic='-Kconform_pic'
+ lt_prog_compiler_static='-Bstatic'
+ fi
+@@ -9427,7 +9209,7 @@
+ fi
+
+ case $host_os in
+- # For platforms that do not support PIC, -DPIC is meaningless:
++ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic=
+ ;;
+@@ -9459,7 +9241,7 @@
+ lt_cv_prog_compiler_pic_works=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+- lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment
++ lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+@@ -9489,7 +9271,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+ $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+-if test yes = "$lt_cv_prog_compiler_pic_works"; then
++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+ case $lt_prog_compiler_pic in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+@@ -9521,7 +9303,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_static_works=no
+- save_LDFLAGS=$LDFLAGS
++ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+@@ -9540,13 +9322,13 @@
+ fi
+ fi
+ $RM -r conftest*
+- LDFLAGS=$save_LDFLAGS
++ LDFLAGS="$save_LDFLAGS"
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+ $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+-if test yes = "$lt_cv_prog_compiler_static_works"; then
++if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+ :
+ else
+ lt_prog_compiler_static=
+@@ -9666,8 +9448,8 @@
+
+
+
+-hard_links=nottested
+-if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+ $as_echo_n "checking if we can lock with hard links... " >&6; }
+@@ -9679,9 +9461,9 @@
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+ $as_echo "$hard_links" >&6; }
+- if test no = "$hard_links"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+-$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
++ if test "$hard_links" = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ need_locks=warn
+ fi
+ else
+@@ -9724,9 +9506,9 @@
+ # included in the symbol list
+ include_expsyms=
+ # exclude_expsyms can be an extended regexp of symbols to exclude
+- # it will be wrapped by ' (' and ')$', so one must not match beginning or
+- # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+- # as well as any symbol that contains 'd'.
++ # it will be wrapped by ` (' and `)$', so one must not match beginning or
++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++ # as well as any symbol that contains `d'.
+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+@@ -9741,7 +9523,7 @@
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+- if test yes != "$GCC"; then
++ if test "$GCC" != yes; then
+ with_gnu_ld=no
+ fi
+ ;;
+@@ -9749,7 +9531,7 @@
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
+- openbsd* | bitrig*)
++ openbsd*)
+ with_gnu_ld=no
+ ;;
+ esac
+@@ -9759,7 +9541,7 @@
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+@@ -9781,24 +9563,24 @@
+ esac
+ fi
+
+- if test yes = "$lt_use_gnu_ld_interface"; then
++ if test "$lt_use_gnu_ld_interface" = yes; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+- wlarc='$wl'
++ wlarc='${wl}'
+
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+- hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+- export_dynamic_flag_spec='$wl--export-dynamic'
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++ export_dynamic_flag_spec='${wl}--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+- whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
++ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ whole_archive_flag_spec=
+ fi
+ supports_anon_versioning=no
+- case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
++ case `$LD -v 2>&1` in
+ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+@@ -9811,7 +9593,7 @@
+ case $host_os in
+ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+- if test ia64 != "$host_cpu"; then
++ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+
+@@ -9830,7 +9612,7 @@
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds=''
+ ;;
+ m68k)
+@@ -9846,7 +9628,7 @@
+ allow_undefined_flag=unsupported
+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ ld_shlibs=no
+ fi
+@@ -9856,7 +9638,7 @@
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+- export_dynamic_flag_spec='$wl--export-all-symbols'
++ export_dynamic_flag_spec='${wl}--export-all-symbols'
+ allow_undefined_flag=unsupported
+ always_export_symbols=no
+ enable_shared_with_static_runtimes=yes
+@@ -9864,89 +9646,61 @@
+ 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'
+- # If the export-symbols file already is a .def file, use it as
+- # is; otherwise, prepend EXPORTS...
+- archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; 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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ # If the export-symbols file already is a .def file (1st line
++ # is EXPORTS), use it as is; otherwise, prepend...
++ archive_expsym_cmds='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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+ haiku*)
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ link_all_deplibs=yes
+ ;;
+
+- os2*)
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_minus_L=yes
+- allow_undefined_flag=unsupported
+- shrext_cmds=.dll
+- archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- prefix_cmds="$SED"~
+- if test EXPORTS = "`$SED 1q $export_symbols`"; then
+- prefix_cmds="$prefix_cmds -e 1d";
+- fi~
+- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+- enable_shared_with_static_runtimes=yes
+- ;;
+-
+ interix[3-9]*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+- hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+- export_dynamic_flag_spec='$wl-E'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+- archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+- if test linux-dietlibc = "$host_os"; then
++ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
+ esac
+ fi
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+- && test no = "$tmp_diet"
++ && test "$tmp_diet" = no
+ then
+ tmp_addflag=' $pic_flag'
+ tmp_sharedflag='-shared'
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+- whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+ pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group f77 and f90 compilers
+- whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+@@ -9957,47 +9711,42 @@
+ lf95*) # Lahey Fortran 8.1
+ whole_archive_flag_spec=
+ tmp_sharedflag='--shared' ;;
+- nagfor*) # NAGFOR 5.3
+- tmp_sharedflag='-Wl,-shared' ;;
+ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
+ nvcc*) # Cuda Compiler Driver 2.2
+- whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object=yes
+ ;;
+ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+- whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object=yes
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ esac
+- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+- if test yes = "$supports_anon_versioning"; then
++ 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~
+- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+
+ case $cc_basename in
+- tcc*)
+- export_dynamic_flag_spec='-rdynamic'
+- ;;
+ xlf* | bgf* | bgxlf* | mpixlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+- hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+- if test yes = "$supports_anon_versioning"; then
++ 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 $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ echo "local: *; };" >> $output_objdir/$libname.ver~
++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
+@@ -10011,8 +9760,8 @@
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+ else
+- 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'
++ 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
+ ;;
+
+@@ -10030,8 +9779,8 @@
+
+ _LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- 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'
++ 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
+@@ -10043,7 +9792,7 @@
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+
+-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+ *** reliably create shared libraries on SCO systems. Therefore, libtool
+ *** is disabling shared libraries support. We urge you to upgrade GNU
+ *** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+@@ -10058,9 +9807,9 @@
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+- 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'
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++ 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'
+ else
+ ld_shlibs=no
+ fi
+@@ -10077,15 +9826,15 @@
+
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- 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'
++ 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
+ ;;
+ esac
+
+- if test no = "$ld_shlibs"; then
++ if test "$ld_shlibs" = no; then
+ runpath_var=
+ hardcode_libdir_flag_spec=
+ export_dynamic_flag_spec=
+@@ -10101,7 +9850,7 @@
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L=yes
+- if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct=unsupported
+@@ -10109,57 +9858,34 @@
+ ;;
+
+ aix[4-9]*)
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+- no_entry_flag=
++ no_entry_flag=""
+ else
+ # If we're using GNU nm, then we don't want the "-C" option.
+- # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+- # Without the "-l" option, or with the "-B" option, AIX nm treats
+- # weak defined symbols like other global defined symbols, whereas
+- # GNU nm marks them as "W".
+- # While the 'weak' keyword is ignored in the Export File, we need
+- # it in the Import File for the 'aix-soname' feature, so we have
+- # to replace the "-B" option with "-P" for AIX nm.
++ # -C means demangle to AIX nm, but means don't demangle with GNU nm
++ # Also, AIX nm treats weak defined symbols like other global
++ # defined symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
++ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+- export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
++ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+- # have runtime linking enabled, and use it for executables.
+- # For shared libraries, we enable/disable runtime linking
+- # depending on the kind of the shared library created -
+- # when "with_aix_soname,aix_use_runtimelinking" is:
+- # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+- # "aix,yes" lib.so shared, rtl:yes, for executables
+- # lib.a static archive
+- # "both,no" lib.so.V(shr.o) shared, rtl:yes
+- # lib.a(lib.so.V) shared, rtl:no, for executables
+- # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+- # lib.a(lib.so.V) shared, rtl:no
+- # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+- # lib.a static archive
++ # need to do runtime linking.
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+- if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
+ done
+- if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+- # With aix-soname=svr4, we create the lib.so.V shared archives only,
+- # so we don't have lib.a shared libs to link our executables.
+- # We have to force runtime linking in this case.
+- aix_use_runtimelinking=yes
+- LDFLAGS="$LDFLAGS -Wl,-brtl"
+- fi
+ ;;
+ esac
+
+@@ -10178,21 +9904,13 @@
+ hardcode_direct_absolute=yes
+ hardcode_libdir_separator=':'
+ link_all_deplibs=yes
+- file_list_spec='$wl-f,'
+- case $with_aix_soname,$aix_use_runtimelinking in
+- aix,*) ;; # traditional, no import file
+- svr4,* | *,yes) # use import file
+- # The Import File defines what to hardcode.
+- hardcode_direct=no
+- hardcode_direct_absolute=no
+- ;;
+- esac
++ file_list_spec='${wl}-f,'
+
+- if test yes = "$GCC"; then
++ if test "$GCC" = yes; then
+ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+- collect2name=`$CC -print-prog-name=collect2`
++ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+ then
+@@ -10211,42 +9929,35 @@
+ ;;
+ esac
+ shared_flag='-shared'
+- if test yes = "$aix_use_runtimelinking"; then
+- shared_flag="$shared_flag "'$wl-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
+ fi
+- # Need to ensure runtime linking is disabled for the traditional
+- # shared library, or the linker may eventually find shared libraries
+- # /with/ Import File - we do not want to mix them.
+- shared_flag_aix='-shared'
+- shared_flag_svr4='-shared $wl-G'
+ else
+ # not using gcc
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+- if test yes = "$aix_use_runtimelinking"; then
+- shared_flag='$wl-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag='${wl}-G'
+ else
+- shared_flag='$wl-bM:SRE'
++ shared_flag='${wl}-bM:SRE'
+ fi
+- shared_flag_aix='$wl-bM:SRE'
+- shared_flag_svr4='$wl-G'
+ fi
+ fi
+
+- export_dynamic_flag_spec='$wl-bexpall'
++ export_dynamic_flag_spec='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ always_export_symbols=yes
+- if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
++ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ allow_undefined_flag='-berok'
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- if test set = "${lt_cv_aix_libpath+set}"; then
++ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+ else
+ if ${lt_cv_aix_libpath_+:} false; then :
+@@ -10281,7 +9992,7 @@
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$lt_cv_aix_libpath_"; then
+- lt_cv_aix_libpath_=/usr/lib:/lib
++ lt_cv_aix_libpath_="/usr/lib:/lib"
+ fi
+
+ fi
+@@ -10289,17 +10000,17 @@
+ 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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
++ 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"
+ else
+- if test ia64 = "$host_cpu"; then
+- hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
++ if test "$host_cpu" = ia64; then
++ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ allow_undefined_flag="-z nodefs"
+- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- if test set = "${lt_cv_aix_libpath+set}"; then
++ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+ else
+ if ${lt_cv_aix_libpath_+:} false; then :
+@@ -10334,7 +10045,7 @@
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$lt_cv_aix_libpath_"; then
+- lt_cv_aix_libpath_=/usr/lib:/lib
++ lt_cv_aix_libpath_="/usr/lib:/lib"
+ fi
+
+ fi
+@@ -10342,33 +10053,21 @@
+ aix_libpath=$lt_cv_aix_libpath_
+ fi
+
+- hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
++ hardcode_libdir_flag_spec='${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.
+- no_undefined_flag=' $wl-bernotok'
+- allow_undefined_flag=' $wl-berok'
+- if test yes = "$with_gnu_ld"; then
++ no_undefined_flag=' ${wl}-bernotok'
++ allow_undefined_flag=' ${wl}-berok'
++ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+- whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
++ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ whole_archive_flag_spec='$convenience'
+ fi
+ archive_cmds_need_lc=yes
+- archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+- # -brtl affects multiple linker settings, -berok does not and is overridden later
+- compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+- if test svr4 != "$with_aix_soname"; then
+- # This is similar to how AIX traditionally builds its shared libraries.
+- archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+- fi
+- if test aix != "$with_aix_soname"; then
+- archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+- else
+- # used by -dlpreopen to get the symbols
+- archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+- fi
+- archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
++ # This is similar to how AIX traditionally builds its shared libraries.
++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+@@ -10377,7 +10076,7 @@
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds=''
+ ;;
+ m68k)
+@@ -10407,17 +10106,16 @@
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=.dll
++ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+- archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+- archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+- cp "$export_symbols" "$output_objdir/$soname.def";
+- echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+- else
+- $SED -e '\''s/^/-link -EXPORT:/'\'' < $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='
++ 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
+@@ -10426,18 +10124,18 @@
+ # 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'
++ 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
+@@ -10446,7 +10144,7 @@
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=.dll
++ 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.
+@@ -10465,24 +10163,24 @@
+ hardcode_direct=no
+ hardcode_automatic=yes
+ hardcode_shlibpath_var=unsupported
+- if test yes = "$lt_cv_ld_force_load"; then
+- whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++ if test "$lt_cv_ld_force_load" = "yes"; then
++ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+ else
+ whole_archive_flag_spec=''
+ fi
+ link_all_deplibs=yes
+- allow_undefined_flag=$_lt_dar_allow_undefined
++ allow_undefined_flag="$_lt_dar_allow_undefined"
+ case $cc_basename in
+- ifort*|nagfor*) _lt_dar_can_shared=yes ;;
++ ifort*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+- if test yes = "$_lt_dar_can_shared"; then
++ if test "$_lt_dar_can_shared" = "yes"; then
+ output_verbose_link_cmd=func_echo_all
+- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+- archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+- module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+ else
+ ld_shlibs=no
+@@ -10524,33 +10222,33 @@
+ ;;
+
+ hpux9*)
+- if test yes = "$GCC"; then
+- archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
++ if test "$GCC" = yes; then
++ 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 "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
++ 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
+- hardcode_libdir_flag_spec='$wl+b $wl$libdir'
++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+- export_dynamic_flag_spec='$wl-E'
++ export_dynamic_flag_spec='${wl}-E'
+ ;;
+
+ hpux10*)
+- if test yes,no = "$GCC,$with_gnu_ld"; then
+- archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++ 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
+- if test no = "$with_gnu_ld"; then
+- hardcode_libdir_flag_spec='$wl+b $wl$libdir'
++ if test "$with_gnu_ld" = no; then
++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+ hardcode_direct_absolute=yes
+- export_dynamic_flag_spec='$wl-E'
++ export_dynamic_flag_spec='${wl}-E'
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+@@ -10558,25 +10256,25 @@
+ ;;
+
+ hpux11*)
+- if test yes,no = "$GCC,$with_gnu_ld"; then
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
+- archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+- archive_cmds='$CC -shared $pic_flag $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 $pic_flag $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
+ case $host_cpu in
+ hppa*64*)
+- archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+- archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+
+@@ -10588,7 +10286,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler__b=no
+- save_LDFLAGS=$LDFLAGS
++ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -b"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+@@ -10607,14 +10305,14 @@
+ fi
+ fi
+ $RM -r conftest*
+- LDFLAGS=$save_LDFLAGS
++ LDFLAGS="$save_LDFLAGS"
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+ $as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+-if test yes = "$lt_cv_prog_compiler__b"; then
+- archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++if test x"$lt_cv_prog_compiler__b" = xyes; then
++ archive_cmds='$CC -b ${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
+@@ -10622,8 +10320,8 @@
+ ;;
+ esac
+ fi
+- if test no = "$with_gnu_ld"; then
+- hardcode_libdir_flag_spec='$wl+b $wl$libdir'
++ if test "$with_gnu_ld" = no; then
++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+
+ case $host_cpu in
+@@ -10634,7 +10332,7 @@
+ *)
+ hardcode_direct=yes
+ hardcode_direct_absolute=yes
+- export_dynamic_flag_spec='$wl-E'
++ export_dynamic_flag_spec='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+@@ -10645,8 +10343,8 @@
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+- if test yes = "$GCC"; then
+- 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'
++ if test "$GCC" = yes; then
++ 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.
+@@ -10656,8 +10354,8 @@
+ 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"
++ 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) { return 0; }
+@@ -10669,34 +10367,24 @@
+ 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 yes = "$lt_cv_irix_exported_symbol"; 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'
++ 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'
++ 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'
+ fi
+ archive_cmds_need_lc='no'
+- hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ inherit_rpath=yes
+ link_all_deplibs=yes
+ ;;
+
+- linux*)
+- case $cc_basename in
+- tcc*)
+- # Fabrice Bellard et al's Tiny C Compiler
+- ld_shlibs=yes
+- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- ;;
+- esac
+- ;;
+-
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+@@ -10711,7 +10399,7 @@
+ newsos6)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+- hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_shlibpath_var=no
+ ;;
+@@ -10719,19 +10407,27 @@
+ *nto* | *qnx*)
+ ;;
+
+- openbsd* | bitrig*)
++ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ hardcode_direct_absolute=yes
+- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+- hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+- export_dynamic_flag_spec='$wl-E'
++ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec='${wl}-E'
+ else
+- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec='$wl-rpath,$libdir'
++ case $host_os in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec='-R$libdir'
++ ;;
++ *)
++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ ;;
++ esac
+ fi
+ else
+ ld_shlibs=no
+@@ -10742,53 +10438,33 @@
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+- shrext_cmds=.dll
+- archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- prefix_cmds="$SED"~
+- if test EXPORTS = "`$SED 1q $export_symbols`"; then
+- prefix_cmds="$prefix_cmds -e 1d";
+- fi~
+- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+- enable_shared_with_static_runtimes=yes
++ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++ old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+- if test yes = "$GCC"; then
+- allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+- archive_cmds='$CC -shared$allow_undefined_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'
++ if test "$GCC" = yes; then
++ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++ archive_cmds='$CC -shared${allow_undefined_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'
+ else
+ allow_undefined_flag=' -expect_unresolved \*'
+- archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ fi
+ archive_cmds_need_lc='no'
+- hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ ;;
+
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+- if test yes = "$GCC"; then
+- allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+- 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'
++ if test "$GCC" = yes; then
++ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++ 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 \*'
+- archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec='-rpath $libdir'
+@@ -10799,24 +10475,24 @@
+
+ solaris*)
+ no_undefined_flag=' -z defs'
+- if test yes = "$GCC"; then
+- wlarc='$wl'
+- archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ wlarc='${wl}'
++ 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 $pic_flag $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"*)
+ wlarc=''
+- archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ ;;
+ *)
+- wlarc='$wl'
+- archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
++ wlarc='${wl}'
++ archive_cmds='$CC -G${allow_undefined_flag} -h $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 -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ ;;
+ esac
+ fi
+@@ -10826,11 +10502,11 @@
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+- # but understands '-z linker_flag'. GCC discards it without '$wl',
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- if test yes = "$GCC"; then
+- whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
++ if test "$GCC" = yes; then
++ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+ fi
+@@ -10840,10 +10516,10 @@
+ ;;
+
+ sunos4*)
+- if test sequent = "$host_vendor"; then
++ if test "x$host_vendor" = xsequent; then
+ # Use $CC to link under sequent, because it throws in some extra .o
+ # files that make .init and .fini sections work.
+- archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+@@ -10892,43 +10568,43 @@
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+- no_undefined_flag='$wl-z,text'
++ no_undefined_flag='${wl}-z,text'
+ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
+ runpath_var='LD_RUN_PATH'
+
+- if test yes = "$GCC"; then
+- archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+- # Note: We CANNOT use -z defs as we might desire, because we do not
++ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+- no_undefined_flag='$wl-z,text'
+- allow_undefined_flag='$wl-z,nodefs'
++ no_undefined_flag='${wl}-z,text'
++ allow_undefined_flag='${wl}-z,nodefs'
+ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
+- hardcode_libdir_flag_spec='$wl-R,$libdir'
++ hardcode_libdir_flag_spec='${wl}-R,$libdir'
+ hardcode_libdir_separator=':'
+ link_all_deplibs=yes
+- export_dynamic_flag_spec='$wl-Bexport'
++ export_dynamic_flag_spec='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+- if test yes = "$GCC"; then
+- archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+@@ -10943,10 +10619,10 @@
+ ;;
+ esac
+
+- if test sni = "$host_vendor"; then
++ if test x$host_vendor = xsni; then
+ case $host in
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+- export_dynamic_flag_spec='$wl-Blargedynsym'
++ export_dynamic_flag_spec='${wl}-Blargedynsym'
+ ;;
+ esac
+ fi
+@@ -10954,7 +10630,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+ $as_echo "$ld_shlibs" >&6; }
+-test no = "$ld_shlibs" && can_build_shared=no
++test "$ld_shlibs" = no && can_build_shared=no
+
+ with_gnu_ld=$with_gnu_ld
+
+@@ -10980,7 +10656,7 @@
+ # Assume -lc should be added
+ archive_cmds_need_lc=yes
+
+- if test yes,yes = "$GCC,$enable_shared"; then
++ if test "$enable_shared" = yes && test "$GCC" = yes; then
+ case $archive_cmds in
+ *'~'*)
+ # FIXME: we may have to deal with multi-command sequences.
+@@ -11195,14 +10871,14 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+ $as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ case $host_os in
+- darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+- *) lt_awk_arg='/^libraries:/' ;;
++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+ case $host_os in
+- mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+- *) lt_sed_strip_eq='s|=/|/|g' ;;
++ mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
++ *) lt_sed_strip_eq="s,=/,/,g" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+ case $lt_search_path_spec in
+@@ -11218,35 +10894,28 @@
+ ;;
+ esac
+ # Ok, now we have the path, separated by spaces, we can step through it
+- # and add multilib dir if necessary...
++ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+- lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+- # ...but if some path component already ends with the multilib dir we assume
+- # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+- case "$lt_multi_os_dir; $lt_search_path_spec " in
+- "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+- lt_multi_os_dir=
+- ;;
+- esac
++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ for lt_sys_path in $lt_search_path_spec; do
+- if test -d "$lt_sys_path$lt_multi_os_dir"; then
+- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+- elif test -n "$lt_multi_os_dir"; then
++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++ else
+ test -d "$lt_sys_path" && \
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+-BEGIN {RS = " "; FS = "/|\n";} {
+- lt_foo = "";
+- lt_count = 0;
++BEGIN {RS=" "; FS="/|\n";} {
++ lt_foo="";
++ lt_count=0;
+ for (lt_i = NF; lt_i > 0; lt_i--) {
+ if ($lt_i != "" && $lt_i != ".") {
+ if ($lt_i == "..") {
+ lt_count++;
+ } else {
+ if (lt_count == 0) {
+- lt_foo = "/" $lt_i lt_foo;
++ lt_foo="/" $lt_i lt_foo;
+ } else {
+ lt_count--;
+ }
+@@ -11260,7 +10929,7 @@
+ # for these hosts.
+ case $host_os in
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+- $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
++ $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+ esac
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+ else
+@@ -11269,7 +10938,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext_cmds=.so
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -11286,16 +10955,14 @@
+ # flags to be left without arguments
+ need_version=unknown
+
+-
+-
+ case $host_os in
+ aix3*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+ # AIX 3 has no versioning support, so we append a major version to the name.
+- soname_spec='$libname$release$shared_ext$major'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+ aix[4-9]*)
+@@ -11303,91 +10970,41 @@
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 supports IA64
+- library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ else
+ # With GCC up to 2.95.x, collect2 would create an import file
+ # for dependence libraries. The import file would start with
+- # the line '#! .'. This would cause the generated library to
+- # depend on '.', always an invalid library. This was fixed in
++ # the line `#! .'. This would cause the generated library to
++ # depend on `.', always an invalid library. This was fixed in
+ # development snapshots of GCC prior to 3.0.
+ case $host_os in
+ aix4 | aix4.[01] | aix4.[01].*)
+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+ echo ' yes '
+- echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ :
+ else
+ can_build_shared=no
+ fi
+ ;;
+ esac
+- # Using Import Files as archive members, it is possible to support
+- # filename-based versioning of shared library archives on AIX. While
+- # this would work for both with and without runtime linking, it will
+- # prevent static linking of such archives. So we do filename-based
+- # shared library versioning with .so extension only, which is used
+- # when both runtime linking and shared linking is enabled.
+- # Unfortunately, runtime linking may impact performance, so we do
+- # not want this to be the default eventually. Also, we use the
+- # versioned .so libs for executables only if there is the -brtl
+- # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+- # To allow for filename-based versioning support, we need to create
+- # libNAME.so.V as an archive file, containing:
+- # *) an Import File, referring to the versioned filename of the
+- # archive as well as the shared archive member, telling the
+- # bitwidth (32 or 64) of that shared object, and providing the
+- # list of exported symbols of that shared object, eventually
+- # decorated with the 'weak' keyword
+- # *) the shared object with the F_LOADONLY flag set, to really avoid
+- # it being seen by the linker.
+- # At run time we better use the real file rather than another symlink,
+- # but for link time we create the symlink libNAME.so -> libNAME.so.V
+-
+- case $with_aix_soname,$aix_use_runtimelinking in
+- # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # soname into executable. Probably we can add versioning support to
+ # collect2, so additional links can be useful in future.
+- aix,yes) # traditional libtool
+- dynamic_linker='AIX unversionable lib.so'
++ if test "$aix_use_runtimelinking" = yes; then
+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+ # instead of lib<name>.a to let people know that these are not
+ # typical AIX shared libraries.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- ;;
+- aix,no) # traditional AIX only
+- dynamic_linker='AIX lib.a(lib.so.V)'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ else
+ # We preserve .a as extension for shared libraries through AIX4.2
+ # and later when we are not doing run time linking.
+- library_names_spec='$libname$release.a $libname.a'
+- soname_spec='$libname$release$shared_ext$major'
+- ;;
+- svr4,*) # full svr4 only
+- dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+- library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+- # We do not specify a path in Import Files, so LIBPATH fires.
+- shlibpath_overrides_runpath=yes
+- ;;
+- *,yes) # both, prefer svr4
+- dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+- library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+- # unpreferred sharedlib libNAME.a needs extra handling
+- postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+- postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+- # We do not specify a path in Import Files, so LIBPATH fires.
+- shlibpath_overrides_runpath=yes
+- ;;
+- *,no) # both, prefer aix
+- dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+- library_names_spec='$libname$release.a $libname.a'
+- soname_spec='$libname$release$shared_ext$major'
+- # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+- postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+- postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+- ;;
+- esac
++ library_names_spec='${libname}${release}.a $libname.a'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ fi
+ shlibpath_var=LIBPATH
+ fi
+ ;;
+@@ -11397,18 +11014,18 @@
+ powerpc)
+ # Since July 2007 AmigaOS4 officially supports .so libraries.
+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ ;;
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
+ ;;
+
+ beos*)
+- library_names_spec='$libname$shared_ext'
++ library_names_spec='${libname}${shared_ext}'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ ;;
+@@ -11416,8 +11033,8 @@
+ bsdi[45]*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+@@ -11429,7 +11046,7 @@
+
+ cygwin* | mingw* | pw32* | cegcc*)
+ version_type=windows
+- shrext_cmds=.dll
++ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+@@ -11438,8 +11055,8 @@
+ # gcc
+ library_names_spec='$libname.dll.a'
+ # 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'\''`~
++ 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~
+@@ -11455,17 +11072,17 @@
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+- soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+- soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
++ 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'
+@@ -11474,8 +11091,8 @@
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+- soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+- library_names_spec='$libname.dll.lib'
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ library_names_spec='${libname}.dll.lib'
+
+ case $build_os in
+ mingw*)
+@@ -11502,7 +11119,7 @@
+ 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
++ 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'`
+@@ -11515,8 +11132,8 @@
+ 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'\''`~
++ 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'
+@@ -11529,7 +11146,7 @@
+
+ *)
+ # Assume MSVC wrapper
+- library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ dynamic_linker='Win32 ld.exe'
+ ;;
+ esac
+@@ -11542,8 +11159,8 @@
+ version_type=darwin
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+- soname_spec='$libname$release$major$shared_ext'
++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++ soname_spec='${libname}${release}${major}$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+@@ -11556,8 +11173,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+@@ -11575,13 +11192,12 @@
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+ freebsd-*)
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
+ ;;
+ esac
+@@ -11606,15 +11222,26 @@
+ esac
+ ;;
+
++gnu*)
++ version_type=linux # correct to gnu/linux during the next big refactor
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ haiku*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LIBRARY_PATH
+- shlibpath_overrides_runpath=no
++ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+@@ -11632,15 +11259,14 @@
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
+- if test 32 = "$HPUX_IA64_MODE"; then
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ if test "X$HPUX_IA64_MODE" = X32; then
+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+- sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+ else
+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+- sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+ fi
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
+ shrext_cmds='.sl'
+@@ -11648,8 +11274,8 @@
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+@@ -11658,8 +11284,8 @@
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+@@ -11672,8 +11298,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+@@ -11684,7 +11310,7 @@
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+ *)
+- if test yes = "$lt_cv_prog_gnu_ld"; then
++ if test "$lt_cv_prog_gnu_ld" = yes; then
+ version_type=linux # correct to gnu/linux during the next big refactor
+ else
+ version_type=irix
+@@ -11692,8 +11318,8 @@
+ esac
+ need_lib_prefix=no
+ need_version=no
+- soname_spec='$libname$release$shared_ext$major'
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ case $host_os in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+@@ -11712,8 +11338,8 @@
+ esac
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+ shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+- sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ hardcode_into_libs=yes
+ ;;
+
+@@ -11722,33 +11348,13 @@
+ dynamic_linker=no
+ ;;
+
+-linux*android*)
+- version_type=none # Android doesn't support versioned libraries.
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='$libname$release$shared_ext'
+- soname_spec='$libname$release$shared_ext'
+- finish_cmds=
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+-
+- # This implies no fast_install, which is unacceptable.
+- # Some rework will be needed to allow for fast_install
+- # before this can be enabled.
+- hardcode_into_libs=yes
+-
+- dynamic_linker='Android linker'
+- # Don't embed -rpath directories since the linker doesn't support them.
+- hardcode_libdir_flag_spec='-L$libdir'
+- ;;
+-
+ # This must be glibc/ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+@@ -11792,15 +11398,14 @@
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # Ideally, we could use ldconfig to report *all* directores which are
+- # searched for libraries, however this is still not possible. Aside from not
+- # being certain /sbin/ldconfig is available, command
+- # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+- # even though it is searched at run-time. Try to do the best guess by
+- # appending ld.so.conf contents (and includes) to the search path.
++ # Add ABI-specific directories to the system library path.
++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
++
++ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -11817,12 +11422,12 @@
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -11832,7 +11437,7 @@
+
+ newsos6)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
+@@ -11841,68 +11446,58 @@
+ version_type=qnx
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='ldqnx.so'
+ ;;
+
+-openbsd* | bitrig*)
++openbsd*)
+ version_type=sunos
+- sys_lib_dlsearch_path_spec=/usr/lib
++ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+- need_version=no
+- else
+- need_version=yes
+- fi
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ case $host_os in
++ openbsd2.[89] | openbsd2.[89].*)
++ shlibpath_overrides_runpath=no
++ ;;
++ *)
++ shlibpath_overrides_runpath=yes
++ ;;
++ esac
++ else
++ shlibpath_overrides_runpath=yes
++ fi
+ ;;
+
+ os2*)
+ libname_spec='$name'
+- version_type=windows
+- shrext_cmds=.dll
+- need_version=no
++ shrext_cmds=".dll"
+ need_lib_prefix=no
+- # OS/2 can only load a DLL with a base name of 8 characters or less.
+- soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+- v=$($ECHO $release$versuffix | tr -d .-);
+- n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+- $ECHO $n$v`$shared_ext'
+- library_names_spec='${libname}_dll.$libext'
++ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+- shlibpath_var=BEGINLIBPATH
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+- 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~
+- chmod a+x \$dldir/$dlname~
+- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+- fi'
+- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+- dlpath=$dir/\$dldll~
+- $RM \$dlpath'
++ shlibpath_var=LIBPATH
+ ;;
+
+ osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+- soname_spec='$libname$release$shared_ext$major'
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+ rdos*)
+@@ -11913,8 +11508,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+@@ -11924,11 +11519,11 @@
+
+ sunos4*)
+ version_type=sunos
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+@@ -11936,8 +11531,8 @@
+
+ sysv4 | sysv4.3*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_vendor in
+ sni)
+@@ -11958,24 +11553,24 @@
+ ;;
+
+ sysv4*MP*)
+- if test -d /usr/nec; then
++ if test -d /usr/nec ;then
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+- soname_spec='$libname$shared_ext.$major'
++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+- version_type=sco
++ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+@@ -11993,7 +11588,7 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+@@ -12001,8 +11596,8 @@
+
+ uts4*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+@@ -12012,35 +11607,20 @@
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+ $as_echo "$dynamic_linker" >&6; }
+-test no = "$dynamic_linker" && can_build_shared=no
++test "$dynamic_linker" = no && can_build_shared=no
+
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+
+-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+- sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ fi
+-
+-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+- sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+ fi
+
+-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+-
+-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+-
+-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+-
+-
+-
+-
+-
+-
+
+
+
+@@ -12137,15 +11717,15 @@
+ hardcode_action=
+ if test -n "$hardcode_libdir_flag_spec" ||
+ test -n "$runpath_var" ||
+- test yes = "$hardcode_automatic"; then
++ test "X$hardcode_automatic" = "Xyes" ; then
+
+ # We can hardcode non-existent directories.
+- if test no != "$hardcode_direct" &&
++ if test "$hardcode_direct" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+- ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+- test no != "$hardcode_minus_L"; then
++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
++ test "$hardcode_minus_L" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action=relink
+ else
+@@ -12160,12 +11740,12 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+ $as_echo "$hardcode_action" >&6; }
+
+-if test relink = "$hardcode_action" ||
+- test yes = "$inherit_rpath"; then
++if test "$hardcode_action" = relink ||
++ test "$inherit_rpath" = yes; then
+ # Fast installation is not supported
+ enable_fast_install=no
+-elif test yes = "$shlibpath_overrides_runpath" ||
+- test no = "$enable_shared"; then
++elif test "$shlibpath_overrides_runpath" = yes ||
++ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+ fi
+@@ -12175,7 +11755,7 @@
+
+
+
+- if test yes != "$enable_dlopen"; then
++ if test "x$enable_dlopen" != xyes; then
+ enable_dlopen=unknown
+ enable_dlopen_self=unknown
+ enable_dlopen_self_static=unknown
+@@ -12185,23 +11765,23 @@
+
+ case $host_os in
+ beos*)
+- lt_cv_dlopen=load_add_on
++ lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ ;;
+
+ mingw* | pw32* | cegcc*)
+- lt_cv_dlopen=LoadLibrary
++ lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen_libs=
+ ;;
+
+ cygwin*)
+- lt_cv_dlopen=dlopen
++ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
+
+ darwin*)
+- # if libdl is installed we need to link against it
++ # if libdl is installed we need to link against it
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+ if ${ac_cv_lib_dl_dlopen+:} false; then :
+@@ -12239,10 +11819,10 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+ if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+- lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+
+- lt_cv_dlopen=dyld
++ lt_cv_dlopen="dyld"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+
+@@ -12250,18 +11830,10 @@
+
+ ;;
+
+- tpf*)
+- # Don't try to run any link tests for TPF. We know it's impossible
+- # because TPF is a cross-compiler, and we know how we open DSOs.
+- lt_cv_dlopen=dlopen
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=no
+- ;;
+-
+ *)
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+ if test "x$ac_cv_func_shl_load" = xyes; then :
+- lt_cv_dlopen=shl_load
++ lt_cv_dlopen="shl_load"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
+@@ -12300,11 +11872,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+ if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+- lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+ if test "x$ac_cv_func_dlopen" = xyes; then :
+- lt_cv_dlopen=dlopen
++ lt_cv_dlopen="dlopen"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+@@ -12343,7 +11915,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+ if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+- lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+ $as_echo_n "checking for dlopen in -lsvld... " >&6; }
+@@ -12382,7 +11954,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+ $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+ if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+- lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+ $as_echo_n "checking for dld_link in -ldld... " >&6; }
+@@ -12421,7 +11993,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+ $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+ if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+- lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+
+
+@@ -12442,21 +12014,21 @@
+ ;;
+ esac
+
+- if test no = "$lt_cv_dlopen"; then
+- enable_dlopen=no
+- else
++ if test "x$lt_cv_dlopen" != xno; then
+ enable_dlopen=yes
++ else
++ enable_dlopen=no
+ fi
+
+ case $lt_cv_dlopen in
+ dlopen)
+- save_CPPFLAGS=$CPPFLAGS
+- test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++ save_CPPFLAGS="$CPPFLAGS"
++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+- save_LDFLAGS=$LDFLAGS
++ save_LDFLAGS="$LDFLAGS"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+- save_LIBS=$LIBS
++ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+@@ -12464,7 +12036,7 @@
+ if ${lt_cv_dlopen_self+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+- if test yes = "$cross_compiling"; then :
++ if test "$cross_compiling" = yes; then :
+ lt_cv_dlopen_self=cross
+ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+@@ -12511,9 +12083,9 @@
+ # endif
+ #endif
+
+-/* When -fvisibility=hidden is used, assume the code has been annotated
++/* 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))
++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+ int fnord () __attribute__((visibility("default")));
+ #endif
+
+@@ -12543,7 +12115,7 @@
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+@@ -12563,14 +12135,14 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+ $as_echo "$lt_cv_dlopen_self" >&6; }
+
+- if test yes = "$lt_cv_dlopen_self"; then
++ if test "x$lt_cv_dlopen_self" = xyes; then
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+ $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+ if ${lt_cv_dlopen_self_static+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+- if test yes = "$cross_compiling"; then :
++ if test "$cross_compiling" = yes; then :
+ lt_cv_dlopen_self_static=cross
+ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+@@ -12617,9 +12189,9 @@
+ # endif
+ #endif
+
+-/* When -fvisibility=hidden is used, assume the code has been annotated
++/* 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))
++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+ int fnord () __attribute__((visibility("default")));
+ #endif
+
+@@ -12649,7 +12221,7 @@
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+@@ -12670,9 +12242,9 @@
+ $as_echo "$lt_cv_dlopen_self_static" >&6; }
+ fi
+
+- CPPFLAGS=$save_CPPFLAGS
+- LDFLAGS=$save_LDFLAGS
+- LIBS=$save_LIBS
++ CPPFLAGS="$save_CPPFLAGS"
++ LDFLAGS="$save_LDFLAGS"
++ LIBS="$save_LIBS"
+ ;;
+ esac
+
+@@ -12716,7 +12288,7 @@
+ # FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+- if test -n "$STRIP"; then
++ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+@@ -12744,7 +12316,7 @@
+
+
+
+- # Report what library types will actually be built
++ # Report which library types will actually be built
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+ $as_echo_n "checking if libtool supports shared libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+@@ -12752,13 +12324,13 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+ $as_echo_n "checking whether to build shared libraries... " >&6; }
+- test no = "$can_build_shared" && enable_shared=no
++ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+- test yes = "$enable_shared" && enable_static=no
++ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+@@ -12766,12 +12338,8 @@
+ ;;
+
+ aix[4-9]*)
+- if test ia64 != "$host_cpu"; then
+- case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+- yes,aix,yes) ;; # shared object as lib.so file only
+- yes,svr4,*) ;; # shared object as lib.so archive member only
+- yes,*) enable_static=no ;; # shared object in lib.a archive as well
+- esac
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+ esac
+@@ -12781,7 +12349,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+ $as_echo_n "checking whether to build static libraries... " >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+- test yes = "$enable_shared" || enable_static=yes
++ test "$enable_shared" = yes || enable_static=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+ $as_echo "$enable_static" >&6; }
+
+@@ -12795,7 +12363,7 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-CC=$lt_save_CC
++CC="$lt_save_CC"
+
+
+
+@@ -13266,6 +12834,12 @@
+ fi
+
+
++# Check whether --with-ime was given.
++if test "${with_ime+set}" = set; then :
++ withval=$with_ime;
++fi
++
++
+ # Check whether --with-mpi was given.
+ if test "${with_mpi+set}" = set; then :
+ withval=$with_mpi;
+@@ -13956,7 +13530,7 @@
+ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+
+-if test -z "$F77" || test no = "$F77"; then
++if test -z "$F77" || test "X$F77" = "Xno"; then
+ _lt_disable_F77=yes
+ fi
+
+@@ -13993,7 +13567,7 @@
+ # the F77 compiler isn't working. Some variables (like enable_shared)
+ # are currently assumed to apply to all compilers on this platform,
+ # and will be corrupted by setting them based on a non-working compiler.
+-if test yes != "$_lt_disable_F77"; then
++if test "$_lt_disable_F77" != yes; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="\
+ subroutine t
+@@ -14039,15 +13613,22 @@
+
+
+ # Allow CC to be a program name with arguments.
+- lt_save_CC=$CC
++ lt_save_CC="$CC"
+ lt_save_GCC=$GCC
+ lt_save_CFLAGS=$CFLAGS
+ CC=${F77-"f77"}
+ CFLAGS=$FFLAGS
+ compiler=$CC
+ compiler_F77=$CC
+- func_cc_basename $compiler
+-cc_basename=$func_cc_basename_result
++ for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+ GCC=$G77
+ if test -n "$compiler"; then
+@@ -14058,25 +13639,21 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+ $as_echo_n "checking whether to build shared libraries... " >&6; }
+- test no = "$can_build_shared" && enable_shared=no
++ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+- test yes = "$enable_shared" && enable_static=no
++ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+ aix[4-9]*)
+- if test ia64 != "$host_cpu"; then
+- case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+- yes,aix,yes) ;; # shared object as lib.so file only
+- yes,svr4,*) ;; # shared object as lib.so archive member only
+- yes,*) enable_static=no ;; # shared object in lib.a archive as well
+- esac
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+ esac
+@@ -14086,12 +13663,12 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+ $as_echo_n "checking whether to build static libraries... " >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+- test yes = "$enable_shared" || enable_static=yes
++ test "$enable_shared" = yes || enable_static=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+ $as_echo "$enable_static" >&6; }
+
+- GCC_F77=$G77
+- LD_F77=$LD
++ GCC_F77="$G77"
++ LD_F77="$LD"
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -14102,18 +13679,17 @@
+ lt_prog_compiler_static_F77=
+
+
+- if test yes = "$GCC"; then
++ if test "$GCC" = yes; then
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_static_F77='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ lt_prog_compiler_static_F77='-Bstatic'
+ fi
+- lt_prog_compiler_pic_F77='-fPIC'
+ ;;
+
+ amigaos*)
+@@ -14124,8 +13700,8 @@
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+- # adding the '-m68020' flag to GCC prevents building anything better,
+- # like '-m68040'.
++ # adding the `-m68020' flag to GCC prevents building anything better,
++ # like `-m68040'.
+ lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
+@@ -14141,11 +13717,6 @@
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+- case $host_os in
+- os2*)
+- lt_prog_compiler_static_F77='$wl-static'
+- ;;
+- esac
+ ;;
+
+ darwin* | rhapsody*)
+@@ -14216,7 +13787,7 @@
+ case $host_os in
+ aix*)
+ lt_prog_compiler_wl_F77='-Wl,'
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ lt_prog_compiler_static_F77='-Bstatic'
+ else
+@@ -14224,29 +13795,10 @@
+ fi
+ ;;
+
+- darwin* | rhapsody*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- lt_prog_compiler_pic_F77='-fno-common'
+- case $cc_basename in
+- nagfor*)
+- # NAG Fortran compiler
+- lt_prog_compiler_wl_F77='-Wl,-Wl,,'
+- lt_prog_compiler_pic_F77='-PIC'
+- lt_prog_compiler_static_F77='-Bstatic'
+- ;;
+- esac
+- ;;
+-
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+- case $host_os in
+- os2*)
+- lt_prog_compiler_static_F77='$wl-static'
+- ;;
+- esac
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -14262,7 +13814,7 @@
+ ;;
+ esac
+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
+- lt_prog_compiler_static_F77='$wl-a ${wl}archive'
++ lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+@@ -14271,9 +13823,9 @@
+ lt_prog_compiler_static_F77='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+- # old Intel for x86_64, which still supported -KPIC.
++ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-KPIC'
+@@ -14298,12 +13850,6 @@
+ lt_prog_compiler_pic_F77='-PIC'
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
+- tcc*)
+- # Fabrice Bellard et al's Tiny C Compiler
+- lt_prog_compiler_wl_F77='-Wl,'
+- lt_prog_compiler_pic_F77='-fPIC'
+- lt_prog_compiler_static_F77='-static'
+- ;;
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+@@ -14401,7 +13947,7 @@
+ ;;
+
+ sysv4*MP*)
+- if test -d /usr/nec; then
++ if test -d /usr/nec ;then
+ lt_prog_compiler_pic_F77='-Kconform_pic'
+ lt_prog_compiler_static_F77='-Bstatic'
+ fi
+@@ -14430,7 +13976,7 @@
+ fi
+
+ case $host_os in
+- # For platforms that do not support PIC, -DPIC is meaningless:
++ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic_F77=
+ ;;
+@@ -14462,7 +14008,7 @@
+ lt_cv_prog_compiler_pic_works_F77=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+- lt_compiler_flag="$lt_prog_compiler_pic_F77" ## exclude from sc_useless_quotes_in_assignment
++ lt_compiler_flag="$lt_prog_compiler_pic_F77"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+@@ -14492,7 +14038,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_F77" >&5
+ $as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
+
+-if test yes = "$lt_cv_prog_compiler_pic_works_F77"; then
++if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
+ case $lt_prog_compiler_pic_F77 in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
+@@ -14518,7 +14064,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_static_works_F77=no
+- save_LDFLAGS=$LDFLAGS
++ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+@@ -14537,13 +14083,13 @@
+ fi
+ fi
+ $RM -r conftest*
+- LDFLAGS=$save_LDFLAGS
++ LDFLAGS="$save_LDFLAGS"
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_F77" >&5
+ $as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
+
+-if test yes = "$lt_cv_prog_compiler_static_works_F77"; then
++if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
+ :
+ else
+ lt_prog_compiler_static_F77=
+@@ -14657,8 +14203,8 @@
+
+
+
+-hard_links=nottested
+-if test no = "$lt_cv_prog_compiler_c_o_F77" && test no != "$need_locks"; then
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+ $as_echo_n "checking if we can lock with hard links... " >&6; }
+@@ -14670,9 +14216,9 @@
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+ $as_echo "$hard_links" >&6; }
+- if test no = "$hard_links"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+-$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
++ if test "$hard_links" = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ need_locks=warn
+ fi
+ else
+@@ -14712,9 +14258,9 @@
+ # included in the symbol list
+ include_expsyms_F77=
+ # exclude_expsyms can be an extended regexp of symbols to exclude
+- # it will be wrapped by ' (' and ')$', so one must not match beginning or
+- # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+- # as well as any symbol that contains 'd'.
++ # it will be wrapped by ` (' and `)$', so one must not match beginning or
++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++ # as well as any symbol that contains `d'.
+ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+@@ -14729,7 +14275,7 @@
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+- if test yes != "$GCC"; then
++ if test "$GCC" != yes; then
+ with_gnu_ld=no
+ fi
+ ;;
+@@ -14737,7 +14283,7 @@
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
+- openbsd* | bitrig*)
++ openbsd*)
+ with_gnu_ld=no
+ ;;
+ esac
+@@ -14747,7 +14293,7 @@
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+@@ -14769,24 +14315,24 @@
+ esac
+ fi
+
+- if test yes = "$lt_use_gnu_ld_interface"; then
++ if test "$lt_use_gnu_ld_interface" = yes; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+- wlarc='$wl'
++ wlarc='${wl}'
+
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+- hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
+- export_dynamic_flag_spec_F77='$wl--export-dynamic'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++ export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+- whole_archive_flag_spec_F77=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
++ whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ whole_archive_flag_spec_F77=
+ fi
+ supports_anon_versioning=no
+- case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
++ case `$LD -v 2>&1` in
+ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+@@ -14799,7 +14345,7 @@
+ case $host_os in
+ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+- if test ia64 != "$host_cpu"; then
++ if test "$host_cpu" != ia64; then
+ ld_shlibs_F77=no
+ cat <<_LT_EOF 1>&2
+
+@@ -14818,7 +14364,7 @@
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_F77=''
+ ;;
+ m68k)
+@@ -14834,7 +14380,7 @@
+ allow_undefined_flag_F77=unsupported
+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+- archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ ld_shlibs_F77=no
+ fi
+@@ -14844,7 +14390,7 @@
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec_F77='-L$libdir'
+- export_dynamic_flag_spec_F77='$wl--export-all-symbols'
++ export_dynamic_flag_spec_F77='${wl}--export-all-symbols'
+ allow_undefined_flag_F77=unsupported
+ always_export_symbols_F77=no
+ enable_shared_with_static_runtimes_F77=yes
+@@ -14852,89 +14398,61 @@
+ exclude_expsyms_F77='[_]+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_F77='$CC -shared $libobjs $deplibs $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, use it as
+- # is; otherwise, prepend EXPORTS...
+- archive_expsym_cmds_F77='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; 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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ # If the export-symbols file already is a .def file (1st line
++ # is EXPORTS), use it as is; otherwise, prepend...
++ archive_expsym_cmds_F77='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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ ld_shlibs_F77=no
+ fi
+ ;;
+
+ haiku*)
+- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ link_all_deplibs_F77=yes
+ ;;
+
+- os2*)
+- hardcode_libdir_flag_spec_F77='-L$libdir'
+- hardcode_minus_L_F77=yes
+- allow_undefined_flag_F77=unsupported
+- shrext_cmds=.dll
+- archive_cmds_F77='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- archive_expsym_cmds_F77='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- prefix_cmds="$SED"~
+- if test EXPORTS = "`$SED 1q $export_symbols`"; then
+- prefix_cmds="$prefix_cmds -e 1d";
+- fi~
+- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- old_archive_From_new_cmds_F77='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+- enable_shared_with_static_runtimes_F77=yes
+- ;;
+-
+ interix[3-9]*)
+ hardcode_direct_F77=no
+ hardcode_shlibpath_var_F77=no
+- hardcode_libdir_flag_spec_F77='$wl-rpath,$libdir'
+- export_dynamic_flag_spec_F77='$wl-E'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_F77='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+- archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+- archive_expsym_cmds_F77='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+- if test linux-dietlibc = "$host_os"; then
++ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
+ esac
+ fi
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+- && test no = "$tmp_diet"
++ && test "$tmp_diet" = no
+ then
+ tmp_addflag=' $pic_flag'
+ tmp_sharedflag='-shared'
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+- whole_archive_flag_spec_F77='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+ pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group f77 and f90 compilers
+- whole_archive_flag_spec_F77='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+@@ -14945,47 +14463,42 @@
+ lf95*) # Lahey Fortran 8.1
+ whole_archive_flag_spec_F77=
+ tmp_sharedflag='--shared' ;;
+- nagfor*) # NAGFOR 5.3
+- tmp_sharedflag='-Wl,-shared' ;;
+ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
+ nvcc*) # Cuda Compiler Driver 2.2
+- whole_archive_flag_spec_F77='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object_F77=yes
+ ;;
+ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+- whole_archive_flag_spec_F77='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object_F77=yes
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ esac
+- archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+- if test yes = "$supports_anon_versioning"; then
++ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds_F77='echo "{ global:" > $output_objdir/$libname.ver~
+- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+- echo "local: *; };" >> $output_objdir/$libname.ver~
+- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+
+ case $cc_basename in
+- tcc*)
+- export_dynamic_flag_spec_F77='-rdynamic'
+- ;;
+ xlf* | bgf* | bgxlf* | mpixlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ whole_archive_flag_spec_F77='--whole-archive$convenience --no-whole-archive'
+- hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+ archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+- if test yes = "$supports_anon_versioning"; then
++ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds_F77='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 $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ echo "local: *; };" >> $output_objdir/$libname.ver~
++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
+@@ -14999,8 +14512,8 @@
+ archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+ else
+- archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ fi
+ ;;
+
+@@ -15018,8 +14531,8 @@
+
+ _LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs_F77=no
+ fi
+@@ -15031,7 +14544,7 @@
+ ld_shlibs_F77=no
+ cat <<_LT_EOF 1>&2
+
+-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+ *** reliably create shared libraries on SCO systems. Therefore, libtool
+ *** is disabling shared libraries support. We urge you to upgrade GNU
+ *** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+@@ -15046,9 +14559,9 @@
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
+- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs_F77=no
+ fi
+@@ -15065,15 +14578,15 @@
+
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs_F77=no
+ fi
+ ;;
+ esac
+
+- if test no = "$ld_shlibs_F77"; then
++ if test "$ld_shlibs_F77" = no; then
+ runpath_var=
+ hardcode_libdir_flag_spec_F77=
+ export_dynamic_flag_spec_F77=
+@@ -15089,7 +14602,7 @@
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L_F77=yes
+- if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct_F77=unsupported
+@@ -15097,57 +14610,34 @@
+ ;;
+
+ aix[4-9]*)
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+- no_entry_flag=
++ no_entry_flag=""
+ else
+ # If we're using GNU nm, then we don't want the "-C" option.
+- # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+- # Without the "-l" option, or with the "-B" option, AIX nm treats
+- # weak defined symbols like other global defined symbols, whereas
+- # GNU nm marks them as "W".
+- # While the 'weak' keyword is ignored in the Export File, we need
+- # it in the Import File for the 'aix-soname' feature, so we have
+- # to replace the "-B" option with "-P" for AIX nm.
++ # -C means demangle to AIX nm, but means don't demangle with GNU nm
++ # Also, AIX nm treats weak defined symbols like other global
++ # defined symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
++ export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+- export_symbols_cmds_F77='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
++ export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+- # have runtime linking enabled, and use it for executables.
+- # For shared libraries, we enable/disable runtime linking
+- # depending on the kind of the shared library created -
+- # when "with_aix_soname,aix_use_runtimelinking" is:
+- # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+- # "aix,yes" lib.so shared, rtl:yes, for executables
+- # lib.a static archive
+- # "both,no" lib.so.V(shr.o) shared, rtl:yes
+- # lib.a(lib.so.V) shared, rtl:no, for executables
+- # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+- # lib.a(lib.so.V) shared, rtl:no
+- # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+- # lib.a static archive
++ # need to do runtime linking.
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+- if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
+ done
+- if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+- # With aix-soname=svr4, we create the lib.so.V shared archives only,
+- # so we don't have lib.a shared libs to link our executables.
+- # We have to force runtime linking in this case.
+- aix_use_runtimelinking=yes
+- LDFLAGS="$LDFLAGS -Wl,-brtl"
+- fi
+ ;;
+ esac
+
+@@ -15166,21 +14656,13 @@
+ hardcode_direct_absolute_F77=yes
+ hardcode_libdir_separator_F77=':'
+ link_all_deplibs_F77=yes
+- file_list_spec_F77='$wl-f,'
+- case $with_aix_soname,$aix_use_runtimelinking in
+- aix,*) ;; # traditional, no import file
+- svr4,* | *,yes) # use import file
+- # The Import File defines what to hardcode.
+- hardcode_direct_F77=no
+- hardcode_direct_absolute_F77=no
+- ;;
+- esac
++ file_list_spec_F77='${wl}-f,'
+
+- if test yes = "$GCC"; then
++ if test "$GCC" = yes; then
+ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+- collect2name=`$CC -print-prog-name=collect2`
++ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+ then
+@@ -15199,42 +14681,35 @@
+ ;;
+ esac
+ shared_flag='-shared'
+- if test yes = "$aix_use_runtimelinking"; then
+- shared_flag="$shared_flag "'$wl-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
+ fi
+- # Need to ensure runtime linking is disabled for the traditional
+- # shared library, or the linker may eventually find shared libraries
+- # /with/ Import File - we do not want to mix them.
+- shared_flag_aix='-shared'
+- shared_flag_svr4='-shared $wl-G'
+ else
+ # not using gcc
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+- if test yes = "$aix_use_runtimelinking"; then
+- shared_flag='$wl-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag='${wl}-G'
+ else
+- shared_flag='$wl-bM:SRE'
++ shared_flag='${wl}-bM:SRE'
+ fi
+- shared_flag_aix='$wl-bM:SRE'
+- shared_flag_svr4='$wl-G'
+ fi
+ fi
+
+- export_dynamic_flag_spec_F77='$wl-bexpall'
++ export_dynamic_flag_spec_F77='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ always_export_symbols_F77=yes
+- if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
++ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ allow_undefined_flag_F77='-berok'
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- if test set = "${lt_cv_aix_libpath+set}"; then
++ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+ else
+ if ${lt_cv_aix_libpath__F77+:} false; then :
+@@ -15263,7 +14738,7 @@
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$lt_cv_aix_libpath__F77"; then
+- lt_cv_aix_libpath__F77=/usr/lib:/lib
++ lt_cv_aix_libpath__F77="/usr/lib:/lib"
+ fi
+
+ fi
+@@ -15271,17 +14746,17 @@
+ aix_libpath=$lt_cv_aix_libpath__F77
+ fi
+
+- hardcode_libdir_flag_spec_F77='$wl-blibpath:$libdir:'"$aix_libpath"
+- archive_expsym_cmds_F77='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
++ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
++ archive_expsym_cmds_F77='$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
+- if test ia64 = "$host_cpu"; then
+- hardcode_libdir_flag_spec_F77='$wl-R $libdir:/usr/lib:/lib'
++ if test "$host_cpu" = ia64; then
++ hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
+ allow_undefined_flag_F77="-z nodefs"
+- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
++ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- if test set = "${lt_cv_aix_libpath+set}"; then
++ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+ else
+ if ${lt_cv_aix_libpath__F77+:} false; then :
+@@ -15310,7 +14785,7 @@
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$lt_cv_aix_libpath__F77"; then
+- lt_cv_aix_libpath__F77=/usr/lib:/lib
++ lt_cv_aix_libpath__F77="/usr/lib:/lib"
+ fi
+
+ fi
+@@ -15318,33 +14793,21 @@
+ aix_libpath=$lt_cv_aix_libpath__F77
+ fi
+
+- hardcode_libdir_flag_spec_F77='$wl-blibpath:$libdir:'"$aix_libpath"
++ hardcode_libdir_flag_spec_F77='${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.
+- no_undefined_flag_F77=' $wl-bernotok'
+- allow_undefined_flag_F77=' $wl-berok'
+- if test yes = "$with_gnu_ld"; then
++ no_undefined_flag_F77=' ${wl}-bernotok'
++ allow_undefined_flag_F77=' ${wl}-berok'
++ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+- whole_archive_flag_spec_F77='$wl--whole-archive$convenience $wl--no-whole-archive'
++ whole_archive_flag_spec_F77='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ whole_archive_flag_spec_F77='$convenience'
+ fi
+ archive_cmds_need_lc_F77=yes
+- archive_expsym_cmds_F77='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+- # -brtl affects multiple linker settings, -berok does not and is overridden later
+- compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+- if test svr4 != "$with_aix_soname"; then
+- # This is similar to how AIX traditionally builds its shared libraries.
+- archive_expsym_cmds_F77="$archive_expsym_cmds_F77"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+- fi
+- if test aix != "$with_aix_soname"; then
+- archive_expsym_cmds_F77="$archive_expsym_cmds_F77"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+- else
+- # used by -dlpreopen to get the symbols
+- archive_expsym_cmds_F77="$archive_expsym_cmds_F77"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+- fi
+- archive_expsym_cmds_F77="$archive_expsym_cmds_F77"'~$RM -r $output_objdir/$realname.d'
++ # This is similar to how AIX traditionally builds its shared libraries.
++ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+@@ -15353,7 +14816,7 @@
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_F77=''
+ ;;
+ m68k)
+@@ -15383,17 +14846,16 @@
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=.dll
++ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+- archive_cmds_F77='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+- archive_expsym_cmds_F77='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+- cp "$export_symbols" "$output_objdir/$soname.def";
+- echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+- else
+- $SED -e '\''s/^/-link -EXPORT:/'\'' < $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='
++ archive_cmds_F77='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
++ archive_expsym_cmds_F77='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, F77)='true'
+ enable_shared_with_static_runtimes_F77=yes
+@@ -15402,18 +14864,18 @@
+ # Don't use ranlib
+ old_postinstall_cmds_F77='chmod 644 $oldlib'
+ postlink_cmds_F77='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'
++ 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
+@@ -15422,7 +14884,7 @@
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=.dll
++ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ archive_cmds_F77='$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.
+@@ -15441,24 +14903,24 @@
+ hardcode_direct_F77=no
+ hardcode_automatic_F77=yes
+ hardcode_shlibpath_var_F77=unsupported
+- if test yes = "$lt_cv_ld_force_load"; then
+- whole_archive_flag_spec_F77='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++ if test "$lt_cv_ld_force_load" = "yes"; then
++ whole_archive_flag_spec_F77='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ compiler_needs_object_F77=yes
+ else
+ whole_archive_flag_spec_F77=''
+ fi
+ link_all_deplibs_F77=yes
+- allow_undefined_flag_F77=$_lt_dar_allow_undefined
++ allow_undefined_flag_F77="$_lt_dar_allow_undefined"
+ case $cc_basename in
+- ifort*|nagfor*) _lt_dar_can_shared=yes ;;
++ ifort*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+- if test yes = "$_lt_dar_can_shared"; then
++ if test "$_lt_dar_can_shared" = "yes"; then
+ output_verbose_link_cmd=func_echo_all
+- archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+- module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+- archive_expsym_cmds_F77="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+- module_expsym_cmds_F77="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
++ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+ else
+ ld_shlibs_F77=no
+@@ -15500,33 +14962,33 @@
+ ;;
+
+ hpux9*)
+- if test yes = "$GCC"; then
+- archive_cmds_F77='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
++ if test "$GCC" = yes; then
++ archive_cmds_F77='$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_F77='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
++ archive_cmds_F77='$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
+- hardcode_libdir_flag_spec_F77='$wl+b $wl$libdir'
++ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_F77=:
+ hardcode_direct_F77=yes
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L_F77=yes
+- export_dynamic_flag_spec_F77='$wl-E'
++ export_dynamic_flag_spec_F77='${wl}-E'
+ ;;
+
+ hpux10*)
+- if test yes,no = "$GCC,$with_gnu_ld"; then
+- archive_cmds_F77='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++ archive_cmds_F77='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+- if test no = "$with_gnu_ld"; then
+- hardcode_libdir_flag_spec_F77='$wl+b $wl$libdir'
++ if test "$with_gnu_ld" = no; then
++ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_F77=:
+ hardcode_direct_F77=yes
+ hardcode_direct_absolute_F77=yes
+- export_dynamic_flag_spec_F77='$wl-E'
++ export_dynamic_flag_spec_F77='${wl}-E'
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L_F77=yes
+@@ -15534,33 +14996,33 @@
+ ;;
+
+ hpux11*)
+- if test yes,no = "$GCC,$with_gnu_ld"; then
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
+- archive_cmds_F77='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+- archive_cmds_F77='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_F77='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- archive_cmds_F77='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_F77='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ else
+ case $host_cpu in
+ hppa*64*)
+- archive_cmds_F77='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+- archive_cmds_F77='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- archive_cmds_F77='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ fi
+- if test no = "$with_gnu_ld"; then
+- hardcode_libdir_flag_spec_F77='$wl+b $wl$libdir'
++ if test "$with_gnu_ld" = no; then
++ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_F77=:
+
+ case $host_cpu in
+@@ -15571,7 +15033,7 @@
+ *)
+ hardcode_direct_F77=yes
+ hardcode_direct_absolute_F77=yes
+- export_dynamic_flag_spec_F77='$wl-E'
++ export_dynamic_flag_spec_F77='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+@@ -15582,8 +15044,8 @@
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+- if test yes = "$GCC"; then
+- archive_cmds_F77='$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'
++ if test "$GCC" = yes; then
++ archive_cmds_F77='$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.
+@@ -15593,8 +15055,8 @@
+ 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"
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ cat > conftest.$ac_ext <<_ACEOF
+
+ subroutine foo
+@@ -15607,34 +15069,24 @@
+ 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 yes = "$lt_cv_irix_exported_symbol"; then
+- archive_expsym_cmds_F77='$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'
++ if test "$lt_cv_irix_exported_symbol" = yes; then
++ archive_expsym_cmds_F77='$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_F77='$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_F77='$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'
++ archive_cmds_F77='$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_F77='$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'
+ fi
+ archive_cmds_need_lc_F77='no'
+- hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_F77=:
+ inherit_rpath_F77=yes
+ link_all_deplibs_F77=yes
+ ;;
+
+- linux*)
+- case $cc_basename in
+- tcc*)
+- # Fabrice Bellard et al's Tiny C Compiler
+- ld_shlibs_F77=yes
+- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- ;;
+- esac
+- ;;
+-
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+@@ -15649,7 +15101,7 @@
+ newsos6)
+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_F77=yes
+- hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_F77=:
+ hardcode_shlibpath_var_F77=no
+ ;;
+@@ -15657,19 +15109,27 @@
+ *nto* | *qnx*)
+ ;;
+
+- openbsd* | bitrig*)
++ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ hardcode_direct_F77=yes
+ hardcode_shlibpath_var_F77=no
+ hardcode_direct_absolute_F77=yes
+- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+- hardcode_libdir_flag_spec_F77='$wl-rpath,$libdir'
+- export_dynamic_flag_spec_F77='$wl-E'
++ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_F77='${wl}-E'
+ else
+- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec_F77='$wl-rpath,$libdir'
++ case $host_os in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec_F77='-R$libdir'
++ ;;
++ *)
++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++ ;;
++ esac
+ fi
+ else
+ ld_shlibs_F77=no
+@@ -15680,53 +15140,33 @@
+ hardcode_libdir_flag_spec_F77='-L$libdir'
+ hardcode_minus_L_F77=yes
+ allow_undefined_flag_F77=unsupported
+- shrext_cmds=.dll
+- archive_cmds_F77='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- archive_expsym_cmds_F77='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- prefix_cmds="$SED"~
+- if test EXPORTS = "`$SED 1q $export_symbols`"; then
+- prefix_cmds="$prefix_cmds -e 1d";
+- fi~
+- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- old_archive_From_new_cmds_F77='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+- enable_shared_with_static_runtimes_F77=yes
++ archive_cmds_F77='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++ old_archive_from_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+- if test yes = "$GCC"; then
+- allow_undefined_flag_F77=' $wl-expect_unresolved $wl\*'
+- archive_cmds_F77='$CC -shared$allow_undefined_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'
++ if test "$GCC" = yes; then
++ allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
++ archive_cmds_F77='$CC -shared${allow_undefined_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'
+ else
+ allow_undefined_flag_F77=' -expect_unresolved \*'
+- archive_cmds_F77='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ fi
+ archive_cmds_need_lc_F77='no'
+- hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_F77=:
+ ;;
+
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+- if test yes = "$GCC"; then
+- allow_undefined_flag_F77=' $wl-expect_unresolved $wl\*'
+- archive_cmds_F77='$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_F77='$wl-rpath $wl$libdir'
++ if test "$GCC" = yes; then
++ allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
++ archive_cmds_F77='$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_F77='${wl}-rpath ${wl}$libdir'
+ else
+ allow_undefined_flag_F77=' -expect_unresolved \*'
+- archive_cmds_F77='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec_F77='-rpath $libdir'
+@@ -15737,24 +15177,24 @@
+
+ solaris*)
+ no_undefined_flag_F77=' -z defs'
+- if test yes = "$GCC"; then
+- wlarc='$wl'
+- archive_cmds_F77='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ wlarc='${wl}'
++ archive_cmds_F77='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $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'
++ $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"*)
+ wlarc=''
+- archive_cmds_F77='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ ;;
+ *)
+- wlarc='$wl'
+- archive_cmds_F77='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
++ wlarc='${wl}'
++ archive_cmds_F77='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ ;;
+ esac
+ fi
+@@ -15764,11 +15204,11 @@
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+- # but understands '-z linker_flag'. GCC discards it without '$wl',
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- if test yes = "$GCC"; then
+- whole_archive_flag_spec_F77='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
++ if test "$GCC" = yes; then
++ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
+ fi
+@@ -15778,10 +15218,10 @@
+ ;;
+
+ sunos4*)
+- if test sequent = "$host_vendor"; then
++ if test "x$host_vendor" = xsequent; then
+ # Use $CC to link under sequent, because it throws in some extra .o
+ # files that make .init and .fini sections work.
+- archive_cmds_F77='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+@@ -15830,43 +15270,43 @@
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+- no_undefined_flag_F77='$wl-z,text'
++ no_undefined_flag_F77='${wl}-z,text'
+ archive_cmds_need_lc_F77=no
+ hardcode_shlibpath_var_F77=no
+ runpath_var='LD_RUN_PATH'
+
+- if test yes = "$GCC"; then
+- archive_cmds_F77='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_F77='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- archive_cmds_F77='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_F77='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+- # Note: We CANNOT use -z defs as we might desire, because we do not
++ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+- no_undefined_flag_F77='$wl-z,text'
+- allow_undefined_flag_F77='$wl-z,nodefs'
++ no_undefined_flag_F77='${wl}-z,text'
++ allow_undefined_flag_F77='${wl}-z,nodefs'
+ archive_cmds_need_lc_F77=no
+ hardcode_shlibpath_var_F77=no
+- hardcode_libdir_flag_spec_F77='$wl-R,$libdir'
++ hardcode_libdir_flag_spec_F77='${wl}-R,$libdir'
+ hardcode_libdir_separator_F77=':'
+ link_all_deplibs_F77=yes
+- export_dynamic_flag_spec_F77='$wl-Bexport'
++ export_dynamic_flag_spec_F77='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+- if test yes = "$GCC"; then
+- archive_cmds_F77='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_F77='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- archive_cmds_F77='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_F77='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+@@ -15881,10 +15321,10 @@
+ ;;
+ esac
+
+- if test sni = "$host_vendor"; then
++ if test x$host_vendor = xsni; then
+ case $host in
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+- export_dynamic_flag_spec_F77='$wl-Blargedynsym'
++ export_dynamic_flag_spec_F77='${wl}-Blargedynsym'
+ ;;
+ esac
+ fi
+@@ -15892,7 +15332,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_F77" >&5
+ $as_echo "$ld_shlibs_F77" >&6; }
+-test no = "$ld_shlibs_F77" && can_build_shared=no
++test "$ld_shlibs_F77" = no && can_build_shared=no
+
+ with_gnu_ld_F77=$with_gnu_ld
+
+@@ -15909,7 +15349,7 @@
+ # Assume -lc should be added
+ archive_cmds_need_lc_F77=yes
+
+- if test yes,yes = "$GCC,$enable_shared"; then
++ if test "$enable_shared" = yes && test "$GCC" = yes; then
+ case $archive_cmds_F77 in
+ *'~'*)
+ # FIXME: we may have to deal with multi-command sequences.
+@@ -16037,7 +15477,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext_cmds=.so
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -16054,16 +15494,14 @@
+ # flags to be left without arguments
+ need_version=unknown
+
+-
+-
+ case $host_os in
+ aix3*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+ # AIX 3 has no versioning support, so we append a major version to the name.
+- soname_spec='$libname$release$shared_ext$major'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+ aix[4-9]*)
+@@ -16071,91 +15509,41 @@
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 supports IA64
+- library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ else
+ # With GCC up to 2.95.x, collect2 would create an import file
+ # for dependence libraries. The import file would start with
+- # the line '#! .'. This would cause the generated library to
+- # depend on '.', always an invalid library. This was fixed in
++ # the line `#! .'. This would cause the generated library to
++ # depend on `.', always an invalid library. This was fixed in
+ # development snapshots of GCC prior to 3.0.
+ case $host_os in
+ aix4 | aix4.[01] | aix4.[01].*)
+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+ echo ' yes '
+- echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ :
+ else
+ can_build_shared=no
+ fi
+ ;;
+ esac
+- # Using Import Files as archive members, it is possible to support
+- # filename-based versioning of shared library archives on AIX. While
+- # this would work for both with and without runtime linking, it will
+- # prevent static linking of such archives. So we do filename-based
+- # shared library versioning with .so extension only, which is used
+- # when both runtime linking and shared linking is enabled.
+- # Unfortunately, runtime linking may impact performance, so we do
+- # not want this to be the default eventually. Also, we use the
+- # versioned .so libs for executables only if there is the -brtl
+- # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+- # To allow for filename-based versioning support, we need to create
+- # libNAME.so.V as an archive file, containing:
+- # *) an Import File, referring to the versioned filename of the
+- # archive as well as the shared archive member, telling the
+- # bitwidth (32 or 64) of that shared object, and providing the
+- # list of exported symbols of that shared object, eventually
+- # decorated with the 'weak' keyword
+- # *) the shared object with the F_LOADONLY flag set, to really avoid
+- # it being seen by the linker.
+- # At run time we better use the real file rather than another symlink,
+- # but for link time we create the symlink libNAME.so -> libNAME.so.V
+-
+- case $with_aix_soname,$aix_use_runtimelinking in
+- # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # soname into executable. Probably we can add versioning support to
+ # collect2, so additional links can be useful in future.
+- aix,yes) # traditional libtool
+- dynamic_linker='AIX unversionable lib.so'
++ if test "$aix_use_runtimelinking" = yes; then
+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+ # instead of lib<name>.a to let people know that these are not
+ # typical AIX shared libraries.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- ;;
+- aix,no) # traditional AIX only
+- dynamic_linker='AIX lib.a(lib.so.V)'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ else
+ # We preserve .a as extension for shared libraries through AIX4.2
+ # and later when we are not doing run time linking.
+- library_names_spec='$libname$release.a $libname.a'
+- soname_spec='$libname$release$shared_ext$major'
+- ;;
+- svr4,*) # full svr4 only
+- dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+- library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+- # We do not specify a path in Import Files, so LIBPATH fires.
+- shlibpath_overrides_runpath=yes
+- ;;
+- *,yes) # both, prefer svr4
+- dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+- library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+- # unpreferred sharedlib libNAME.a needs extra handling
+- postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+- postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+- # We do not specify a path in Import Files, so LIBPATH fires.
+- shlibpath_overrides_runpath=yes
+- ;;
+- *,no) # both, prefer aix
+- dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+- library_names_spec='$libname$release.a $libname.a'
+- soname_spec='$libname$release$shared_ext$major'
+- # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+- postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+- postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+- ;;
+- esac
++ library_names_spec='${libname}${release}.a $libname.a'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ fi
+ shlibpath_var=LIBPATH
+ fi
+ ;;
+@@ -16165,18 +15553,18 @@
+ powerpc)
+ # Since July 2007 AmigaOS4 officially supports .so libraries.
+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ ;;
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
+ ;;
+
+ beos*)
+- library_names_spec='$libname$shared_ext'
++ library_names_spec='${libname}${shared_ext}'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ ;;
+@@ -16184,8 +15572,8 @@
+ bsdi[45]*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+@@ -16197,7 +15585,7 @@
+
+ cygwin* | mingw* | pw32* | cegcc*)
+ version_type=windows
+- shrext_cmds=.dll
++ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+@@ -16206,8 +15594,8 @@
+ # gcc
+ library_names_spec='$libname.dll.a'
+ # 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'\''`~
++ 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~
+@@ -16223,16 +15611,16 @@
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+- soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+- soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
++ 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'
+@@ -16241,8 +15629,8 @@
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+- soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+- library_names_spec='$libname.dll.lib'
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ library_names_spec='${libname}.dll.lib'
+
+ case $build_os in
+ mingw*)
+@@ -16269,7 +15657,7 @@
+ 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
++ 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'`
+@@ -16282,8 +15670,8 @@
+ 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'\''`~
++ 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'
+@@ -16296,7 +15684,7 @@
+
+ *)
+ # Assume MSVC wrapper
+- library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ dynamic_linker='Win32 ld.exe'
+ ;;
+ esac
+@@ -16309,8 +15697,8 @@
+ version_type=darwin
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+- soname_spec='$libname$release$major$shared_ext'
++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++ soname_spec='${libname}${release}${major}$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+@@ -16322,8 +15710,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+@@ -16341,13 +15729,12 @@
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+ freebsd-*)
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
+ ;;
+ esac
+@@ -16372,15 +15759,26 @@
+ esac
+ ;;
+
++gnu*)
++ version_type=linux # correct to gnu/linux during the next big refactor
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ haiku*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LIBRARY_PATH
+- shlibpath_overrides_runpath=no
++ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+@@ -16398,15 +15796,14 @@
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
+- if test 32 = "$HPUX_IA64_MODE"; then
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ if test "X$HPUX_IA64_MODE" = X32; then
+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+- sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+ else
+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+- sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+ fi
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
+ shrext_cmds='.sl'
+@@ -16414,8 +15811,8 @@
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+@@ -16424,8 +15821,8 @@
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+@@ -16438,8 +15835,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+@@ -16450,7 +15847,7 @@
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+ *)
+- if test yes = "$lt_cv_prog_gnu_ld"; then
++ if test "$lt_cv_prog_gnu_ld" = yes; then
+ version_type=linux # correct to gnu/linux during the next big refactor
+ else
+ version_type=irix
+@@ -16458,8 +15855,8 @@
+ esac
+ need_lib_prefix=no
+ need_version=no
+- soname_spec='$libname$release$shared_ext$major'
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ case $host_os in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+@@ -16478,8 +15875,8 @@
+ esac
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+ shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+- sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ hardcode_into_libs=yes
+ ;;
+
+@@ -16488,33 +15885,13 @@
+ dynamic_linker=no
+ ;;
+
+-linux*android*)
+- version_type=none # Android doesn't support versioned libraries.
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='$libname$release$shared_ext'
+- soname_spec='$libname$release$shared_ext'
+- finish_cmds=
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+-
+- # This implies no fast_install, which is unacceptable.
+- # Some rework will be needed to allow for fast_install
+- # before this can be enabled.
+- hardcode_into_libs=yes
+-
+- dynamic_linker='Android linker'
+- # Don't embed -rpath directories since the linker doesn't support them.
+- hardcode_libdir_flag_spec_F77='-L$libdir'
+- ;;
+-
+ # This must be glibc/ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+@@ -16552,15 +15929,14 @@
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # Ideally, we could use ldconfig to report *all* directores which are
+- # searched for libraries, however this is still not possible. Aside from not
+- # being certain /sbin/ldconfig is available, command
+- # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+- # even though it is searched at run-time. Try to do the best guess by
+- # appending ld.so.conf contents (and includes) to the search path.
++ # Add ABI-specific directories to the system library path.
++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
++
++ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -16577,12 +15953,12 @@
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -16592,7 +15968,7 @@
+
+ newsos6)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
+@@ -16601,68 +15977,58 @@
+ version_type=qnx
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='ldqnx.so'
+ ;;
+
+-openbsd* | bitrig*)
++openbsd*)
+ version_type=sunos
+- sys_lib_dlsearch_path_spec=/usr/lib
++ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+- need_version=no
+- else
+- need_version=yes
+- fi
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ case $host_os in
++ openbsd2.[89] | openbsd2.[89].*)
++ shlibpath_overrides_runpath=no
++ ;;
++ *)
++ shlibpath_overrides_runpath=yes
++ ;;
++ esac
++ else
++ shlibpath_overrides_runpath=yes
++ fi
+ ;;
+
+ os2*)
+ libname_spec='$name'
+- version_type=windows
+- shrext_cmds=.dll
+- need_version=no
++ shrext_cmds=".dll"
+ need_lib_prefix=no
+- # OS/2 can only load a DLL with a base name of 8 characters or less.
+- soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+- v=$($ECHO $release$versuffix | tr -d .-);
+- n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+- $ECHO $n$v`$shared_ext'
+- library_names_spec='${libname}_dll.$libext'
++ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+- shlibpath_var=BEGINLIBPATH
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+- 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~
+- chmod a+x \$dldir/$dlname~
+- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+- fi'
+- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+- dlpath=$dir/\$dldll~
+- $RM \$dlpath'
++ shlibpath_var=LIBPATH
+ ;;
+
+ osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+- soname_spec='$libname$release$shared_ext$major'
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+ rdos*)
+@@ -16673,8 +16039,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+@@ -16684,11 +16050,11 @@
+
+ sunos4*)
+ version_type=sunos
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+@@ -16696,8 +16062,8 @@
+
+ sysv4 | sysv4.3*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_vendor in
+ sni)
+@@ -16718,24 +16084,24 @@
+ ;;
+
+ sysv4*MP*)
+- if test -d /usr/nec; then
++ if test -d /usr/nec ;then
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+- soname_spec='$libname$shared_ext.$major'
++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+- version_type=sco
++ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+@@ -16753,7 +16119,7 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+@@ -16761,8 +16127,8 @@
+
+ uts4*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+@@ -16772,32 +16138,20 @@
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+ $as_echo "$dynamic_linker" >&6; }
+-test no = "$dynamic_linker" && can_build_shared=no
++test "$dynamic_linker" = no && can_build_shared=no
+
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+
+-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+- sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ fi
+-
+-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+- sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+ fi
+
+-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+-
+-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+-
+-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+-
+-
+-
+
+
+
+@@ -16840,15 +16194,15 @@
+ hardcode_action_F77=
+ if test -n "$hardcode_libdir_flag_spec_F77" ||
+ test -n "$runpath_var_F77" ||
+- test yes = "$hardcode_automatic_F77"; then
++ test "X$hardcode_automatic_F77" = "Xyes" ; then
+
+ # We can hardcode non-existent directories.
+- if test no != "$hardcode_direct_F77" &&
++ if test "$hardcode_direct_F77" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+- ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, F77)" &&
+- test no != "$hardcode_minus_L_F77"; then
++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
++ test "$hardcode_minus_L_F77" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action_F77=relink
+ else
+@@ -16863,12 +16217,12 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_F77" >&5
+ $as_echo "$hardcode_action_F77" >&6; }
+
+-if test relink = "$hardcode_action_F77" ||
+- test yes = "$inherit_rpath_F77"; then
++if test "$hardcode_action_F77" = relink ||
++ test "$inherit_rpath_F77" = yes; then
+ # Fast installation is not supported
+ enable_fast_install=no
+-elif test yes = "$shlibpath_overrides_runpath" ||
+- test no = "$enable_shared"; then
++elif test "$shlibpath_overrides_runpath" = yes ||
++ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+ fi
+@@ -16882,9 +16236,9 @@
+ fi # test -n "$compiler"
+
+ GCC=$lt_save_GCC
+- CC=$lt_save_CC
+- CFLAGS=$lt_save_CFLAGS
+-fi # test yes != "$_lt_disable_F77"
++ CC="$lt_save_CC"
++ CFLAGS="$lt_save_CFLAGS"
++fi # test "$_lt_disable_F77" != yes
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -17111,9 +16465,9 @@
+
+ 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\$%%"`;;
++ 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
+
+@@ -17124,7 +16478,7 @@
+ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+
+
+-if test -z "$FC" || test no = "$FC"; then
++if test -z "$FC" || test "X$FC" = "Xno"; then
+ _lt_disable_FC=yes
+ fi
+
+@@ -17161,7 +16515,7 @@
+ # the FC compiler isn't working. Some variables (like enable_shared)
+ # are currently assumed to apply to all compilers on this platform,
+ # and will be corrupted by setting them based on a non-working compiler.
+-if test yes != "$_lt_disable_FC"; then
++if test "$_lt_disable_FC" != yes; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="\
+ subroutine t
+@@ -17207,7 +16561,7 @@
+
+
+ # Allow CC to be a program name with arguments.
+- lt_save_CC=$CC
++ lt_save_CC="$CC"
+ lt_save_GCC=$GCC
+ lt_save_CFLAGS=$CFLAGS
+ CC=${FC-"f95"}
+@@ -17216,8 +16570,15 @@
+ GCC=$ac_cv_fc_compiler_gnu
+
+ compiler_FC=$CC
+- func_cc_basename $compiler
+-cc_basename=$func_cc_basename_result
++ for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+ if test -n "$compiler"; then
+@@ -17228,25 +16589,21 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+ $as_echo_n "checking whether to build shared libraries... " >&6; }
+- test no = "$can_build_shared" && enable_shared=no
++ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+- test yes = "$enable_shared" && enable_static=no
++ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+ aix[4-9]*)
+- if test ia64 != "$host_cpu"; then
+- case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+- yes,aix,yes) ;; # shared object as lib.so file only
+- yes,svr4,*) ;; # shared object as lib.so archive member only
+- yes,*) enable_static=no ;; # shared object in lib.a archive as well
+- esac
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+ esac
+@@ -17256,12 +16613,12 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+ $as_echo_n "checking whether to build static libraries... " >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+- test yes = "$enable_shared" || enable_static=yes
++ test "$enable_shared" = yes || enable_static=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+ $as_echo "$enable_static" >&6; }
+
+- GCC_FC=$ac_cv_fc_compiler_gnu
+- LD_FC=$LD
++ GCC_FC="$ac_cv_fc_compiler_gnu"
++ LD_FC="$LD"
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -17304,13 +16661,13 @@
+ pre_test_object_deps_done=no
+
+ for p in `eval "$output_verbose_link_cmd"`; do
+- case $prev$p in
++ case ${prev}${p} in
+
+ -L* | -R* | -l*)
+ # Some compilers place space between "-{L,R}" and the path.
+ # Remove the space.
+- if test x-L = "$p" ||
+- test x-R = "$p"; then
++ if test $p = "-L" ||
++ test $p = "-R"; then
+ prev=$p
+ continue
+ fi
+@@ -17326,16 +16683,16 @@
+ case $p in
+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+ esac
+- if test no = "$pre_test_object_deps_done"; then
+- case $prev in
++ if test "$pre_test_object_deps_done" = no; then
++ 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.
+ if test -z "$compiler_lib_search_path_FC"; then
+- compiler_lib_search_path_FC=$prev$p
++ compiler_lib_search_path_FC="${prev}${p}"
+ else
+- compiler_lib_search_path_FC="${compiler_lib_search_path_FC} $prev$p"
++ compiler_lib_search_path_FC="${compiler_lib_search_path_FC} ${prev}${p}"
+ fi
+ ;;
+ # The "-l" case would never come before the object being
+@@ -17343,9 +16700,9 @@
+ esac
+ else
+ if test -z "$postdeps_FC"; then
+- postdeps_FC=$prev$p
++ postdeps_FC="${prev}${p}"
+ else
+- postdeps_FC="${postdeps_FC} $prev$p"
++ postdeps_FC="${postdeps_FC} ${prev}${p}"
+ fi
+ fi
+ prev=
+@@ -17360,15 +16717,15 @@
+ continue
+ fi
+
+- if test no = "$pre_test_object_deps_done"; then
++ if test "$pre_test_object_deps_done" = no; then
+ if test -z "$predep_objects_FC"; then
+- predep_objects_FC=$p
++ predep_objects_FC="$p"
+ else
+ predep_objects_FC="$predep_objects_FC $p"
+ fi
+ else
+ if test -z "$postdep_objects_FC"; then
+- postdep_objects_FC=$p
++ postdep_objects_FC="$p"
+ else
+ postdep_objects_FC="$postdep_objects_FC $p"
+ fi
+@@ -17397,7 +16754,7 @@
+ esac
+ compiler_lib_search_dirs_FC=
+ if test -n "${compiler_lib_search_path_FC}"; then
+- compiler_lib_search_dirs_FC=`echo " ${compiler_lib_search_path_FC}" | $SED -e 's! -L! !g' -e 's!^ !!'`
++ compiler_lib_search_dirs_FC=`echo " ${compiler_lib_search_path_FC}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ fi
+
+
+@@ -17435,18 +16792,17 @@
+ lt_prog_compiler_static_FC=
+
+
+- if test yes = "$GCC"; then
++ if test "$GCC" = yes; then
+ lt_prog_compiler_wl_FC='-Wl,'
+ lt_prog_compiler_static_FC='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ lt_prog_compiler_static_FC='-Bstatic'
+ fi
+- lt_prog_compiler_pic_FC='-fPIC'
+ ;;
+
+ amigaos*)
+@@ -17457,8 +16813,8 @@
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+- # adding the '-m68020' flag to GCC prevents building anything better,
+- # like '-m68040'.
++ # adding the `-m68020' flag to GCC prevents building anything better,
++ # like `-m68040'.
+ lt_prog_compiler_pic_FC='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
+@@ -17474,11 +16830,6 @@
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic_FC='-DDLL_EXPORT'
+- case $host_os in
+- os2*)
+- lt_prog_compiler_static_FC='$wl-static'
+- ;;
+- esac
+ ;;
+
+ darwin* | rhapsody*)
+@@ -17549,7 +16900,7 @@
+ case $host_os in
+ aix*)
+ lt_prog_compiler_wl_FC='-Wl,'
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ lt_prog_compiler_static_FC='-Bstatic'
+ else
+@@ -17557,29 +16908,10 @@
+ fi
+ ;;
+
+- darwin* | rhapsody*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- lt_prog_compiler_pic_FC='-fno-common'
+- case $cc_basename in
+- nagfor*)
+- # NAG Fortran compiler
+- lt_prog_compiler_wl_FC='-Wl,-Wl,,'
+- lt_prog_compiler_pic_FC='-PIC'
+- lt_prog_compiler_static_FC='-Bstatic'
+- ;;
+- esac
+- ;;
+-
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ lt_prog_compiler_pic_FC='-DDLL_EXPORT'
+- case $host_os in
+- os2*)
+- lt_prog_compiler_static_FC='$wl-static'
+- ;;
+- esac
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -17595,7 +16927,7 @@
+ ;;
+ esac
+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
+- lt_prog_compiler_static_FC='$wl-a ${wl}archive'
++ lt_prog_compiler_static_FC='${wl}-a ${wl}archive'
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+@@ -17604,9 +16936,9 @@
+ lt_prog_compiler_static_FC='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+- # old Intel for x86_64, which still supported -KPIC.
++ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+ lt_prog_compiler_wl_FC='-Wl,'
+ lt_prog_compiler_pic_FC='-KPIC'
+@@ -17631,12 +16963,6 @@
+ lt_prog_compiler_pic_FC='-PIC'
+ lt_prog_compiler_static_FC='-Bstatic'
+ ;;
+- tcc*)
+- # Fabrice Bellard et al's Tiny C Compiler
+- lt_prog_compiler_wl_FC='-Wl,'
+- lt_prog_compiler_pic_FC='-fPIC'
+- lt_prog_compiler_static_FC='-static'
+- ;;
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+@@ -17734,7 +17060,7 @@
+ ;;
+
+ sysv4*MP*)
+- if test -d /usr/nec; then
++ if test -d /usr/nec ;then
+ lt_prog_compiler_pic_FC='-Kconform_pic'
+ lt_prog_compiler_static_FC='-Bstatic'
+ fi
+@@ -17763,7 +17089,7 @@
+ fi
+
+ case $host_os in
+- # For platforms that do not support PIC, -DPIC is meaningless:
++ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic_FC=
+ ;;
+@@ -17795,7 +17121,7 @@
+ lt_cv_prog_compiler_pic_works_FC=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+- lt_compiler_flag="$lt_prog_compiler_pic_FC" ## exclude from sc_useless_quotes_in_assignment
++ lt_compiler_flag="$lt_prog_compiler_pic_FC"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+@@ -17825,7 +17151,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_FC" >&5
+ $as_echo "$lt_cv_prog_compiler_pic_works_FC" >&6; }
+
+-if test yes = "$lt_cv_prog_compiler_pic_works_FC"; then
++if test x"$lt_cv_prog_compiler_pic_works_FC" = xyes; then
+ case $lt_prog_compiler_pic_FC in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_FC=" $lt_prog_compiler_pic_FC" ;;
+@@ -17851,7 +17177,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_static_works_FC=no
+- save_LDFLAGS=$LDFLAGS
++ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+@@ -17870,13 +17196,13 @@
+ fi
+ fi
+ $RM -r conftest*
+- LDFLAGS=$save_LDFLAGS
++ LDFLAGS="$save_LDFLAGS"
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_FC" >&5
+ $as_echo "$lt_cv_prog_compiler_static_works_FC" >&6; }
+
+-if test yes = "$lt_cv_prog_compiler_static_works_FC"; then
++if test x"$lt_cv_prog_compiler_static_works_FC" = xyes; then
+ :
+ else
+ lt_prog_compiler_static_FC=
+@@ -17990,8 +17316,8 @@
+
+
+
+-hard_links=nottested
+-if test no = "$lt_cv_prog_compiler_c_o_FC" && test no != "$need_locks"; then
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_FC" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+ $as_echo_n "checking if we can lock with hard links... " >&6; }
+@@ -18003,9 +17329,9 @@
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+ $as_echo "$hard_links" >&6; }
+- if test no = "$hard_links"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+-$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
++ if test "$hard_links" = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ need_locks=warn
+ fi
+ else
+@@ -18045,9 +17371,9 @@
+ # included in the symbol list
+ include_expsyms_FC=
+ # exclude_expsyms can be an extended regexp of symbols to exclude
+- # it will be wrapped by ' (' and ')$', so one must not match beginning or
+- # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+- # as well as any symbol that contains 'd'.
++ # it will be wrapped by ` (' and `)$', so one must not match beginning or
++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++ # as well as any symbol that contains `d'.
+ exclude_expsyms_FC='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+@@ -18062,7 +17388,7 @@
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+- if test yes != "$GCC"; then
++ if test "$GCC" != yes; then
+ with_gnu_ld=no
+ fi
+ ;;
+@@ -18070,7 +17396,7 @@
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
+- openbsd* | bitrig*)
++ openbsd*)
+ with_gnu_ld=no
+ ;;
+ esac
+@@ -18080,7 +17406,7 @@
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+@@ -18102,24 +17428,24 @@
+ esac
+ fi
+
+- if test yes = "$lt_use_gnu_ld_interface"; then
++ if test "$lt_use_gnu_ld_interface" = yes; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+- wlarc='$wl'
++ wlarc='${wl}'
+
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+- hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
+- export_dynamic_flag_spec_FC='$wl--export-dynamic'
++ hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
++ export_dynamic_flag_spec_FC='${wl}--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+- whole_archive_flag_spec_FC=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
++ whole_archive_flag_spec_FC="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ whole_archive_flag_spec_FC=
+ fi
+ supports_anon_versioning=no
+- case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
++ case `$LD -v 2>&1` in
+ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+@@ -18132,7 +17458,7 @@
+ case $host_os in
+ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+- if test ia64 != "$host_cpu"; then
++ if test "$host_cpu" != ia64; then
+ ld_shlibs_FC=no
+ cat <<_LT_EOF 1>&2
+
+@@ -18151,7 +17477,7 @@
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+- archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_FC=''
+ ;;
+ m68k)
+@@ -18167,7 +17493,7 @@
+ allow_undefined_flag_FC=unsupported
+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+- archive_cmds_FC='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds_FC='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ ld_shlibs_FC=no
+ fi
+@@ -18177,7 +17503,7 @@
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, FC) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec_FC='-L$libdir'
+- export_dynamic_flag_spec_FC='$wl--export-all-symbols'
++ export_dynamic_flag_spec_FC='${wl}--export-all-symbols'
+ allow_undefined_flag_FC=unsupported
+ always_export_symbols_FC=no
+ enable_shared_with_static_runtimes_FC=yes
+@@ -18185,89 +17511,61 @@
+ exclude_expsyms_FC='[_]+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_FC='$CC -shared $libobjs $deplibs $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, use it as
+- # is; otherwise, prepend EXPORTS...
+- archive_expsym_cmds_FC='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; 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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ # If the export-symbols file already is a .def file (1st line
++ # is EXPORTS), use it as is; otherwise, prepend...
++ archive_expsym_cmds_FC='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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ ld_shlibs_FC=no
+ fi
+ ;;
+
+ haiku*)
+- archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ link_all_deplibs_FC=yes
+ ;;
+
+- os2*)
+- hardcode_libdir_flag_spec_FC='-L$libdir'
+- hardcode_minus_L_FC=yes
+- allow_undefined_flag_FC=unsupported
+- shrext_cmds=.dll
+- archive_cmds_FC='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- archive_expsym_cmds_FC='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- prefix_cmds="$SED"~
+- if test EXPORTS = "`$SED 1q $export_symbols`"; then
+- prefix_cmds="$prefix_cmds -e 1d";
+- fi~
+- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- old_archive_From_new_cmds_FC='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+- enable_shared_with_static_runtimes_FC=yes
+- ;;
+-
+ interix[3-9]*)
+ hardcode_direct_FC=no
+ hardcode_shlibpath_var_FC=no
+- hardcode_libdir_flag_spec_FC='$wl-rpath,$libdir'
+- export_dynamic_flag_spec_FC='$wl-E'
++ hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_FC='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+- archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+- archive_expsym_cmds_FC='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ archive_expsym_cmds_FC='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+- if test linux-dietlibc = "$host_os"; then
++ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
+ esac
+ fi
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+- && test no = "$tmp_diet"
++ && test "$tmp_diet" = no
+ then
+ tmp_addflag=' $pic_flag'
+ tmp_sharedflag='-shared'
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+- whole_archive_flag_spec_FC='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+ pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group f77 and f90 compilers
+- whole_archive_flag_spec_FC='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+@@ -18278,47 +17576,42 @@
+ lf95*) # Lahey Fortran 8.1
+ whole_archive_flag_spec_FC=
+ tmp_sharedflag='--shared' ;;
+- nagfor*) # NAGFOR 5.3
+- tmp_sharedflag='-Wl,-shared' ;;
+ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
+ nvcc*) # Cuda Compiler Driver 2.2
+- whole_archive_flag_spec_FC='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object_FC=yes
+ ;;
+ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+- whole_archive_flag_spec_FC='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ whole_archive_flag_spec_FC='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object_FC=yes
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ esac
+- archive_cmds_FC='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds_FC='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+- if test yes = "$supports_anon_versioning"; then
++ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds_FC='echo "{ global:" > $output_objdir/$libname.ver~
+- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+- echo "local: *; };" >> $output_objdir/$libname.ver~
+- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+
+ case $cc_basename in
+- tcc*)
+- export_dynamic_flag_spec_FC='-rdynamic'
+- ;;
+ xlf* | bgf* | bgxlf* | mpixlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ whole_archive_flag_spec_FC='--whole-archive$convenience --no-whole-archive'
+- hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
++ hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
+ archive_cmds_FC='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+- if test yes = "$supports_anon_versioning"; then
++ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds_FC='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 $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ echo "local: *; };" >> $output_objdir/$libname.ver~
++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
+@@ -18332,8 +17625,8 @@
+ archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+ else
+- archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ fi
+ ;;
+
+@@ -18351,8 +17644,8 @@
+
+ _LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs_FC=no
+ fi
+@@ -18364,7 +17657,7 @@
+ ld_shlibs_FC=no
+ cat <<_LT_EOF 1>&2
+
+-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+ *** reliably create shared libraries on SCO systems. Therefore, libtool
+ *** is disabling shared libraries support. We urge you to upgrade GNU
+ *** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+@@ -18379,9 +17672,9 @@
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
+- archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
++ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs_FC=no
+ fi
+@@ -18398,15 +17691,15 @@
+
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs_FC=no
+ fi
+ ;;
+ esac
+
+- if test no = "$ld_shlibs_FC"; then
++ if test "$ld_shlibs_FC" = no; then
+ runpath_var=
+ hardcode_libdir_flag_spec_FC=
+ export_dynamic_flag_spec_FC=
+@@ -18422,7 +17715,7 @@
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L_FC=yes
+- if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct_FC=unsupported
+@@ -18430,57 +17723,34 @@
+ ;;
+
+ aix[4-9]*)
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+- no_entry_flag=
++ no_entry_flag=""
+ else
+ # If we're using GNU nm, then we don't want the "-C" option.
+- # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+- # Without the "-l" option, or with the "-B" option, AIX nm treats
+- # weak defined symbols like other global defined symbols, whereas
+- # GNU nm marks them as "W".
+- # While the 'weak' keyword is ignored in the Export File, we need
+- # it in the Import File for the 'aix-soname' feature, so we have
+- # to replace the "-B" option with "-P" for AIX nm.
++ # -C means demangle to AIX nm, but means don't demangle with GNU nm
++ # Also, AIX nm treats weak defined symbols like other global
++ # defined symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- export_symbols_cmds_FC='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
++ export_symbols_cmds_FC='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+- export_symbols_cmds_FC='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
++ export_symbols_cmds_FC='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+- # have runtime linking enabled, and use it for executables.
+- # For shared libraries, we enable/disable runtime linking
+- # depending on the kind of the shared library created -
+- # when "with_aix_soname,aix_use_runtimelinking" is:
+- # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+- # "aix,yes" lib.so shared, rtl:yes, for executables
+- # lib.a static archive
+- # "both,no" lib.so.V(shr.o) shared, rtl:yes
+- # lib.a(lib.so.V) shared, rtl:no, for executables
+- # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+- # lib.a(lib.so.V) shared, rtl:no
+- # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+- # lib.a static archive
++ # need to do runtime linking.
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+- if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
+ done
+- if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+- # With aix-soname=svr4, we create the lib.so.V shared archives only,
+- # so we don't have lib.a shared libs to link our executables.
+- # We have to force runtime linking in this case.
+- aix_use_runtimelinking=yes
+- LDFLAGS="$LDFLAGS -Wl,-brtl"
+- fi
+ ;;
+ esac
+
+@@ -18499,21 +17769,13 @@
+ hardcode_direct_absolute_FC=yes
+ hardcode_libdir_separator_FC=':'
+ link_all_deplibs_FC=yes
+- file_list_spec_FC='$wl-f,'
+- case $with_aix_soname,$aix_use_runtimelinking in
+- aix,*) ;; # traditional, no import file
+- svr4,* | *,yes) # use import file
+- # The Import File defines what to hardcode.
+- hardcode_direct_FC=no
+- hardcode_direct_absolute_FC=no
+- ;;
+- esac
++ file_list_spec_FC='${wl}-f,'
+
+- if test yes = "$GCC"; then
++ if test "$GCC" = yes; then
+ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+- collect2name=`$CC -print-prog-name=collect2`
++ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+ then
+@@ -18532,42 +17794,35 @@
+ ;;
+ esac
+ shared_flag='-shared'
+- if test yes = "$aix_use_runtimelinking"; then
+- shared_flag="$shared_flag "'$wl-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
+ fi
+- # Need to ensure runtime linking is disabled for the traditional
+- # shared library, or the linker may eventually find shared libraries
+- # /with/ Import File - we do not want to mix them.
+- shared_flag_aix='-shared'
+- shared_flag_svr4='-shared $wl-G'
+ else
+ # not using gcc
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+- if test yes = "$aix_use_runtimelinking"; then
+- shared_flag='$wl-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag='${wl}-G'
+ else
+- shared_flag='$wl-bM:SRE'
++ shared_flag='${wl}-bM:SRE'
+ fi
+- shared_flag_aix='$wl-bM:SRE'
+- shared_flag_svr4='$wl-G'
+ fi
+ fi
+
+- export_dynamic_flag_spec_FC='$wl-bexpall'
++ export_dynamic_flag_spec_FC='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ always_export_symbols_FC=yes
+- if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
++ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ allow_undefined_flag_FC='-berok'
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- if test set = "${lt_cv_aix_libpath+set}"; then
++ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+ else
+ if ${lt_cv_aix_libpath__FC+:} false; then :
+@@ -18596,7 +17851,7 @@
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$lt_cv_aix_libpath__FC"; then
+- lt_cv_aix_libpath__FC=/usr/lib:/lib
++ lt_cv_aix_libpath__FC="/usr/lib:/lib"
+ fi
+
+ fi
+@@ -18604,17 +17859,17 @@
+ aix_libpath=$lt_cv_aix_libpath__FC
+ fi
+
+- hardcode_libdir_flag_spec_FC='$wl-blibpath:$libdir:'"$aix_libpath"
+- archive_expsym_cmds_FC='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
++ hardcode_libdir_flag_spec_FC='${wl}-blibpath:$libdir:'"$aix_libpath"
++ archive_expsym_cmds_FC='$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
+- if test ia64 = "$host_cpu"; then
+- hardcode_libdir_flag_spec_FC='$wl-R $libdir:/usr/lib:/lib'
++ if test "$host_cpu" = ia64; then
++ hardcode_libdir_flag_spec_FC='${wl}-R $libdir:/usr/lib:/lib'
+ allow_undefined_flag_FC="-z nodefs"
+- archive_expsym_cmds_FC="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
++ archive_expsym_cmds_FC="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- if test set = "${lt_cv_aix_libpath+set}"; then
++ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+ else
+ if ${lt_cv_aix_libpath__FC+:} false; then :
+@@ -18643,7 +17898,7 @@
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$lt_cv_aix_libpath__FC"; then
+- lt_cv_aix_libpath__FC=/usr/lib:/lib
++ lt_cv_aix_libpath__FC="/usr/lib:/lib"
+ fi
+
+ fi
+@@ -18651,33 +17906,21 @@
+ aix_libpath=$lt_cv_aix_libpath__FC
+ fi
+
+- hardcode_libdir_flag_spec_FC='$wl-blibpath:$libdir:'"$aix_libpath"
++ hardcode_libdir_flag_spec_FC='${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.
+- no_undefined_flag_FC=' $wl-bernotok'
+- allow_undefined_flag_FC=' $wl-berok'
+- if test yes = "$with_gnu_ld"; then
++ no_undefined_flag_FC=' ${wl}-bernotok'
++ allow_undefined_flag_FC=' ${wl}-berok'
++ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+- whole_archive_flag_spec_FC='$wl--whole-archive$convenience $wl--no-whole-archive'
++ whole_archive_flag_spec_FC='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ whole_archive_flag_spec_FC='$convenience'
+ fi
+ archive_cmds_need_lc_FC=yes
+- archive_expsym_cmds_FC='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+- # -brtl affects multiple linker settings, -berok does not and is overridden later
+- compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+- if test svr4 != "$with_aix_soname"; then
+- # This is similar to how AIX traditionally builds its shared libraries.
+- archive_expsym_cmds_FC="$archive_expsym_cmds_FC"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+- fi
+- if test aix != "$with_aix_soname"; then
+- archive_expsym_cmds_FC="$archive_expsym_cmds_FC"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+- else
+- # used by -dlpreopen to get the symbols
+- archive_expsym_cmds_FC="$archive_expsym_cmds_FC"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+- fi
+- archive_expsym_cmds_FC="$archive_expsym_cmds_FC"'~$RM -r $output_objdir/$realname.d'
++ # This is similar to how AIX traditionally builds its shared libraries.
++ archive_expsym_cmds_FC="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+@@ -18686,7 +17929,7 @@
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+- archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_FC=''
+ ;;
+ m68k)
+@@ -18716,17 +17959,16 @@
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=.dll
++ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+- archive_cmds_FC='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+- archive_expsym_cmds_FC='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+- cp "$export_symbols" "$output_objdir/$soname.def";
+- echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+- else
+- $SED -e '\''s/^/-link -EXPORT:/'\'' < $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='
++ archive_cmds_FC='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
++ archive_expsym_cmds_FC='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, FC)='true'
+ enable_shared_with_static_runtimes_FC=yes
+@@ -18735,18 +17977,18 @@
+ # Don't use ranlib
+ old_postinstall_cmds_FC='chmod 644 $oldlib'
+ postlink_cmds_FC='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'
++ 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
+@@ -18755,7 +17997,7 @@
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=.dll
++ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ archive_cmds_FC='$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.
+@@ -18774,24 +18016,24 @@
+ hardcode_direct_FC=no
+ hardcode_automatic_FC=yes
+ hardcode_shlibpath_var_FC=unsupported
+- if test yes = "$lt_cv_ld_force_load"; then
+- whole_archive_flag_spec_FC='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++ if test "$lt_cv_ld_force_load" = "yes"; then
++ whole_archive_flag_spec_FC='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ compiler_needs_object_FC=yes
+ else
+ whole_archive_flag_spec_FC=''
+ fi
+ link_all_deplibs_FC=yes
+- allow_undefined_flag_FC=$_lt_dar_allow_undefined
++ allow_undefined_flag_FC="$_lt_dar_allow_undefined"
+ case $cc_basename in
+- ifort*|nagfor*) _lt_dar_can_shared=yes ;;
++ ifort*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+- if test yes = "$_lt_dar_can_shared"; then
++ if test "$_lt_dar_can_shared" = "yes"; then
+ output_verbose_link_cmd=func_echo_all
+- archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+- module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+- archive_expsym_cmds_FC="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+- module_expsym_cmds_FC="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
++ archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_FC="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_FC="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+ else
+ ld_shlibs_FC=no
+@@ -18833,33 +18075,33 @@
+ ;;
+
+ hpux9*)
+- if test yes = "$GCC"; then
+- archive_cmds_FC='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
++ if test "$GCC" = yes; then
++ archive_cmds_FC='$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_FC='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
++ archive_cmds_FC='$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
+- hardcode_libdir_flag_spec_FC='$wl+b $wl$libdir'
++ hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_FC=:
+ hardcode_direct_FC=yes
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L_FC=yes
+- export_dynamic_flag_spec_FC='$wl-E'
++ export_dynamic_flag_spec_FC='${wl}-E'
+ ;;
+
+ hpux10*)
+- if test yes,no = "$GCC,$with_gnu_ld"; then
+- archive_cmds_FC='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++ archive_cmds_FC='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds_FC='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+- if test no = "$with_gnu_ld"; then
+- hardcode_libdir_flag_spec_FC='$wl+b $wl$libdir'
++ if test "$with_gnu_ld" = no; then
++ hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_FC=:
+ hardcode_direct_FC=yes
+ hardcode_direct_absolute_FC=yes
+- export_dynamic_flag_spec_FC='$wl-E'
++ export_dynamic_flag_spec_FC='${wl}-E'
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L_FC=yes
+@@ -18867,33 +18109,33 @@
+ ;;
+
+ hpux11*)
+- if test yes,no = "$GCC,$with_gnu_ld"; then
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
+- archive_cmds_FC='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_FC='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+- archive_cmds_FC='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_FC='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- archive_cmds_FC='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_FC='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ else
+ case $host_cpu in
+ hppa*64*)
+- archive_cmds_FC='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+- archive_cmds_FC='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- archive_cmds_FC='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ fi
+- if test no = "$with_gnu_ld"; then
+- hardcode_libdir_flag_spec_FC='$wl+b $wl$libdir'
++ if test "$with_gnu_ld" = no; then
++ hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_FC=:
+
+ case $host_cpu in
+@@ -18904,7 +18146,7 @@
+ *)
+ hardcode_direct_FC=yes
+ hardcode_direct_absolute_FC=yes
+- export_dynamic_flag_spec_FC='$wl-E'
++ export_dynamic_flag_spec_FC='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+@@ -18915,8 +18157,8 @@
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+- if test yes = "$GCC"; then
+- archive_cmds_FC='$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'
++ if test "$GCC" = yes; then
++ archive_cmds_FC='$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.
+@@ -18926,8 +18168,8 @@
+ 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"
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ cat > conftest.$ac_ext <<_ACEOF
+
+ subroutine foo
+@@ -18940,34 +18182,24 @@
+ 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 yes = "$lt_cv_irix_exported_symbol"; then
+- archive_expsym_cmds_FC='$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'
++ if test "$lt_cv_irix_exported_symbol" = yes; then
++ archive_expsym_cmds_FC='$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_FC='$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_FC='$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'
++ archive_cmds_FC='$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_FC='$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'
+ fi
+ archive_cmds_need_lc_FC='no'
+- hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
++ hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_FC=:
+ inherit_rpath_FC=yes
+ link_all_deplibs_FC=yes
+ ;;
+
+- linux*)
+- case $cc_basename in
+- tcc*)
+- # Fabrice Bellard et al's Tiny C Compiler
+- ld_shlibs_FC=yes
+- archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- ;;
+- esac
+- ;;
+-
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+@@ -18982,7 +18214,7 @@
+ newsos6)
+ archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_FC=yes
+- hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
++ hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_FC=:
+ hardcode_shlibpath_var_FC=no
+ ;;
+@@ -18990,19 +18222,27 @@
+ *nto* | *qnx*)
+ ;;
+
+- openbsd* | bitrig*)
++ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ hardcode_direct_FC=yes
+ hardcode_shlibpath_var_FC=no
+ hardcode_direct_absolute_FC=yes
+- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+- hardcode_libdir_flag_spec_FC='$wl-rpath,$libdir'
+- export_dynamic_flag_spec_FC='$wl-E'
++ archive_expsym_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_FC='${wl}-E'
+ else
+- archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec_FC='$wl-rpath,$libdir'
++ case $host_os in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec_FC='-R$libdir'
++ ;;
++ *)
++ archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
++ ;;
++ esac
+ fi
+ else
+ ld_shlibs_FC=no
+@@ -19013,53 +18253,33 @@
+ hardcode_libdir_flag_spec_FC='-L$libdir'
+ hardcode_minus_L_FC=yes
+ allow_undefined_flag_FC=unsupported
+- shrext_cmds=.dll
+- archive_cmds_FC='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- archive_expsym_cmds_FC='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- prefix_cmds="$SED"~
+- if test EXPORTS = "`$SED 1q $export_symbols`"; then
+- prefix_cmds="$prefix_cmds -e 1d";
+- fi~
+- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- old_archive_From_new_cmds_FC='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+- enable_shared_with_static_runtimes_FC=yes
++ archive_cmds_FC='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++ old_archive_from_new_cmds_FC='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+- if test yes = "$GCC"; then
+- allow_undefined_flag_FC=' $wl-expect_unresolved $wl\*'
+- archive_cmds_FC='$CC -shared$allow_undefined_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'
++ if test "$GCC" = yes; then
++ allow_undefined_flag_FC=' ${wl}-expect_unresolved ${wl}\*'
++ archive_cmds_FC='$CC -shared${allow_undefined_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'
+ else
+ allow_undefined_flag_FC=' -expect_unresolved \*'
+- archive_cmds_FC='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++ archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ fi
+ archive_cmds_need_lc_FC='no'
+- hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir'
++ hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_FC=:
+ ;;
+
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+- if test yes = "$GCC"; then
+- allow_undefined_flag_FC=' $wl-expect_unresolved $wl\*'
+- archive_cmds_FC='$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_FC='$wl-rpath $wl$libdir'
++ if test "$GCC" = yes; then
++ allow_undefined_flag_FC=' ${wl}-expect_unresolved ${wl}\*'
++ archive_cmds_FC='$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_FC='${wl}-rpath ${wl}$libdir'
+ else
+ allow_undefined_flag_FC=' -expect_unresolved \*'
+- archive_cmds_FC='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++ archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds_FC='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec_FC='-rpath $libdir'
+@@ -19070,24 +18290,24 @@
+
+ solaris*)
+ no_undefined_flag_FC=' -z defs'
+- if test yes = "$GCC"; then
+- wlarc='$wl'
+- archive_cmds_FC='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ wlarc='${wl}'
++ archive_cmds_FC='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $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'
++ $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"*)
+ wlarc=''
+- archive_cmds_FC='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ archive_cmds_FC='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ ;;
+ *)
+- wlarc='$wl'
+- archive_cmds_FC='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
++ wlarc='${wl}'
++ archive_cmds_FC='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ ;;
+ esac
+ fi
+@@ -19097,11 +18317,11 @@
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+- # but understands '-z linker_flag'. GCC discards it without '$wl',
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- if test yes = "$GCC"; then
+- whole_archive_flag_spec_FC='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
++ if test "$GCC" = yes; then
++ whole_archive_flag_spec_FC='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ whole_archive_flag_spec_FC='-z allextract$convenience -z defaultextract'
+ fi
+@@ -19111,10 +18331,10 @@
+ ;;
+
+ sunos4*)
+- if test sequent = "$host_vendor"; then
++ if test "x$host_vendor" = xsequent; then
+ # Use $CC to link under sequent, because it throws in some extra .o
+ # files that make .init and .fini sections work.
+- archive_cmds_FC='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_FC='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds_FC='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+@@ -19163,43 +18383,43 @@
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+- no_undefined_flag_FC='$wl-z,text'
++ no_undefined_flag_FC='${wl}-z,text'
+ archive_cmds_need_lc_FC=no
+ hardcode_shlibpath_var_FC=no
+ runpath_var='LD_RUN_PATH'
+
+- if test yes = "$GCC"; then
+- archive_cmds_FC='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_FC='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ archive_cmds_FC='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_FC='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- archive_cmds_FC='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_FC='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_FC='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_FC='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+- # Note: We CANNOT use -z defs as we might desire, because we do not
++ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+- no_undefined_flag_FC='$wl-z,text'
+- allow_undefined_flag_FC='$wl-z,nodefs'
++ no_undefined_flag_FC='${wl}-z,text'
++ allow_undefined_flag_FC='${wl}-z,nodefs'
+ archive_cmds_need_lc_FC=no
+ hardcode_shlibpath_var_FC=no
+- hardcode_libdir_flag_spec_FC='$wl-R,$libdir'
++ hardcode_libdir_flag_spec_FC='${wl}-R,$libdir'
+ hardcode_libdir_separator_FC=':'
+ link_all_deplibs_FC=yes
+- export_dynamic_flag_spec_FC='$wl-Bexport'
++ export_dynamic_flag_spec_FC='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+- if test yes = "$GCC"; then
+- archive_cmds_FC='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_FC='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ archive_cmds_FC='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_FC='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- archive_cmds_FC='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_FC='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_FC='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_FC='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+@@ -19214,10 +18434,10 @@
+ ;;
+ esac
+
+- if test sni = "$host_vendor"; then
++ if test x$host_vendor = xsni; then
+ case $host in
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+- export_dynamic_flag_spec_FC='$wl-Blargedynsym'
++ export_dynamic_flag_spec_FC='${wl}-Blargedynsym'
+ ;;
+ esac
+ fi
+@@ -19225,7 +18445,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_FC" >&5
+ $as_echo "$ld_shlibs_FC" >&6; }
+-test no = "$ld_shlibs_FC" && can_build_shared=no
++test "$ld_shlibs_FC" = no && can_build_shared=no
+
+ with_gnu_ld_FC=$with_gnu_ld
+
+@@ -19242,7 +18462,7 @@
+ # Assume -lc should be added
+ archive_cmds_need_lc_FC=yes
+
+- if test yes,yes = "$GCC,$enable_shared"; then
++ if test "$enable_shared" = yes && test "$GCC" = yes; then
+ case $archive_cmds_FC in
+ *'~'*)
+ # FIXME: we may have to deal with multi-command sequences.
+@@ -19370,7 +18590,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext_cmds=.so
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -19387,16 +18607,14 @@
+ # flags to be left without arguments
+ need_version=unknown
+
+-
+-
+ case $host_os in
+ aix3*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+ # AIX 3 has no versioning support, so we append a major version to the name.
+- soname_spec='$libname$release$shared_ext$major'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+ aix[4-9]*)
+@@ -19404,91 +18622,41 @@
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 supports IA64
+- library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ else
+ # With GCC up to 2.95.x, collect2 would create an import file
+ # for dependence libraries. The import file would start with
+- # the line '#! .'. This would cause the generated library to
+- # depend on '.', always an invalid library. This was fixed in
++ # the line `#! .'. This would cause the generated library to
++ # depend on `.', always an invalid library. This was fixed in
+ # development snapshots of GCC prior to 3.0.
+ case $host_os in
+ aix4 | aix4.[01] | aix4.[01].*)
+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+ echo ' yes '
+- echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ :
+ else
+ can_build_shared=no
+ fi
+ ;;
+ esac
+- # Using Import Files as archive members, it is possible to support
+- # filename-based versioning of shared library archives on AIX. While
+- # this would work for both with and without runtime linking, it will
+- # prevent static linking of such archives. So we do filename-based
+- # shared library versioning with .so extension only, which is used
+- # when both runtime linking and shared linking is enabled.
+- # Unfortunately, runtime linking may impact performance, so we do
+- # not want this to be the default eventually. Also, we use the
+- # versioned .so libs for executables only if there is the -brtl
+- # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+- # To allow for filename-based versioning support, we need to create
+- # libNAME.so.V as an archive file, containing:
+- # *) an Import File, referring to the versioned filename of the
+- # archive as well as the shared archive member, telling the
+- # bitwidth (32 or 64) of that shared object, and providing the
+- # list of exported symbols of that shared object, eventually
+- # decorated with the 'weak' keyword
+- # *) the shared object with the F_LOADONLY flag set, to really avoid
+- # it being seen by the linker.
+- # At run time we better use the real file rather than another symlink,
+- # but for link time we create the symlink libNAME.so -> libNAME.so.V
+-
+- case $with_aix_soname,$aix_use_runtimelinking in
+- # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # soname into executable. Probably we can add versioning support to
+ # collect2, so additional links can be useful in future.
+- aix,yes) # traditional libtool
+- dynamic_linker='AIX unversionable lib.so'
++ if test "$aix_use_runtimelinking" = yes; then
+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+ # instead of lib<name>.a to let people know that these are not
+ # typical AIX shared libraries.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- ;;
+- aix,no) # traditional AIX only
+- dynamic_linker='AIX lib.a(lib.so.V)'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ else
+ # We preserve .a as extension for shared libraries through AIX4.2
+ # and later when we are not doing run time linking.
+- library_names_spec='$libname$release.a $libname.a'
+- soname_spec='$libname$release$shared_ext$major'
+- ;;
+- svr4,*) # full svr4 only
+- dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+- library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+- # We do not specify a path in Import Files, so LIBPATH fires.
+- shlibpath_overrides_runpath=yes
+- ;;
+- *,yes) # both, prefer svr4
+- dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+- library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+- # unpreferred sharedlib libNAME.a needs extra handling
+- postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+- postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+- # We do not specify a path in Import Files, so LIBPATH fires.
+- shlibpath_overrides_runpath=yes
+- ;;
+- *,no) # both, prefer aix
+- dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+- library_names_spec='$libname$release.a $libname.a'
+- soname_spec='$libname$release$shared_ext$major'
+- # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+- postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+- postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+- ;;
+- esac
++ library_names_spec='${libname}${release}.a $libname.a'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ fi
+ shlibpath_var=LIBPATH
+ fi
+ ;;
+@@ -19498,18 +18666,18 @@
+ powerpc)
+ # Since July 2007 AmigaOS4 officially supports .so libraries.
+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ ;;
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
+ ;;
+
+ beos*)
+- library_names_spec='$libname$shared_ext'
++ library_names_spec='${libname}${shared_ext}'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ ;;
+@@ -19517,8 +18685,8 @@
+ bsdi[45]*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+@@ -19530,7 +18698,7 @@
+
+ cygwin* | mingw* | pw32* | cegcc*)
+ version_type=windows
+- shrext_cmds=.dll
++ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+@@ -19539,8 +18707,8 @@
+ # gcc
+ library_names_spec='$libname.dll.a'
+ # 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'\''`~
++ 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~
+@@ -19556,16 +18724,16 @@
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+- soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+- soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
++ 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'
+@@ -19574,8 +18742,8 @@
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+- soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+- library_names_spec='$libname.dll.lib'
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ library_names_spec='${libname}.dll.lib'
+
+ case $build_os in
+ mingw*)
+@@ -19602,7 +18770,7 @@
+ 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
++ 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'`
+@@ -19615,8 +18783,8 @@
+ 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'\''`~
++ 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'
+@@ -19629,7 +18797,7 @@
+
+ *)
+ # Assume MSVC wrapper
+- library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ dynamic_linker='Win32 ld.exe'
+ ;;
+ esac
+@@ -19642,8 +18810,8 @@
+ version_type=darwin
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+- soname_spec='$libname$release$major$shared_ext'
++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++ soname_spec='${libname}${release}${major}$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+@@ -19655,8 +18823,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+@@ -19674,13 +18842,12 @@
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+ freebsd-*)
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
+ ;;
+ esac
+@@ -19705,15 +18872,26 @@
+ esac
+ ;;
+
++gnu*)
++ version_type=linux # correct to gnu/linux during the next big refactor
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ haiku*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LIBRARY_PATH
+- shlibpath_overrides_runpath=no
++ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+@@ -19731,15 +18909,14 @@
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
+- if test 32 = "$HPUX_IA64_MODE"; then
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ if test "X$HPUX_IA64_MODE" = X32; then
+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+- sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+ else
+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+- sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+ fi
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
+ shrext_cmds='.sl'
+@@ -19747,8 +18924,8 @@
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+@@ -19757,8 +18934,8 @@
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+@@ -19771,8 +18948,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+@@ -19783,7 +18960,7 @@
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+ *)
+- if test yes = "$lt_cv_prog_gnu_ld"; then
++ if test "$lt_cv_prog_gnu_ld" = yes; then
+ version_type=linux # correct to gnu/linux during the next big refactor
+ else
+ version_type=irix
+@@ -19791,8 +18968,8 @@
+ esac
+ need_lib_prefix=no
+ need_version=no
+- soname_spec='$libname$release$shared_ext$major'
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ case $host_os in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+@@ -19811,8 +18988,8 @@
+ esac
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+ shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+- sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ hardcode_into_libs=yes
+ ;;
+
+@@ -19821,33 +18998,13 @@
+ dynamic_linker=no
+ ;;
+
+-linux*android*)
+- version_type=none # Android doesn't support versioned libraries.
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='$libname$release$shared_ext'
+- soname_spec='$libname$release$shared_ext'
+- finish_cmds=
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+-
+- # This implies no fast_install, which is unacceptable.
+- # Some rework will be needed to allow for fast_install
+- # before this can be enabled.
+- hardcode_into_libs=yes
+-
+- dynamic_linker='Android linker'
+- # Don't embed -rpath directories since the linker doesn't support them.
+- hardcode_libdir_flag_spec_FC='-L$libdir'
+- ;;
+-
+ # This must be glibc/ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+@@ -19885,15 +19042,14 @@
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # Ideally, we could use ldconfig to report *all* directores which are
+- # searched for libraries, however this is still not possible. Aside from not
+- # being certain /sbin/ldconfig is available, command
+- # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+- # even though it is searched at run-time. Try to do the best guess by
+- # appending ld.so.conf contents (and includes) to the search path.
++ # Add ABI-specific directories to the system library path.
++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
++
++ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -19910,12 +19066,12 @@
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -19925,7 +19081,7 @@
+
+ newsos6)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
+@@ -19934,68 +19090,58 @@
+ version_type=qnx
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='ldqnx.so'
+ ;;
+
+-openbsd* | bitrig*)
++openbsd*)
+ version_type=sunos
+- sys_lib_dlsearch_path_spec=/usr/lib
++ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+- need_version=no
+- else
+- need_version=yes
+- fi
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ case $host_os in
++ openbsd2.[89] | openbsd2.[89].*)
++ shlibpath_overrides_runpath=no
++ ;;
++ *)
++ shlibpath_overrides_runpath=yes
++ ;;
++ esac
++ else
++ shlibpath_overrides_runpath=yes
++ fi
+ ;;
+
+ os2*)
+ libname_spec='$name'
+- version_type=windows
+- shrext_cmds=.dll
+- need_version=no
++ shrext_cmds=".dll"
+ need_lib_prefix=no
+- # OS/2 can only load a DLL with a base name of 8 characters or less.
+- soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+- v=$($ECHO $release$versuffix | tr -d .-);
+- n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+- $ECHO $n$v`$shared_ext'
+- library_names_spec='${libname}_dll.$libext'
++ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+- shlibpath_var=BEGINLIBPATH
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+- 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~
+- chmod a+x \$dldir/$dlname~
+- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+- fi'
+- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+- dlpath=$dir/\$dldll~
+- $RM \$dlpath'
++ shlibpath_var=LIBPATH
+ ;;
+
+ osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+- soname_spec='$libname$release$shared_ext$major'
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+ rdos*)
+@@ -20006,8 +19152,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+@@ -20017,11 +19163,11 @@
+
+ sunos4*)
+ version_type=sunos
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+@@ -20029,8 +19175,8 @@
+
+ sysv4 | sysv4.3*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_vendor in
+ sni)
+@@ -20051,24 +19197,24 @@
+ ;;
+
+ sysv4*MP*)
+- if test -d /usr/nec; then
++ if test -d /usr/nec ;then
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+- soname_spec='$libname$shared_ext.$major'
++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+- version_type=sco
++ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+@@ -20086,7 +19232,7 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+@@ -20094,8 +19240,8 @@
+
+ uts4*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+@@ -20105,32 +19251,20 @@
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+ $as_echo "$dynamic_linker" >&6; }
+-test no = "$dynamic_linker" && can_build_shared=no
++test "$dynamic_linker" = no && can_build_shared=no
+
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+
+-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+- sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ fi
+-
+-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+- sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+ fi
+
+-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+-
+-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+-
+-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+-
+-
+-
+
+
+
+@@ -20173,15 +19307,15 @@
+ hardcode_action_FC=
+ if test -n "$hardcode_libdir_flag_spec_FC" ||
+ test -n "$runpath_var_FC" ||
+- test yes = "$hardcode_automatic_FC"; then
++ test "X$hardcode_automatic_FC" = "Xyes" ; then
+
+ # We can hardcode non-existent directories.
+- if test no != "$hardcode_direct_FC" &&
++ if test "$hardcode_direct_FC" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+- ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, FC)" &&
+- test no != "$hardcode_minus_L_FC"; then
++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, FC)" != no &&
++ test "$hardcode_minus_L_FC" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action_FC=relink
+ else
+@@ -20196,12 +19330,12 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_FC" >&5
+ $as_echo "$hardcode_action_FC" >&6; }
+
+-if test relink = "$hardcode_action_FC" ||
+- test yes = "$inherit_rpath_FC"; then
++if test "$hardcode_action_FC" = relink ||
++ test "$inherit_rpath_FC" = yes; then
+ # Fast installation is not supported
+ enable_fast_install=no
+-elif test yes = "$shlibpath_overrides_runpath" ||
+- test no = "$enable_shared"; then
++elif test "$shlibpath_overrides_runpath" = yes ||
++ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+ fi
+@@ -20217,7 +19351,7 @@
+ GCC=$lt_save_GCC
+ CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
+-fi # test yes != "$_lt_disable_FC"
++fi # test "$_lt_disable_FC" != yes
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -22168,6 +21302,31 @@
+ done
+ fi
+
++#
++# IME specific build path.
++# Automatically adds IME to the file systems if not present
++#
++if test -n "${with_ime}" ; then
++ IME_INSTALL_PATH="${with_ime}"
++
++fi
++
++ime_default_path="/opt/ddn/ime"
++if test -n "${with_ime}" -o -e "${ime_default_path}/include/ime_native.h"; then
++ # Use IME and the default path, if not specified or overriden
++ with_ime="${ime_default_path}"
++ file_system_ime=1
++fi
++
++if test -n "${file_system_ime}" ; then
++ CFLAGS="$CFLAGS -I${with_ime}/include"
++ CPPFLAGS="$CPPFLAGS -I${with_ime}/include"
++ LDFLAGS="$LDFLAGS -L${with_ime}/lib"
++ LIBS="-lim_client -lim_common"
++ export LD_LIBRARY_PATH="${with_ime}/lib:$LD_LIBRARY_PATH"
++fi
++
++
+ #############################################
+ # This PVFS2 logic is special because it's hard to get it right if it comes
+ # before the known_filesystems check loop above. So we handle it down here,
+@@ -25947,7 +25106,6 @@
+ enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+-shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
+ SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+ PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+@@ -25997,13 +25155,10 @@
+ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+ 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_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $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"`'
+-lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $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"`'
+-lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $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"`'
+@@ -26068,8 +25223,7 @@
+ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+ hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+ sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+-configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+-configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
++sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+ hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+ enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+ enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+@@ -26222,12 +25376,9 @@
+ compiler \
+ lt_cv_sys_global_symbol_pipe \
+ lt_cv_sys_global_symbol_to_cdecl \
+-lt_cv_sys_global_symbol_to_import \
+ lt_cv_sys_global_symbol_to_c_name_address \
+ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+-lt_cv_nm_interface \
+ nm_file_list_spec \
+-lt_cv_truncate_bin \
+ lt_prog_compiler_no_builtin_flag \
+ lt_prog_compiler_pic \
+ lt_prog_compiler_wl \
+@@ -26318,7 +25469,7 @@
+ compiler_lib_search_path_FC; do
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ *[\\\\\\\`\\"\\\$]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -26345,8 +25496,7 @@
+ postuninstall_cmds \
+ finish_cmds \
+ sys_lib_search_path_spec \
+-configure_time_dlsearch_path \
+-configure_time_lt_sys_library_path \
++sys_lib_dlsearch_path_spec \
+ reload_cmds_F77 \
+ reload_cmds_FC \
+ old_archive_cmds_F77 \
+@@ -26371,7 +25521,7 @@
+ postlink_cmds_FC; do
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ *[\\\\\\\`\\"\\\$]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -26380,16 +25530,19 @@
+ done
+
+ ac_aux_dir='$ac_aux_dir'
++xsi_shell='$xsi_shell'
++lt_shell_append='$lt_shell_append'
+
+-# See if we are running on zsh, and set the options that allow our
++# See if we are running on zsh, and set the options which allow our
+ # commands through without removal of \ escapes INIT.
+-if test -n "\${ZSH_VERSION+set}"; then
++if test -n "\${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+
+
+ PACKAGE='$PACKAGE'
+ VERSION='$VERSION'
++ TIMESTAMP='$TIMESTAMP'
+ RM='$RM'
+ ofile='$ofile'
+
+@@ -27122,52 +26275,55 @@
+ ;;
+ "libtool":C)
+
+- # See if we are running on zsh, and set the options that allow our
++ # See if we are running on zsh, and set the options which allow our
+ # commands through without removal of \ escapes.
+- if test -n "${ZSH_VERSION+set}"; then
++ if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+
+- cfgfile=${ofile}T
++ cfgfile="${ofile}T"
+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+ $RM "$cfgfile"
+
+ cat <<_LT_EOF >> "$cfgfile"
+ #! $SHELL
+-# Generated automatically by $as_me ($PACKAGE) $VERSION
+-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+-
+-# Provide generalized library-building support services.
+-# Written by Gordon Matzigkeit, 1996
+
+-# Copyright (C) 2014 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.
+-
+-# GNU Libtool is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of of the License, or
+-# (at your option) any later version.
+-#
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program or library that is built
+-# using GNU Libtool, you may include this file under the same
+-# distribution terms that you use for the rest of that program.
++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# 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, 2010, 2011 Free Software
++# Foundation, Inc.
++# Written by Gordon Matzigkeit, 1996
++#
++# This file is part of GNU Libtool.
++#
++# GNU Libtool is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License as
++# published by the Free Software Foundation; either version 2 of
++# the License, or (at your option) any later version.
++#
++# As a special exception to the GNU General Public License,
++# if you distribute this file as part of a program or library that
++# is built using GNU Libtool, you may include this file under the
++# same distribution terms that you use for the rest of that program.
+ #
+-# GNU Libtool is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
++# GNU Libtool is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program. If not, see <http://www.gnu.org/licenses/>.
++# along with GNU Libtool; see the file COPYING. If not, a copy
++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
++# obtained by writing to the Free Software Foundation, Inc.,
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+ # The names of the tagged configurations supported by this script.
+-available_tags='F77 FC '
+-
+-# Configured defaults for sys_lib_dlsearch_path munging.
+-: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
++available_tags="F77 FC "
+
+ # ### BEGIN LIBTOOL CONFIG
+
+@@ -27187,9 +26343,6 @@
+ # Whether or not to optimize for fast installation.
+ fast_install=$enable_fast_install
+
+-# Shared archive member basename,for filename based shared library versioning on AIX.
+-shared_archive_member_spec=$shared_archive_member_spec
+-
+ # Shell to use when invoking shell scripts.
+ SHELL=$lt_SHELL
+
+@@ -27307,27 +26460,18 @@
+ # Transform the output of nm in a proper C declaration.
+ global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+-# Transform the output of nm into a list of symbols to manually relocate.
+-global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+-
+ # Transform the output of nm in a C name address pair.
+ 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
+
+-# The name lister interface.
+-nm_interface=$lt_lt_cv_nm_interface
+-
+ # 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 where our libraries should be installed.
++# The root where to search for dependent libraries,and in which our libraries should be installed.
+ lt_sysroot=$lt_sysroot
+
+-# Command to truncate a binary pipe.
+-lt_truncate_bin=$lt_lt_cv_truncate_bin
+-
+ # The name of the directory that contains temporary libtool files.
+ objdir=$objdir
+
+@@ -27418,11 +26562,8 @@
+ # Compile-time system search path for libraries.
+ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+-# Detected run-time system search path for libraries.
+-sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+-
+-# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+-configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
++# Run-time system search path for libraries.
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Whether dlopen is supported.
+ dlopen_support=$enable_dlopen
+@@ -27515,13 +26656,13 @@
+ # Whether we need a single "-rpath" flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+ # DIR into the resulting binary.
+ hardcode_direct=$hardcode_direct
+
+-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+ # DIR into the resulting binary and the resulting library dependency is
+-# "absolute",i.e impossible to change by setting \$shlibpath_var if the
++# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+ # library is relocated.
+ hardcode_direct_absolute=$hardcode_direct_absolute
+
+@@ -27587,72 +26728,13 @@
+
+ _LT_EOF
+
+- cat <<'_LT_EOF' >> "$cfgfile"
+-
+-# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+-
+-# func_munge_path_list VARIABLE PATH
+-# -----------------------------------
+-# VARIABLE is name of variable containing _space_ separated list of
+-# directories to be munged by the contents of PATH, which is string
+-# having a format:
+-# "DIR[:DIR]:"
+-# string "DIR[ DIR]" will be prepended to VARIABLE
+-# ":DIR[:DIR]"
+-# string "DIR[ DIR]" will be appended to VARIABLE
+-# "DIRP[:DIRP]::[DIRA:]DIRA"
+-# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+-# "DIRA[ DIRA]" will be appended to VARIABLE
+-# "DIR[:DIR]"
+-# VARIABLE will be replaced by "DIR[ DIR]"
+-func_munge_path_list ()
+-{
+- case x$2 in
+- x)
+- ;;
+- *:)
+- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+- ;;
+- x:*)
+- eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+- ;;
+- *::*)
+- eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+- eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+- ;;
+- *)
+- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+- ;;
+- esac
+-}
+-
+-
+-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+-func_cc_basename ()
+-{
+- for cc_temp in $*""; do
+- case $cc_temp in
+- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+- \-*) ;;
+- *) break;;
+- esac
+- done
+- func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+-}
+-
+-
+-# ### END FUNCTIONS SHARED WITH CONFIGURE
+-
+-_LT_EOF
+-
+ case $host_os in
+ aix3*)
+ cat <<\_LT_EOF >> "$cfgfile"
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+-if test set != "${COLLECT_NAMES+set}"; then
++if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+@@ -27661,7 +26743,7 @@
+ esac
+
+
+-ltmain=$ac_aux_dir/ltmain.sh
++ltmain="$ac_aux_dir/ltmain.sh"
+
+
+ # We use sed instead of cat because bash on DJGPP gets confused if
+@@ -27671,6 +26753,165 @@
+ 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"
+@@ -27757,13 +26998,13 @@
+ # Whether we need a single "-rpath" flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
+
+-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+ # DIR into the resulting binary.
+ hardcode_direct=$hardcode_direct_F77
+
+-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+ # DIR into the resulting binary and the resulting library dependency is
+-# "absolute",i.e impossible to change by setting \$shlibpath_var if the
++# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+ # library is relocated.
+ hardcode_direct_absolute=$hardcode_direct_absolute_F77
+
+@@ -27910,13 +27151,13 @@
+ # Whether we need a single "-rpath" flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator_FC
+
+-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+ # DIR into the resulting binary.
+ hardcode_direct=$hardcode_direct_FC
+
+-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+ # DIR into the resulting binary and the resulting library dependency is
+-# "absolute",i.e impossible to change by setting \$shlibpath_var if the
++# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+ # library is relocated.
+ hardcode_direct_absolute=$hardcode_direct_absolute_FC
+
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/configure.ac psmpi-5.4.6-1/mpich2/src/mpi/romio/configure.ac
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/configure.ac 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/configure.ac 2020-07-16 10:45:36.787618827 +0200
+@@ -226,6 +226,8 @@
+ --with-pvfs2=path - Path to installation of PVFS (version 2)],,)
+ AC_ARG_WITH(mpi-impl,[
+ --with-mpi-impl=name - Specify MPI implementation to build ROMIO for],,)
++AC_ARG_WITH(ime,[
++--with-ime=PATH - Path to installation of IME],,)
+ dnl
+ AC_ARG_WITH(mpi, [
+ --with-mpi=path - Path to instalation of MPI (headers, libs, etc)],,)
+@@ -776,6 +778,30 @@
+ done
+ fi
+
++#
++# IME specific build path.
++# Automatically adds IME to the file systems if not present
++#
++if test -n "${with_ime}" ; then
++ AC_SUBST(IME_INSTALL_PATH, ["${with_ime}"])
++fi
++
++ime_default_path="/opt/ddn/ime"
++if test -n "${with_ime}" -o -e "${ime_default_path}/include/ime_native.h"; then
++ # Use IME and the default path, if not specified or overriden
++ with_ime="${ime_default_path}"
++ file_system_ime=1
++fi
++
++if test -n "${file_system_ime}" ; then
++ CFLAGS="$CFLAGS -I${with_ime}/include"
++ CPPFLAGS="$CPPFLAGS -I${with_ime}/include"
++ LDFLAGS="$LDFLAGS -L${with_ime}/lib"
++ LIBS="-lim_client -lim_common"
++ export LD_LIBRARY_PATH="${with_ime}/lib:$LD_LIBRARY_PATH"
++fi
++
++
+ #############################################
+ # This PVFS2 logic is special because it's hard to get it right if it comes
+ # before the known_filesystems check loop above. So we handle it down here,
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/Makefile.in psmpi-5.4.6-1/mpich2/src/mpi/romio/Makefile.in
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/Makefile.in 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/Makefile.in 2020-07-16 10:48:35.305062584 +0200
+@@ -21,17 +21,7 @@
+ #
+
+
+-am__is_gnu_make = { \
+- if test -z '$(MAKELEVEL)'; then \
+- false; \
+- elif test -n '$(MAKE_HOST)'; then \
+- true; \
+- elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+- true; \
+- else \
+- false; \
+- fi; \
+-}
++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+@@ -94,6 +84,44 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
++DIST_COMMON = $(srcdir)/mpi-io/Makefile.mk \
++ $(top_srcdir)/mpi-io/glue/Makefile.mk \
++ $(top_srcdir)/mpi-io/glue/default/Makefile.mk \
++ $(top_srcdir)/mpi-io/glue/mpich/Makefile.mk \
++ $(top_srcdir)/mpi-io/fortran/Makefile.mk \
++ $(srcdir)/adio/Makefile.mk \
++ $(top_srcdir)/adio/ad_gpfs/Makefile.mk \
++ $(top_srcdir)/adio/ad_gpfs/bg/Makefile.mk \
++ $(top_srcdir)/adio/ad_gpfs/pe/Makefile.mk \
++ $(top_srcdir)/adio/ad_lustre/Makefile.mk \
++ $(top_srcdir)/adio/ad_nfs/Makefile.mk \
++ $(top_srcdir)/adio/ad_panfs/Makefile.mk \
++ $(top_srcdir)/adio/ad_pvfs2/Makefile.mk \
++ $(top_srcdir)/adio/ad_testfs/Makefile.mk \
++ $(top_srcdir)/adio/ad_ufs/Makefile.mk \
++ $(top_srcdir)/adio/ad_xfs/Makefile.mk \
++ $(top_srcdir)/adio/ad_ime/Makefile.mk \
++ $(top_srcdir)/adio/common/Makefile.mk $(srcdir)/Makefile.in \
++ $(srcdir)/Makefile.am $(top_srcdir)/configure \
++ $(am__configure_deps) \
++ $(top_srcdir)/adio/include/romioconf.h.in \
++ $(srcdir)/localdefs.in \
++ $(top_srcdir)/mpi2-other/info/Makefile.in \
++ $(top_srcdir)/mpi2-other/array/Makefile.in \
++ $(top_srcdir)/util/romioinstall.in \
++ $(top_srcdir)/include/mpio.h.in \
++ $(top_srcdir)/include/mpiof.h.in \
++ $(top_srcdir)/mpi2-other/info/fortran/Makefile.in \
++ $(top_srcdir)/mpi2-other/array/fortran/Makefile.in \
++ $(top_srcdir)/confdb/depcomp $(include_HEADERS) \
++ $(am__noinst_HEADERS_DIST) README confdb/ar-lib confdb/compile \
++ confdb/config.guess confdb/config.rpath confdb/config.sub \
++ confdb/depcomp confdb/install-sh confdb/missing \
++ confdb/ltmain.sh $(top_srcdir)/confdb/ar-lib \
++ $(top_srcdir)/confdb/compile $(top_srcdir)/confdb/config.guess \
++ $(top_srcdir)/confdb/config.sub \
++ $(top_srcdir)/confdb/install-sh $(top_srcdir)/confdb/ltmain.sh \
++ $(top_srcdir)/confdb/missing
+ @MPIO_GLUE_DEFAULT_TRUE@am__append_1 = \
+ @MPIO_GLUE_DEFAULT_TRUE@ mpi-io/glue/default/mpio_file.c \
+ @MPIO_GLUE_DEFAULT_TRUE@ mpi-io/glue/default/mpio_err.c
+@@ -329,9 +357,6 @@
+ $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+- $(am__configure_deps) $(include_HEADERS) \
+- $(am__noinst_HEADERS_DIST) $(am__DIST_COMMON)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+ mkinstalldirs = $(install_sh) -d
+@@ -1403,39 +1428,6 @@
+ ETAGS = etags
+ CTAGS = ctags
+ CSCOPE = cscope
+-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/adio/Makefile.mk \
+- $(srcdir)/localdefs.in $(srcdir)/mpi-io/Makefile.mk \
+- $(top_srcdir)/adio/ad_gpfs/Makefile.mk \
+- $(top_srcdir)/adio/ad_gpfs/bg/Makefile.mk \
+- $(top_srcdir)/adio/ad_gpfs/pe/Makefile.mk \
+- $(top_srcdir)/adio/ad_ime/Makefile.mk \
+- $(top_srcdir)/adio/ad_lustre/Makefile.mk \
+- $(top_srcdir)/adio/ad_nfs/Makefile.mk \
+- $(top_srcdir)/adio/ad_panfs/Makefile.mk \
+- $(top_srcdir)/adio/ad_pvfs2/Makefile.mk \
+- $(top_srcdir)/adio/ad_testfs/Makefile.mk \
+- $(top_srcdir)/adio/ad_ufs/Makefile.mk \
+- $(top_srcdir)/adio/ad_xfs/Makefile.mk \
+- $(top_srcdir)/adio/common/Makefile.mk \
+- $(top_srcdir)/adio/include/romioconf.h.in \
+- $(top_srcdir)/confdb/ar-lib $(top_srcdir)/confdb/compile \
+- $(top_srcdir)/confdb/config.guess \
+- $(top_srcdir)/confdb/config.sub $(top_srcdir)/confdb/depcomp \
+- $(top_srcdir)/confdb/install-sh $(top_srcdir)/confdb/ltmain.sh \
+- $(top_srcdir)/confdb/missing $(top_srcdir)/include/mpio.h.in \
+- $(top_srcdir)/include/mpiof.h.in \
+- $(top_srcdir)/mpi-io/fortran/Makefile.mk \
+- $(top_srcdir)/mpi-io/glue/Makefile.mk \
+- $(top_srcdir)/mpi-io/glue/default/Makefile.mk \
+- $(top_srcdir)/mpi-io/glue/mpich/Makefile.mk \
+- $(top_srcdir)/mpi2-other/array/Makefile.in \
+- $(top_srcdir)/mpi2-other/array/fortran/Makefile.in \
+- $(top_srcdir)/mpi2-other/info/Makefile.in \
+- $(top_srcdir)/mpi2-other/info/fortran/Makefile.in \
+- $(top_srcdir)/util/romioinstall.in README confdb/ar-lib \
+- confdb/compile confdb/config.guess confdb/config.rpath \
+- confdb/config.sub confdb/depcomp confdb/install-sh \
+- confdb/ltmain.sh confdb/missing
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -1535,6 +1527,7 @@
+ HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+ HAVE_MPI_INFO = @HAVE_MPI_INFO@
+ HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
++IME_INSTALL_PATH = @IME_INSTALL_PATH@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -1550,7 +1543,6 @@
+ LL = @LL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+ MAINT = @MAINT@
+ MAKE = @MAKE@
+ MAKEINFO = @MAKEINFO@
+@@ -1892,6 +1884,7 @@
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign Makefile
++.PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+@@ -1901,7 +1894,7 @@
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
+ esac;
+-$(srcdir)/mpi-io/Makefile.mk $(top_srcdir)/mpi-io/glue/Makefile.mk $(top_srcdir)/mpi-io/glue/default/Makefile.mk $(top_srcdir)/mpi-io/glue/mpich/Makefile.mk $(top_srcdir)/mpi-io/fortran/Makefile.mk $(srcdir)/adio/Makefile.mk $(top_srcdir)/adio/ad_gpfs/Makefile.mk $(top_srcdir)/adio/ad_gpfs/bg/Makefile.mk $(top_srcdir)/adio/ad_gpfs/pe/Makefile.mk $(top_srcdir)/adio/ad_lustre/Makefile.mk $(top_srcdir)/adio/ad_nfs/Makefile.mk $(top_srcdir)/adio/ad_panfs/Makefile.mk $(top_srcdir)/adio/ad_pvfs2/Makefile.mk $(top_srcdir)/adio/ad_testfs/Makefile.mk $(top_srcdir)/adio/ad_ufs/Makefile.mk $(top_srcdir)/adio/ad_xfs/Makefile.mk $(top_srcdir)/adio/ad_ime/Makefile.mk $(top_srcdir)/adio/common/Makefile.mk $(am__empty):
++$(srcdir)/mpi-io/Makefile.mk $(top_srcdir)/mpi-io/glue/Makefile.mk $(top_srcdir)/mpi-io/glue/default/Makefile.mk $(top_srcdir)/mpi-io/glue/mpich/Makefile.mk $(top_srcdir)/mpi-io/fortran/Makefile.mk $(srcdir)/adio/Makefile.mk $(top_srcdir)/adio/ad_gpfs/Makefile.mk $(top_srcdir)/adio/ad_gpfs/bg/Makefile.mk $(top_srcdir)/adio/ad_gpfs/pe/Makefile.mk $(top_srcdir)/adio/ad_lustre/Makefile.mk $(top_srcdir)/adio/ad_nfs/Makefile.mk $(top_srcdir)/adio/ad_panfs/Makefile.mk $(top_srcdir)/adio/ad_pvfs2/Makefile.mk $(top_srcdir)/adio/ad_testfs/Makefile.mk $(top_srcdir)/adio/ad_ufs/Makefile.mk $(top_srcdir)/adio/ad_xfs/Makefile.mk $(top_srcdir)/adio/ad_ime/Makefile.mk $(top_srcdir)/adio/common/Makefile.mk:
+
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+@@ -1913,8 +1906,8 @@
+ $(am__aclocal_m4_deps):
+
+ adio/include/romioconf.h: adio/include/stamp-h1
+- @test -f $@ || rm -f adio/include/stamp-h1
+- @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) adio/include/stamp-h1
++ @if test ! -f $@; then rm -f adio/include/stamp-h1; else :; fi
++ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) adio/include/stamp-h1; else :; fi
+
+ adio/include/stamp-h1: $(top_srcdir)/adio/include/romioconf.h.in $(top_builddir)/config.status
+ @rm -f adio/include/stamp-h1
+@@ -4472,7 +4465,7 @@
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r "$(distdir)"
+ dist-gzip: distdir
+- tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__post_remove_distdir)
+
+ dist-bzip2: distdir
+@@ -4488,17 +4481,11 @@
+ $(am__post_remove_distdir)
+
+ dist-tarZ: distdir
+- @echo WARNING: "Support for distribution archives compressed with" \
+- "legacy program 'compress' is deprecated." >&2
+- @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__post_remove_distdir)
+
+ dist-shar: distdir
+- @echo WARNING: "Support for shar distribution archives is" \
+- "deprecated." >&2
+- @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+- shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
++ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ $(am__post_remove_distdir)
+
+ dist-zip: distdir
+@@ -4516,7 +4503,7 @@
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lz*) \
+@@ -4526,23 +4513,22 @@
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+ chmod -R a-w $(distdir)
+ chmod u+w $(distdir)
+- mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
++ mkdir $(distdir)/_build $(distdir)/_inst
+ chmod a-w $(distdir)
+ test -d $(distdir)/_build || exit 0; \
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+ && am__cwd=`pwd` \
+- && $(am__cd) $(distdir)/_build/sub \
+- && ../../configure \
++ && $(am__cd) $(distdir)/_build \
++ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+- --srcdir=../.. --prefix="$$dc_install_base" \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+@@ -5577,8 +5563,6 @@
+ tags tags-am uninstall uninstall-am uninstall-includeHEADERS \
+ uninstall-libLTLIBRARIES uninstall-nodist_includeHEADERS
+
+-.PRECIOUS: Makefile
+-
+
+ # --------------------------------------------------------------------------
+ .PHONY: coverage
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/aclocal.m4 psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/aclocal.m4
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/aclocal.m4 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/aclocal.m4 2020-07-16 10:48:35.433405496 +0200
+@@ -76,8 +76,7 @@
+ : ${AR=ar}
+
+ AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
+- [AC_LANG_PUSH([C])
+- am_cv_ar_interface=ar
++ [am_cv_ar_interface=ar
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
+ [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+ AC_TRY_EVAL([am_ar_try])
+@@ -94,7 +93,7 @@
+ fi
+ rm -f conftest.lib libconftest.a
+ ])
+- AC_LANG_POP([C])])
++ ])
+
+ case $am_cv_ar_interface in
+ ar)
+@@ -467,12 +466,6 @@
+ # This macro actually does too much. Some checks are only needed if
+ # your package does certain things. But this isn't really a big deal.
+
+-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+-m4_define([AC_PROG_CC],
+-m4_defn([AC_PROG_CC])
+-[_AM_PROG_CC_C_O
+-])
+-
+ # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+ # AM_INIT_AUTOMAKE([OPTIONS])
+ # -----------------------------------------------
+@@ -548,8 +541,8 @@
+ # <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+ # <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+ 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.
++# We need awk for the "check" target. The system "awk" is bad on
++# some platforms.
+ AC_REQUIRE([AC_PROG_AWK])dnl
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+@@ -634,6 +627,7 @@
+ m4_define([_AC_COMPILER_EXEEXT],
+ m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
++
+ # When config.status generates a header, we must update the stamp-h file.
+ # This file resides in the same directory as the config header
+ # that is generated. The stamp files are numbered to have different names.
+@@ -666,7 +660,7 @@
+ # Define $install_sh.
+ AC_DEFUN([AM_PROG_INSTALL_SH],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-if test x"${install_sh+set}" != xset; then
++if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/compile psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/compile
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/compile 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/compile 2020-07-16 10:48:35.436080000 +0200
+@@ -255,8 +255,7 @@
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+- icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
++ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
+ esac
+@@ -343,6 +342,6 @@
+ # eval: (add-hook 'before-save-hook 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+-# time-stamp-time-zone: "UTC0"
++# time-stamp-time-zone: "UTC"
+ # time-stamp-end: "; # UTC"
+ # End:
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/config.guess psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/config.guess
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/config.guess 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/config.guess 2020-07-16 10:48:35.440388622 +0200
+@@ -610,9 +610,8 @@
+ else
+ IBM_ARCH=powerpc
+ fi
+- if [ -x /usr/bin/lslpp ] ; then
+- IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+- awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
++ if [ -x /usr/bin/oslevel ] ; then
++ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+ fi
+@@ -711,12 +710,12 @@
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ # => hppa64-hp-hpux11.23
+
+- if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ grep -q __LP64__
+ then
+- HP_ARCH=hppa2.0w
++ HP_ARCH="hppa2.0w"
+ else
+- HP_ARCH=hppa64
++ HP_ARCH="hppa64"
+ fi
+ fi
+ echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
+@@ -1125,7 +1124,7 @@
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i586.
+ # Note: whatever this is, it MUST be the same as what config.sub
+- # prints for the "djgpp" host, or else GDB configure will decide that
++ # prints for the "djgpp" host, or else GDB configury will decide that
+ # this is a cross-build.
+ echo i586-pc-msdosdjgpp
+ exit ;;
+Binary files psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/.config.guess.swp and psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/.config.guess.swp differ
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/config.sub psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/config.sub
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/config.sub 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/config.sub 2020-07-16 10:48:35.444218004 +0200
+@@ -25,7 +25,7 @@
+ # of the GNU General Public License, version 3 ("GPLv3").
+
+
+-# Please send patches to <config-patches@gnu.org>.
++# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+@@ -53,7 +53,8 @@
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+ usage="\
+-Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
++Usage: $0 [OPTION] CPU-MFR-OPSYS
++ $0 [OPTION] ALIAS
+
+ Canonicalize a configuration name.
+
+@@ -116,8 +117,8 @@
+ case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+- kopensolaris*-gnu* | cloudabi*-eabi* | \
++ knetbsd*-gnu* | netbsd*-gnu* | \
++ kopensolaris*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+@@ -251,18 +252,16 @@
+ | arc | arceb \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | avr | avr32 \
+- | ba \
+ | be32 | be64 \
+ | bfin \
+- | c4x | c8051 | clipper \
++ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+- | e2k | epiphany \
+- | fido | fr30 | frv | ft32 \
++ | epiphany \
++ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
+- | i370 | i860 | i960 | ia16 | ia64 \
++ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+- | k1om \
+ | le32 | le64 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+@@ -280,10 +279,8 @@
+ | mips64vr5900 | mips64vr5900el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+- | mipsisa32r6 | mipsisa32r6el \
+ | mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
+- | mipsisa64r6 | mipsisa64r6el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
+@@ -326,10 +323,7 @@
+ c6x)
+ basic_machine=tic6x-unknown
+ ;;
+- leon|leon[3-9])
+- basic_machine=sparc-$basic_machine
+- ;;
+- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+@@ -374,20 +368,18 @@
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* | avr32-* \
+- | ba-* \
+ | be32-* | be64-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
+- | c8051-* | clipper-* | craynv-* | cydra-* \
++ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+- | e2k-* | elxsi-* \
++ | elxsi-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | hexagon-* \
+- | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
++ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
+- | k1om-* \
+ | le32-* | le64-* \
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+@@ -407,10 +399,8 @@
+ | mips64vr5900-* | mips64vr5900el-* \
+ | mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
+- | mipsisa32r6-* | mipsisa32r6el-* \
+ | mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
+- | mipsisa64r6-* | mipsisa64r6el-* \
+ | mipsisa64sb1-* | mipsisa64sb1el-* \
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipsr5900-* | mipsr5900el-* \
+@@ -422,19 +412,16 @@
+ | nios-* | nios2-* | nios2eb-* | nios2el-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
+- | or1k*-* \
+ | orion-* \
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+- | pru-* \
+ | pyramid-* \
+- | riscv32-* | riscv64-* \
+ | rl78-* | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tile*-* \
+@@ -442,8 +429,6 @@
+ | ubicom32-* \
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ | vax-* \
+- | visium-* \
+- | wasm32-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
+ | xstormy16-* | xtensa*-* \
+@@ -520,9 +505,6 @@
+ basic_machine=i386-pc
+ os=-aros
+ ;;
+- asmjs)
+- basic_machine=asmjs-unknown
+- ;;
+ aux)
+ basic_machine=m68k-apple
+ os=-aux
+@@ -816,7 +798,7 @@
+ os=-mingw64
+ ;;
+ mingw32)
+- basic_machine=i686-pc
++ basic_machine=i386-pc
+ os=-mingw32
+ ;;
+ mingw32ce)
+@@ -844,10 +826,6 @@
+ basic_machine=powerpc-unknown
+ os=-morphos
+ ;;
+- moxiebox)
+- basic_machine=moxie-unknown
+- os=-moxiebox
+- ;;
+ msdos)
+ basic_machine=i386-pc
+ os=-msdos
+@@ -856,7 +834,7 @@
+ basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
+ ;;
+ msys)
+- basic_machine=i686-pc
++ basic_machine=i386-pc
+ os=-msys
+ ;;
+ mvs)
+@@ -943,9 +921,6 @@
+ nsv-tandem)
+ basic_machine=nsv-tandem
+ ;;
+- nsx-tandem)
+- basic_machine=nsx-tandem
+- ;;
+ op50n-* | op60c-*)
+ basic_machine=hppa1.1-oki
+ os=-proelf
+@@ -1030,7 +1005,7 @@
+ ppc-* | ppcbe-*)
+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ ;;
+- ppcle | powerpclittle)
++ ppcle | powerpclittle | ppc-le | powerpc-little)
+ basic_machine=powerpcle-unknown
+ ;;
+ ppcle-* | powerpclittle-*)
+@@ -1520,8 +1495,6 @@
+ ;;
+ -nacl*)
+ ;;
+- -ios)
+- ;;
+ -none)
+ ;;
+ *)
+@@ -1562,9 +1535,6 @@
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
+- c8051-*)
+- os=-elf
+- ;;
+ hexagon-*)
+ os=-elf
+ ;;
+@@ -1608,6 +1578,9 @@
+ mips*-*)
+ os=-elf
+ ;;
++ or1k-*)
++ os=-elf
++ ;;
+ or32-*)
+ os=-coff
+ ;;
+@@ -1617,9 +1590,6 @@
+ sparc-* | *-sun)
+ os=-sunos4.1.1
+ ;;
+- pru-*)
+- os=-elf
+- ;;
+ *-be)
+ os=-beos
+ ;;
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/depcomp psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/depcomp
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/depcomp 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/depcomp 2020-07-16 10:48:35.445584426 +0200
+@@ -786,6 +786,6 @@
+ # eval: (add-hook 'before-save-hook 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+-# time-stamp-time-zone: "UTC0"
++# time-stamp-time-zone: "UTC"
+ # time-stamp-end: "; # UTC"
+ # End:
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/install-sh psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/install-sh
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/install-sh 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/install-sh 2020-07-16 10:48:35.447363805 +0200
+@@ -41,15 +41,19 @@
+ # This script is compatible with the BSD install script, but was written
+ # from scratch.
+
+-tab=' '
+ nl='
+ '
+-IFS=" $tab$nl"
++IFS=" "" $nl"
+
+-# Set DOITPROG to "echo" to test this script.
++# set DOITPROG to echo to test this script
+
++# Don't use :- since 4.3BSD and earlier shells don't like it.
+ doit=${DOITPROG-}
+-doit_exec=${doit:-exec}
++if test -z "$doit"; then
++ doit_exec=exec
++else
++ doit_exec=$doit
++fi
+
+ # Put in absolute file names if you don't have them in your path;
+ # or use environment vars.
+@@ -64,6 +68,17 @@
+ rmprog=${RMPROG-rm}
+ stripprog=${STRIPPROG-strip}
+
++posix_glob='?'
++initialize_posix_glob='
++ test "$posix_glob" != "?" || {
++ if (set -f) 2>/dev/null; then
++ posix_glob=
++ else
++ posix_glob=:
++ fi
++ }
++'
++
+ posix_mkdir=
+
+ # Desired mode of installed file.
+@@ -82,7 +97,7 @@
+ dst_arg=
+
+ copy_on_change=false
+-is_target_a_directory=possibly
++no_target_directory=
+
+ usage="\
+ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+@@ -122,57 +137,46 @@
+ -d) dir_arg=true;;
+
+ -g) chgrpcmd="$chgrpprog $2"
+- shift;;
++ shift;;
+
+ --help) echo "$usage"; exit $?;;
+
+ -m) mode=$2
+- case $mode in
+- *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+- echo "$0: invalid mode: $mode" >&2
+- exit 1;;
+- esac
+- shift;;
++ case $mode in
++ *' '* | *' '* | *'
++'* | *'*'* | *'?'* | *'['*)
++ echo "$0: invalid mode: $mode" >&2
++ exit 1;;
++ esac
++ shift;;
+
+ -o) chowncmd="$chownprog $2"
+- shift;;
++ shift;;
+
+ -s) stripcmd=$stripprog;;
+
+- -t)
+- is_target_a_directory=always
+- dst_arg=$2
+- # Protect names problematic for 'test' and other utilities.
+- case $dst_arg in
+- -* | [=\(\)!]) dst_arg=./$dst_arg;;
+- esac
+- shift;;
++ -t) dst_arg=$2
++ # Protect names problematic for 'test' and other utilities.
++ case $dst_arg in
++ -* | [=\(\)!]) dst_arg=./$dst_arg;;
++ esac
++ shift;;
+
+- -T) is_target_a_directory=never;;
++ -T) no_target_directory=true;;
+
+ --version) echo "$0 $scriptversion"; exit $?;;
+
+- --) shift
+- break;;
++ --) shift
++ break;;
+
+- -*) echo "$0: invalid option: $1" >&2
+- exit 1;;
++ -*) echo "$0: invalid option: $1" >&2
++ exit 1;;
+
+ *) break;;
+ esac
+ shift
+ done
+
+-# We allow the use of options -d and -T together, by making -d
+-# take the precedence; this is for compatibility with GNU install.
+-
+-if test -n "$dir_arg"; then
+- if test -n "$dst_arg"; then
+- echo "$0: target directory not allowed when installing a directory." >&2
+- exit 1
+- fi
+-fi
+-
+ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+ # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+@@ -204,15 +208,6 @@
+ fi
+
+ if test -z "$dir_arg"; then
+- if test $# -gt 1 || test "$is_target_a_directory" = always; then
+- if test ! -d "$dst_arg"; then
+- echo "$0: $dst_arg: Is not a directory." >&2
+- exit 1
+- fi
+- fi
+-fi
+-
+-if test -z "$dir_arg"; then
+ do_exit='(exit $ret); exit $ret'
+ trap "ret=129; $do_exit" 1
+ trap "ret=130; $do_exit" 2
+@@ -228,16 +223,16 @@
+
+ *[0-7])
+ if test -z "$stripcmd"; then
+- u_plus_rw=
++ u_plus_rw=
+ else
+- u_plus_rw='% 200'
++ u_plus_rw='% 200'
+ fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+ *)
+ if test -z "$stripcmd"; then
+- u_plus_rw=
++ u_plus_rw=
+ else
+- u_plus_rw=,u+rw
++ u_plus_rw=,u+rw
+ fi
+ cp_umask=$mode$u_plus_rw;;
+ esac
+@@ -387,51 +382,53 @@
+ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
+- /*) prefix='/';;
+- [-=\(\)!]*) prefix='./';;
+- *) prefix='';;
++ /*) prefix='/';;
++ [-=\(\)!]*) prefix='./';;
++ *) prefix='';;
+ esac
+
++ eval "$initialize_posix_glob"
++
+ oIFS=$IFS
+ IFS=/
+- set -f
++ $posix_glob set -f
+ set fnord $dstdir
+ shift
+- set +f
++ $posix_glob set +f
+ IFS=$oIFS
+
+ prefixes=
+
+ for d
+ do
+- test X"$d" = X && continue
++ test X"$d" = X && continue
+
+- prefix=$prefix$d
+- if test -d "$prefix"; then
+- prefixes=
+- else
+- if $posix_mkdir; then
+- (umask=$mkdir_umask &&
+- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+- # Don't fail if two instances are running concurrently.
+- test -d "$prefix" || exit 1
+- else
+- case $prefix in
+- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+- *) qprefix=$prefix;;
+- esac
+- prefixes="$prefixes '$qprefix'"
+- fi
+- fi
+- prefix=$prefix/
++ prefix=$prefix$d
++ if test -d "$prefix"; then
++ prefixes=
++ else
++ if $posix_mkdir; then
++ (umask=$mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
++ # Don't fail if two instances are running concurrently.
++ test -d "$prefix" || exit 1
++ else
++ case $prefix in
++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
++ *) qprefix=$prefix;;
++ esac
++ prefixes="$prefixes '$qprefix'"
++ fi
++ fi
++ prefix=$prefix/
+ done
+
+ if test -n "$prefixes"; then
+- # Don't fail if two instances are running concurrently.
+- (umask $mkdir_umask &&
+- eval "\$doit_exec \$mkdirprog $prefixes") ||
+- test -d "$dstdir" || exit 1
+- obsolete_mkdir_used=true
++ # Don't fail if two instances are running concurrently.
++ (umask $mkdir_umask &&
++ eval "\$doit_exec \$mkdirprog $prefixes") ||
++ test -d "$dstdir" || exit 1
++ obsolete_mkdir_used=true
+ fi
+ fi
+ fi
+@@ -466,12 +463,15 @@
+
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+- old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+- new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+- set -f &&
++ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
++ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
++
++ eval "$initialize_posix_glob" &&
++ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+- set +f &&
++ $posix_glob set +f &&
++
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+@@ -484,24 +484,24 @@
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+- # Now remove or move aside any old file at destination location.
+- # We try this two ways since rm can't unlink itself on some
+- # systems and the destination file might be busy for other
+- # reasons. In this case, the final cleanup might fail but the new
+- # file should still install successfully.
+- {
+- test ! -f "$dst" ||
+- $doit $rmcmd -f "$dst" 2>/dev/null ||
+- { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+- } ||
+- { echo "$0: cannot unlink or rename $dst" >&2
+- (exit 1); exit 1
+- }
+- } &&
++ # Now remove or move aside any old file at destination location.
++ # We try this two ways since rm can't unlink itself on some
++ # systems and the destination file might be busy for other
++ # reasons. In this case, the final cleanup might fail but the new
++ # file should still install successfully.
++ {
++ test ! -f "$dst" ||
++ $doit $rmcmd -f "$dst" 2>/dev/null ||
++ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
++ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
++ } ||
++ { echo "$0: cannot unlink or rename $dst" >&2
++ (exit 1); exit 1
++ }
++ } &&
+
+- # Now rename the file to the real destination.
+- $doit $mvcmd "$dsttmp" "$dst"
++ # Now rename the file to the real destination.
++ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
+
+@@ -513,6 +513,6 @@
+ # eval: (add-hook 'before-save-hook 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+-# time-stamp-time-zone: "UTC0"
++# time-stamp-time-zone: "UTC"
+ # time-stamp-end: "; # UTC"
+ # End:
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/libtool.m4 psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/libtool.m4
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/libtool.m4 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/libtool.m4 2020-07-16 10:48:35.455126918 +0200
+@@ -1,6 +1,8 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ #
+-# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # Written by Gordon Matzigkeit, 1996
+ #
+ # This file is free software; the Free Software Foundation gives
+@@ -8,30 +10,36 @@
+ # modifications, as long as this notice is preserved.
+
+ m4_define([_LT_COPYING], [dnl
+-# Copyright (C) 2014 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.
+-
+-# GNU Libtool is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of of the License, or
+-# (at your option) any later version.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
++# Written by Gordon Matzigkeit, 1996
++#
++# This file is part of GNU Libtool.
++#
++# GNU Libtool is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License as
++# published by the Free Software Foundation; either version 2 of
++# the License, or (at your option) any later version.
+ #
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program or library that is built
+-# using GNU Libtool, you may include this file under the same
+-# distribution terms that you use for the rest of that program.
++# As a special exception to the GNU General Public License,
++# if you distribute this file as part of a program or library that
++# is built using GNU Libtool, you may include this file under the
++# same distribution terms that you use for the rest of that program.
+ #
+-# GNU Libtool is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
++# GNU Libtool is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program. If not, see <http://www.gnu.org/licenses/>.
++# along with GNU Libtool; see the file COPYING. If not, a copy
++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
++# obtained by writing to the Free Software Foundation, Inc.,
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ ])
+
+-# serial 58 LT_INIT
++# serial 57 LT_INIT
+
+
+ # LT_PREREQ(VERSION)
+@@ -59,7 +67,7 @@
+ # LT_INIT([OPTIONS])
+ # ------------------
+ AC_DEFUN([LT_INIT],
+-[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
++[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+ AC_BEFORE([$0], [LT_LANG])dnl
+ AC_BEFORE([$0], [LT_OUTPUT])dnl
+@@ -83,7 +91,7 @@
+ _LT_SET_OPTIONS([$0], [$1])
+
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS=$ltmain
++LIBTOOL_DEPS="$ltmain"
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -103,43 +111,26 @@
+ dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+-# _LT_PREPARE_CC_BASENAME
+-# -----------------------
+-m4_defun([_LT_PREPARE_CC_BASENAME], [
+-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+-func_cc_basename ()
+-{
+- for cc_temp in @S|@*""; do
+- case $cc_temp in
+- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+- \-*) ;;
+- *) break;;
+- esac
+- done
+- func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+-}
+-])# _LT_PREPARE_CC_BASENAME
+-
+-
+ # _LT_CC_BASENAME(CC)
+ # -------------------
+-# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+-# but that macro is also expanded into generated libtool script, which
+-# arranges for $SED and $ECHO to be set by different means.
++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+ m4_defun([_LT_CC_BASENAME],
+-[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+-AC_REQUIRE([_LT_DECL_SED])dnl
+-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+-func_cc_basename $1
+-cc_basename=$func_cc_basename_result
++[for cc_temp in $1""; do
++ case $cc_temp in
++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+ ])
+
+
+ # _LT_FILEUTILS_DEFAULTS
+ # ----------------------
+ # It is okay to use these file commands and assume they have been set
+-# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
++# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+ m4_defun([_LT_FILEUTILS_DEFAULTS],
+ [: ${CP="cp -f"}
+ : ${MV="mv -f"}
+@@ -186,16 +177,15 @@
+ m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+ m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+ m4_require([_LT_WITH_SYSROOT])dnl
+-m4_require([_LT_CMD_TRUNCATE])dnl
+
+ _LT_CONFIG_LIBTOOL_INIT([
+-# See if we are running on zsh, and set the options that allow our
++# See if we are running on zsh, and set the options which allow our
+ # commands through without removal of \ escapes INIT.
+-if test -n "\${ZSH_VERSION+set}"; then
++if test -n "\${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+ ])
+-if test -n "${ZSH_VERSION+set}"; then
++if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+
+@@ -208,7 +198,7 @@
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+- if test set != "${COLLECT_NAMES+set}"; then
++ if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+@@ -219,14 +209,14 @@
+ ofile=libtool
+ can_build_shared=yes
+
+-# All known linkers require a '.a' archive for static linking (except MSVC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+
+-with_gnu_ld=$lt_cv_prog_gnu_ld
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+-old_CC=$CC
+-old_CFLAGS=$CFLAGS
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
+
+ # Set sane defaults for various variables
+ test -z "$CC" && CC=cc
+@@ -279,14 +269,14 @@
+
+ # _LT_PROG_LTMAIN
+ # ---------------
+-# Note that this code is called both from 'configure', and 'config.status'
++# Note that this code is called both from `configure', and `config.status'
+ # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
+-# 'config.status' has no value for ac_aux_dir unless we are using Automake,
++# `config.status' has no value for ac_aux_dir unless we are using Automake,
+ # so we pass a copy along to make sure it has a sensible value anyway.
+ m4_defun([_LT_PROG_LTMAIN],
+ [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+ _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+-ltmain=$ac_aux_dir/ltmain.sh
++ltmain="$ac_aux_dir/ltmain.sh"
+ ])# _LT_PROG_LTMAIN
+
+
+@@ -296,7 +286,7 @@
+
+ # So that we can recreate a full libtool script including additional
+ # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+-# in macros and then make a single call at the end using the 'libtool'
++# in macros and then make a single call at the end using the `libtool'
+ # label.
+
+
+@@ -431,8 +421,8 @@
+
+ # _LT_CONFIG_STATUS_DECLARE([VARNAME])
+ # ------------------------------------
+-# Quote a variable value, and forward it to 'config.status' so that its
+-# declaration there will have the same value as in 'configure'. VARNAME
++# Quote a variable value, and forward it to `config.status' so that its
++# declaration there will have the same value as in `configure'. VARNAME
+ # must have a single quote delimited value for this to work.
+ m4_define([_LT_CONFIG_STATUS_DECLARE],
+ [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+@@ -456,7 +446,7 @@
+ # Output comment and list of tags supported by the script
+ m4_defun([_LT_LIBTOOL_TAGS],
+ [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+-available_tags='_LT_TAGS'dnl
++available_tags="_LT_TAGS"dnl
+ ])
+
+
+@@ -484,7 +474,7 @@
+ # _LT_LIBTOOL_CONFIG_VARS
+ # -----------------------
+ # Produce commented declarations of non-tagged libtool config variables
+-# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
++# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+ # script. Tagged libtool config variables (even for the LIBTOOL CONFIG
+ # section) are produced by _LT_LIBTOOL_TAG_VARS.
+ m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+@@ -510,8 +500,8 @@
+ # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
+ # variables for single and double quote escaping we saved from calls
+ # to _LT_DECL, we can put quote escaped variables declarations
+-# into 'config.status', and then the shell code to quote escape them in
+-# for loops in 'config.status'. Finally, any additional code accumulated
++# into `config.status', and then the shell code to quote escape them in
++# for loops in `config.status'. Finally, any additional code accumulated
+ # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+ m4_defun([_LT_CONFIG_COMMANDS],
+ [AC_PROVIDE_IFELSE([LT_OUTPUT],
+@@ -557,7 +547,7 @@
+ ]], lt_decl_quote_varnames); do
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ *[[\\\\\\\`\\"\\\$]]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -570,7 +560,7 @@
+ ]], lt_decl_dquote_varnames); do
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ *[[\\\\\\\`\\"\\\$]]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -586,7 +576,7 @@
+ # Generate a child script FILE with all initialization necessary to
+ # reuse the environment learned by the parent script, and make the
+ # file executable. If COMMENT is supplied, it is inserted after the
+-# '#!' sequence but before initialization text begins. After this
++# `#!' sequence but before initialization text begins. After this
+ # macro, additional text can be appended to FILE to form the body of
+ # the child script. The macro ends with non-zero status if the
+ # file could not be fully written (such as if the disk is full).
+@@ -608,7 +598,7 @@
+ _AS_PREPARE
+ exec AS_MESSAGE_FD>&1
+ _ASEOF
+-test 0 = "$lt_write_fail" && chmod +x $1[]dnl
++test $lt_write_fail = 0 && chmod +x $1[]dnl
+ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+ # LT_OUTPUT
+@@ -631,7 +621,7 @@
+ } >&AS_MESSAGE_LOG_FD
+
+ lt_cl_help="\
+-'$as_me' creates a local libtool stub from the current configuration,
++\`$as_me' creates a local libtool stub from the current configuration,
+ for use in further configure time tests before the real libtool is
+ generated.
+
+@@ -653,7 +643,7 @@
+ This config.lt script is free software; the Free Software Foundation
+ gives unlimited permision to copy, distribute and modify it."
+
+-while test 0 != $[#]
++while test $[#] != 0
+ do
+ case $[1] in
+ --version | --v* | -V )
+@@ -666,10 +656,10 @@
+ lt_cl_silent=: ;;
+
+ -*) AC_MSG_ERROR([unrecognized option: $[1]
+-Try '$[0] --help' for more information.]) ;;
++Try \`$[0] --help' for more information.]) ;;
+
+ *) AC_MSG_ERROR([unrecognized argument: $[1]
+-Try '$[0] --help' for more information.]) ;;
++Try \`$[0] --help' for more information.]) ;;
+ esac
+ shift
+ done
+@@ -695,7 +685,7 @@
+ # open by configure. Here we exec the FD to /dev/null, effectively closing
+ # config.log, so it can be properly (re)opened and appended to by config.lt.
+ lt_cl_success=:
+-test yes = "$silent" &&
++test "$silent" = yes &&
+ lt_config_lt_args="$lt_config_lt_args --quiet"
+ exec AS_MESSAGE_LOG_FD>/dev/null
+ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+@@ -715,30 +705,27 @@
+ _LT_CONFIG_SAVE_COMMANDS([
+ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+ m4_if(_LT_TAG, [C], [
+- # See if we are running on zsh, and set the options that allow our
++ # See if we are running on zsh, and set the options which allow our
+ # commands through without removal of \ escapes.
+- if test -n "${ZSH_VERSION+set}"; then
++ if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+
+- cfgfile=${ofile}T
++ cfgfile="${ofile}T"
+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+ $RM "$cfgfile"
+
+ cat <<_LT_EOF >> "$cfgfile"
+ #! $SHELL
+-# Generated automatically by $as_me ($PACKAGE) $VERSION
+-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+-
+-# Provide generalized library-building support services.
+-# Written by Gordon Matzigkeit, 1996
+
++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
+ _LT_COPYING
+ _LT_LIBTOOL_TAGS
+
+-# Configured defaults for sys_lib_dlsearch_path munging.
+-: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+-
+ # ### BEGIN LIBTOOL CONFIG
+ _LT_LIBTOOL_CONFIG_VARS
+ _LT_LIBTOOL_TAG_VARS
+@@ -746,24 +733,13 @@
+
+ _LT_EOF
+
+- cat <<'_LT_EOF' >> "$cfgfile"
+-
+-# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+-
+-_LT_PREPARE_MUNGE_PATH_LIST
+-_LT_PREPARE_CC_BASENAME
+-
+-# ### END FUNCTIONS SHARED WITH CONFIGURE
+-
+-_LT_EOF
+-
+ case $host_os in
+ aix3*)
+ cat <<\_LT_EOF >> "$cfgfile"
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+-if test set != "${COLLECT_NAMES+set}"; then
++if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+@@ -780,6 +756,8 @@
+ sed '$q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
++ _LT_PROG_REPLACE_SHELLFNS
++
+ mv -f "$cfgfile" "$ofile" ||
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+ chmod +x "$ofile"
+@@ -797,6 +775,7 @@
+ [m4_if([$1], [], [
+ PACKAGE='$PACKAGE'
+ VERSION='$VERSION'
++ TIMESTAMP='$TIMESTAMP'
+ RM='$RM'
+ ofile='$ofile'], [])
+ ])dnl /_LT_CONFIG_SAVE_COMMANDS
+@@ -995,7 +974,7 @@
+
+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+ [lt_cv_apple_cc_single_mod=no
+- if test -z "$LT_MULTI_MODULE"; then
++ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+@@ -1013,7 +992,7 @@
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ # Otherwise, if the output was created with a 0 exit code from
+ # the compiler, it worked.
+- elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
++ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ lt_cv_apple_cc_single_mod=yes
+ else
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+@@ -1031,7 +1010,7 @@
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [lt_cv_ld_exported_symbols_list=yes],
+ [lt_cv_ld_exported_symbols_list=no])
+- LDFLAGS=$save_LDFLAGS
++ LDFLAGS="$save_LDFLAGS"
+ ])
+
+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+@@ -1053,7 +1032,7 @@
+ _lt_result=$?
+ if test -s conftest.err && $GREP force_load conftest.err; then
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+- elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
++ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+@@ -1063,32 +1042,32 @@
+ ])
+ case $host_os in
+ rhapsody* | darwin1.[[012]])
+- _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*) # darwin 5.x on
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+- 10.[[012]][[,.]]*)
+- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[[012]]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+- if test yes = "$lt_cv_apple_cc_single_mod"; then
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+- if test yes = "$lt_cv_ld_exported_symbols_list"; then
+- _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+- if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
++ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
+ else
+ _lt_dsymutil=
+@@ -1108,29 +1087,29 @@
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- if test yes = "$lt_cv_ld_force_load"; then
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++ if test "$lt_cv_ld_force_load" = "yes"; then
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ fi
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+- _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
++ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ case $cc_basename in
+- ifort*|nagfor*) _lt_dar_can_shared=yes ;;
++ ifort*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+- if test yes = "$_lt_dar_can_shared"; then
++ if test "$_lt_dar_can_shared" = "yes"; then
+ output_verbose_link_cmd=func_echo_all
+- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
++ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ m4_if([$1], [CXX],
+-[ if test yes != "$lt_cv_apple_cc_single_mod"; then
+- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
++[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ fi
+ ],[])
+ else
+@@ -1150,7 +1129,7 @@
+ # 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
+-if test set = "${lt_cv_aix_libpath+set}"; then
++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])],
+@@ -1168,7 +1147,7 @@
+ _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
++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+ fi
+ ])
+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+@@ -1188,8 +1167,8 @@
+ # -----------------------
+ # Find how we can fake an echo command that does not interpret backslash.
+ # In particular, with Autoconf 2.60 or later we add some code to the start
+-# of the generated configure script that will find a shell with a builtin
+-# printf (that we can use as an echo command).
++# of the generated configure script which will find a shell with a builtin
++# printf (which we can use as an echo command).
+ m4_defun([_LT_PROG_ECHO_BACKSLASH],
+ [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+@@ -1217,10 +1196,10 @@
+ # Invoke $ECHO with all args, space-separated.
+ func_echo_all ()
+ {
+- $ECHO "$*"
++ $ECHO "$*"
+ }
+
+-case $ECHO in
++case "$ECHO" in
+ printf*) AC_MSG_RESULT([printf]) ;;
+ print*) AC_MSG_RESULT([print -r]) ;;
+ *) AC_MSG_RESULT([cat]) ;;
+@@ -1246,17 +1225,16 @@
+ AC_DEFUN([_LT_WITH_SYSROOT],
+ [AC_MSG_CHECKING([for sysroot])
+ AC_ARG_WITH([sysroot],
+-[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+- [Search for dependent libraries within DIR (or the compiler's sysroot
+- if not specified).])],
++[ --with-sysroot[=DIR] Search for dependent libraries within DIR
++ (or the compiler's sysroot if not specified).],
+ [], [with_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_sysroot in #(
++case ${with_sysroot} in #(
+ yes)
+- if test yes = "$GCC"; then
++ if test "$GCC" = yes; then
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+ fi
+ ;; #(
+@@ -1266,14 +1244,14 @@
+ no|'')
+ ;; #(
+ *)
+- AC_MSG_RESULT([$with_sysroot])
++ AC_MSG_RESULT([${with_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 where our libraries should be installed.])])
++[dependent libraries, and in which our libraries should be installed.])])
+
+ # _LT_ENABLE_LOCK
+ # ---------------
+@@ -1281,33 +1259,31 @@
+ [AC_ARG_ENABLE([libtool-lock],
+ [AS_HELP_STRING([--disable-libtool-lock],
+ [avoid locking (might break parallel builds)])])
+-test no = "$enable_libtool_lock" || enable_libtool_lock=yes
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+ # Some flags need to be propagated to the compiler or linker for good
+ # libtool support.
+ case $host in
+ ia64-*-hpux*)
+- # Find out what ABI is being produced by ac_compile, and set mode
+- # options accordingly.
++ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *ELF-32*)
+- HPUX_IA64_MODE=32
++ HPUX_IA64_MODE="32"
+ ;;
+ *ELF-64*)
+- HPUX_IA64_MODE=64
++ HPUX_IA64_MODE="64"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ *-*-irix6*)
+- # Find out what ABI is being produced by ac_compile, and set linker
+- # options accordingly.
++ # Find out which ABI we are using.
+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+- if test yes = "$lt_cv_prog_gnu_ld"; then
++ if test "$lt_cv_prog_gnu_ld" = yes; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -melf32bsmip"
+@@ -1336,46 +1312,9 @@
+ rm -rf conftest*
+ ;;
+
+-mips64*-*linux*)
+- # Find out what ABI is being produced by ac_compile, and set linker
+- # options accordingly.
+- echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+- if AC_TRY_EVAL(ac_compile); then
+- emul=elf
+- case `/usr/bin/file conftest.$ac_objext` in
+- *32-bit*)
+- emul="${emul}32"
+- ;;
+- *64-bit*)
+- emul="${emul}64"
+- ;;
+- esac
+- case `/usr/bin/file conftest.$ac_objext` in
+- *MSB*)
+- emul="${emul}btsmip"
+- ;;
+- *LSB*)
+- emul="${emul}ltsmip"
+- ;;
+- esac
+- case `/usr/bin/file conftest.$ac_objext` in
+- *N32*)
+- emul="${emul}n32"
+- ;;
+- esac
+- LD="${LD-ld} -m $emul"
+- fi
+- rm -rf conftest*
+- ;;
+-
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+- # Find out what ABI is being produced by ac_compile, and set linker
+- # options accordingly. Note that the listed cases only cover the
+- # situations where additional linker options are needed (such as when
+- # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+- # vice versa); the common cases where no linker options are needed do
+- # not appear in the list.
++ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+@@ -1385,19 +1324,9 @@
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
+ x86_64-*linux*)
+- case `/usr/bin/file conftest.o` in
+- *x86-64*)
+- LD="${LD-ld} -m elf32_x86_64"
+- ;;
+- *)
+- LD="${LD-ld} -m elf_i386"
+- ;;
+- esac
+- ;;
+- powerpc64le-*linux*)
+- LD="${LD-ld} -m elf32lppclinux"
++ LD="${LD-ld} -m elf_i386"
+ ;;
+- powerpc64-*linux*)
++ ppc64-*linux*|powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+@@ -1416,10 +1345,7 @@
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+- powerpcle-*linux*)
+- LD="${LD-ld} -m elf64lppc"
+- ;;
+- powerpc-*linux*)
++ ppc*-*linux*|powerpc*-*linux*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*|s390*-*tpf*)
+@@ -1437,20 +1363,19 @@
+
+ *-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+- SAVE_CFLAGS=$CFLAGS
++ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+ [AC_LANG_PUSH(C)
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+ AC_LANG_POP])
+- if test yes != "$lt_cv_cc_needs_belf"; then
++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+- CFLAGS=$SAVE_CFLAGS
++ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+ *-*solaris*)
+- # Find out what ABI is being produced by ac_compile, and set linker
+- # options accordingly.
++ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+@@ -1458,7 +1383,7 @@
+ case $lt_cv_prog_gnu_ld in
+ yes*)
+ case $host in
+- i?86-*-solaris*|x86_64-*-solaris*)
++ i?86-*-solaris*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ sparc*-*-solaris*)
+@@ -1467,7 +1392,7 @@
+ esac
+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+- LD=${LD-ld}_sol2
++ LD="${LD-ld}_sol2"
+ fi
+ ;;
+ *)
+@@ -1483,7 +1408,7 @@
+ ;;
+ esac
+
+-need_locks=$enable_libtool_lock
++need_locks="$enable_libtool_lock"
+ ])# _LT_ENABLE_LOCK
+
+
+@@ -1502,11 +1427,11 @@
+ [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 0 -eq "$ac_status"; then
++ 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 0 -ne "$ac_status"; then
++ if test "$ac_status" -ne 0; then
+ lt_cv_ar_at_file=@
+ fi
+ fi
+@@ -1514,7 +1439,7 @@
+ ])
+ ])
+
+-if test no = "$lt_cv_ar_at_file"; then
++if test "x$lt_cv_ar_at_file" = xno; then
+ archiver_list_spec=
+ else
+ archiver_list_spec=$lt_cv_ar_at_file
+@@ -1545,7 +1470,7 @@
+
+ if test -n "$RANLIB"; then
+ case $host_os in
+- bitrig* | openbsd*)
++ openbsd*)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+ ;;
+ *)
+@@ -1581,7 +1506,7 @@
+ [$2=no
+ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+- lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment
++ lt_compiler_flag="$3"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+@@ -1608,7 +1533,7 @@
+ $RM conftest*
+ ])
+
+-if test yes = "[$]$2"; then
++if test x"[$]$2" = xyes; then
+ m4_if([$5], , :, [$5])
+ else
+ m4_if([$6], , :, [$6])
+@@ -1630,7 +1555,7 @@
+ m4_require([_LT_DECL_SED])dnl
+ AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+- save_LDFLAGS=$LDFLAGS
++ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $3"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+@@ -1649,10 +1574,10 @@
+ fi
+ fi
+ $RM -r conftest*
+- LDFLAGS=$save_LDFLAGS
++ LDFLAGS="$save_LDFLAGS"
+ ])
+
+-if test yes = "[$]$2"; then
++if test x"[$]$2" = xyes; then
+ m4_if([$4], , :, [$4])
+ else
+ m4_if([$5], , :, [$5])
+@@ -1673,7 +1598,7 @@
+ AC_MSG_CHECKING([the maximum length of command line arguments])
+ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+ i=0
+- teststring=ABCD
++ teststring="ABCD"
+
+ case $build_os in
+ msdosdjgpp*)
+@@ -1713,7 +1638,7 @@
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+- bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+@@ -1763,23 +1688,22 @@
+ ;;
+ *)
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+- if test -n "$lt_cv_sys_max_cmd_len" && \
+- test undefined != "$lt_cv_sys_max_cmd_len"; then
++ if test -n "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ # Make teststring a little bigger before we do anything with it.
+ # a 1K string should be a reasonable start.
+- for i in 1 2 3 4 5 6 7 8; do
++ for i in 1 2 3 4 5 6 7 8 ; do
+ teststring=$teststring$teststring
+ done
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+- while { test X`env echo "$teststring$teststring" 2>/dev/null` \
++ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+- test 17 != "$i" # 1/2 MB should be enough
++ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+@@ -1795,7 +1719,7 @@
+ ;;
+ esac
+ ])
+-if test -n "$lt_cv_sys_max_cmd_len"; then
++if test -n $lt_cv_sys_max_cmd_len ; then
+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+ else
+ AC_MSG_RESULT(none)
+@@ -1823,7 +1747,7 @@
+ # ----------------------------------------------------------------
+ m4_defun([_LT_TRY_DLOPEN_SELF],
+ [m4_require([_LT_HEADER_DLFCN])dnl
+-if test yes = "$cross_compiling"; then :
++if test "$cross_compiling" = yes; then :
+ [$4]
+ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+@@ -1870,9 +1794,9 @@
+ # endif
+ #endif
+
+-/* When -fvisibility=hidden is used, assume the code has been annotated
++/* 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))
++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+ int fnord () __attribute__((visibility("default")));
+ #endif
+
+@@ -1898,7 +1822,7 @@
+ return status;
+ }]
+ _LT_EOF
+- if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+@@ -1919,7 +1843,7 @@
+ # ------------------
+ AC_DEFUN([LT_SYS_DLOPEN_SELF],
+ [m4_require([_LT_HEADER_DLFCN])dnl
+-if test yes != "$enable_dlopen"; then
++if test "x$enable_dlopen" != xyes; then
+ enable_dlopen=unknown
+ enable_dlopen_self=unknown
+ enable_dlopen_self_static=unknown
+@@ -1929,52 +1853,44 @@
+
+ case $host_os in
+ beos*)
+- lt_cv_dlopen=load_add_on
++ lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ ;;
+
+ mingw* | pw32* | cegcc*)
+- lt_cv_dlopen=LoadLibrary
++ lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen_libs=
+ ;;
+
+ cygwin*)
+- lt_cv_dlopen=dlopen
++ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
+
+ darwin*)
+- # if libdl is installed we need to link against it
++ # if libdl is installed we need to link against it
+ AC_CHECK_LIB([dl], [dlopen],
+- [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+- lt_cv_dlopen=dyld
++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
++ lt_cv_dlopen="dyld"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ ])
+ ;;
+
+- tpf*)
+- # Don't try to run any link tests for TPF. We know it's impossible
+- # because TPF is a cross-compiler, and we know how we open DSOs.
+- lt_cv_dlopen=dlopen
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=no
+- ;;
+-
+ *)
+ AC_CHECK_FUNC([shl_load],
+- [lt_cv_dlopen=shl_load],
++ [lt_cv_dlopen="shl_load"],
+ [AC_CHECK_LIB([dld], [shl_load],
+- [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [AC_CHECK_FUNC([dlopen],
+- [lt_cv_dlopen=dlopen],
++ [lt_cv_dlopen="dlopen"],
+ [AC_CHECK_LIB([dl], [dlopen],
+- [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+ [AC_CHECK_LIB([svld], [dlopen],
+- [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [AC_CHECK_LIB([dld], [dld_link],
+- [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ ])
+ ])
+ ])
+@@ -1983,21 +1899,21 @@
+ ;;
+ esac
+
+- if test no = "$lt_cv_dlopen"; then
+- enable_dlopen=no
+- else
++ if test "x$lt_cv_dlopen" != xno; then
+ enable_dlopen=yes
++ else
++ enable_dlopen=no
+ fi
+
+ case $lt_cv_dlopen in
+ dlopen)
+- save_CPPFLAGS=$CPPFLAGS
+- test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++ save_CPPFLAGS="$CPPFLAGS"
++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+- save_LDFLAGS=$LDFLAGS
++ save_LDFLAGS="$LDFLAGS"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+- save_LIBS=$LIBS
++ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+
+ AC_CACHE_CHECK([whether a program can dlopen itself],
+@@ -2007,7 +1923,7 @@
+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+ ])
+
+- if test yes = "$lt_cv_dlopen_self"; then
++ if test "x$lt_cv_dlopen_self" = xyes; then
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+ lt_cv_dlopen_self_static, [dnl
+@@ -2017,9 +1933,9 @@
+ ])
+ fi
+
+- CPPFLAGS=$save_CPPFLAGS
+- LDFLAGS=$save_LDFLAGS
+- LIBS=$save_LIBS
++ CPPFLAGS="$save_CPPFLAGS"
++ LDFLAGS="$save_LDFLAGS"
++ LIBS="$save_LIBS"
+ ;;
+ esac
+
+@@ -2111,8 +2027,8 @@
+ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+ _LT_COMPILER_C_O([$1])
+
+-hard_links=nottested
+-if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
++hard_links="nottested"
++if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+ AC_MSG_CHECKING([if we can lock with hard links])
+ hard_links=yes
+@@ -2122,8 +2038,8 @@
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ AC_MSG_RESULT([$hard_links])
+- if test no = "$hard_links"; then
+- AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
++ if test "$hard_links" = no; then
++ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+ need_locks=warn
+ fi
+ else
+@@ -2150,8 +2066,8 @@
+ _LT_DECL([], [objdir], [0],
+ [The name of the directory that contains temporary libtool files])dnl
+ m4_pattern_allow([LT_OBJDIR])dnl
+-AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+- [Define to the sub-directory where libtool stores uninstalled libraries.])
++AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
++ [Define to the sub-directory in which libtool stores uninstalled libraries.])
+ ])# _LT_CHECK_OBJDIR
+
+
+@@ -2163,15 +2079,15 @@
+ _LT_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+ test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+- test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
++ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+ # We can hardcode non-existent directories.
+- if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
++ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+- ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+- test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
++ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+ # Linking always hardcodes the temporary library directory.
+ _LT_TAGVAR(hardcode_action, $1)=relink
+ else
+@@ -2185,12 +2101,12 @@
+ fi
+ AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+-if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+- test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
++if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
++ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+ # Fast installation is not supported
+ enable_fast_install=no
+-elif test yes = "$shlibpath_overrides_runpath" ||
+- test no = "$enable_shared"; then
++elif test "$shlibpath_overrides_runpath" = yes ||
++ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+ fi
+@@ -2214,7 +2130,7 @@
+ # FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+- if test -n "$STRIP"; then
++ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
+ AC_MSG_RESULT([yes])
+@@ -2232,47 +2148,6 @@
+ ])# _LT_CMD_STRIPLIB
+
+
+-# _LT_PREPARE_MUNGE_PATH_LIST
+-# ---------------------------
+-# Make sure func_munge_path_list() is defined correctly.
+-m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+-[[# func_munge_path_list VARIABLE PATH
+-# -----------------------------------
+-# VARIABLE is name of variable containing _space_ separated list of
+-# directories to be munged by the contents of PATH, which is string
+-# having a format:
+-# "DIR[:DIR]:"
+-# string "DIR[ DIR]" will be prepended to VARIABLE
+-# ":DIR[:DIR]"
+-# string "DIR[ DIR]" will be appended to VARIABLE
+-# "DIRP[:DIRP]::[DIRA:]DIRA"
+-# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+-# "DIRA[ DIRA]" will be appended to VARIABLE
+-# "DIR[:DIR]"
+-# VARIABLE will be replaced by "DIR[ DIR]"
+-func_munge_path_list ()
+-{
+- case x@S|@2 in
+- x)
+- ;;
+- *:)
+- eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+- ;;
+- x:*)
+- eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+- ;;
+- *::*)
+- eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+- eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+- ;;
+- *)
+- eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+- ;;
+- esac
+-}
+-]])# _LT_PREPARE_PATH_LIST
+-
+-
+ # _LT_SYS_DYNAMIC_LINKER([TAG])
+ # -----------------------------
+ # PORTME Fill in your ld.so characteristics
+@@ -2283,18 +2158,17 @@
+ m4_require([_LT_DECL_OBJDUMP])dnl
+ m4_require([_LT_DECL_SED])dnl
+ m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+-m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
+ AC_MSG_CHECKING([dynamic linker characteristics])
+ m4_if([$1],
+ [], [
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ case $host_os in
+- darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+- *) lt_awk_arg='/^libraries:/' ;;
++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+ case $host_os in
+- mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+- *) lt_sed_strip_eq='s|=/|/|g' ;;
++ mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
++ *) lt_sed_strip_eq="s,=/,/,g" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+ case $lt_search_path_spec in
+@@ -2310,35 +2184,28 @@
+ ;;
+ esac
+ # Ok, now we have the path, separated by spaces, we can step through it
+- # and add multilib dir if necessary...
++ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+- lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+- # ...but if some path component already ends with the multilib dir we assume
+- # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+- case "$lt_multi_os_dir; $lt_search_path_spec " in
+- "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+- lt_multi_os_dir=
+- ;;
+- esac
++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ for lt_sys_path in $lt_search_path_spec; do
+- if test -d "$lt_sys_path$lt_multi_os_dir"; then
+- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+- elif test -n "$lt_multi_os_dir"; then
++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++ else
+ test -d "$lt_sys_path" && \
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+-BEGIN {RS = " "; FS = "/|\n";} {
+- lt_foo = "";
+- lt_count = 0;
++BEGIN {RS=" "; FS="/|\n";} {
++ lt_foo="";
++ lt_count=0;
+ for (lt_i = NF; lt_i > 0; lt_i--) {
+ if ($lt_i != "" && $lt_i != ".") {
+ if ($lt_i == "..") {
+ lt_count++;
+ } else {
+ if (lt_count == 0) {
+- lt_foo = "/" $lt_i lt_foo;
++ lt_foo="/" $lt_i lt_foo;
+ } else {
+ lt_count--;
+ }
+@@ -2352,7 +2219,7 @@
+ # for these hosts.
+ case $host_os in
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+- $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
++ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+ esac
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+ else
+@@ -2361,7 +2228,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext_cmds=.so
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -2378,17 +2245,14 @@
+ # flags to be left without arguments
+ need_version=unknown
+
+-AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+-[User-defined run-time library search path.])
+-
+ case $host_os in
+ aix3*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+ # AIX 3 has no versioning support, so we append a major version to the name.
+- soname_spec='$libname$release$shared_ext$major'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+ aix[[4-9]]*)
+@@ -2396,91 +2260,41 @@
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 supports IA64
+- library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ else
+ # With GCC up to 2.95.x, collect2 would create an import file
+ # for dependence libraries. The import file would start with
+- # the line '#! .'. This would cause the generated library to
+- # depend on '.', always an invalid library. This was fixed in
++ # the line `#! .'. This would cause the generated library to
++ # depend on `.', always an invalid library. This was fixed in
+ # development snapshots of GCC prior to 3.0.
+ case $host_os in
+ aix4 | aix4.[[01]] | aix4.[[01]].*)
+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+ echo ' yes '
+- echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ :
+ else
+ can_build_shared=no
+ fi
+ ;;
+ esac
+- # Using Import Files as archive members, it is possible to support
+- # filename-based versioning of shared library archives on AIX. While
+- # this would work for both with and without runtime linking, it will
+- # prevent static linking of such archives. So we do filename-based
+- # shared library versioning with .so extension only, which is used
+- # when both runtime linking and shared linking is enabled.
+- # Unfortunately, runtime linking may impact performance, so we do
+- # not want this to be the default eventually. Also, we use the
+- # versioned .so libs for executables only if there is the -brtl
+- # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+- # To allow for filename-based versioning support, we need to create
+- # libNAME.so.V as an archive file, containing:
+- # *) an Import File, referring to the versioned filename of the
+- # archive as well as the shared archive member, telling the
+- # bitwidth (32 or 64) of that shared object, and providing the
+- # list of exported symbols of that shared object, eventually
+- # decorated with the 'weak' keyword
+- # *) the shared object with the F_LOADONLY flag set, to really avoid
+- # it being seen by the linker.
+- # At run time we better use the real file rather than another symlink,
+- # but for link time we create the symlink libNAME.so -> libNAME.so.V
+-
+- case $with_aix_soname,$aix_use_runtimelinking in
+- # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # soname into executable. Probably we can add versioning support to
+ # collect2, so additional links can be useful in future.
+- aix,yes) # traditional libtool
+- dynamic_linker='AIX unversionable lib.so'
++ if test "$aix_use_runtimelinking" = yes; then
+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+ # instead of lib<name>.a to let people know that these are not
+ # typical AIX shared libraries.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- ;;
+- aix,no) # traditional AIX only
+- dynamic_linker='AIX lib.a[(]lib.so.V[)]'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ else
+ # We preserve .a as extension for shared libraries through AIX4.2
+ # and later when we are not doing run time linking.
+- library_names_spec='$libname$release.a $libname.a'
+- soname_spec='$libname$release$shared_ext$major'
+- ;;
+- svr4,*) # full svr4 only
+- dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+- library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+- # We do not specify a path in Import Files, so LIBPATH fires.
+- shlibpath_overrides_runpath=yes
+- ;;
+- *,yes) # both, prefer svr4
+- dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+- library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+- # unpreferred sharedlib libNAME.a needs extra handling
+- postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+- postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+- # We do not specify a path in Import Files, so LIBPATH fires.
+- shlibpath_overrides_runpath=yes
+- ;;
+- *,no) # both, prefer aix
+- dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+- library_names_spec='$libname$release.a $libname.a'
+- soname_spec='$libname$release$shared_ext$major'
+- # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+- postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+- postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+- ;;
+- esac
++ library_names_spec='${libname}${release}.a $libname.a'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ fi
+ shlibpath_var=LIBPATH
+ fi
+ ;;
+@@ -2490,18 +2304,18 @@
+ powerpc)
+ # Since July 2007 AmigaOS4 officially supports .so libraries.
+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ ;;
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
+ ;;
+
+ beos*)
+- library_names_spec='$libname$shared_ext'
++ library_names_spec='${libname}${shared_ext}'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ ;;
+@@ -2509,8 +2323,8 @@
+ bsdi[[45]]*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+@@ -2522,7 +2336,7 @@
+
+ cygwin* | mingw* | pw32* | cegcc*)
+ version_type=windows
+- shrext_cmds=.dll
++ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+@@ -2531,8 +2345,8 @@
+ # gcc
+ library_names_spec='$libname.dll.a'
+ # 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'\''`~
++ 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~
+@@ -2548,17 +2362,17 @@
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+- soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ m4_if([$1], [],[
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+- soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
++ 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'
+@@ -2567,8 +2381,8 @@
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+- soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+- library_names_spec='$libname.dll.lib'
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++ library_names_spec='${libname}.dll.lib'
+
+ case $build_os in
+ mingw*)
+@@ -2595,7 +2409,7 @@
+ 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
++ 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'`
+@@ -2608,8 +2422,8 @@
+ 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'\''`~
++ 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'
+@@ -2622,7 +2436,7 @@
+
+ *)
+ # Assume MSVC wrapper
+- library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ dynamic_linker='Win32 ld.exe'
+ ;;
+ esac
+@@ -2635,8 +2449,8 @@
+ version_type=darwin
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+- soname_spec='$libname$release$major$shared_ext'
++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++ soname_spec='${libname}${release}${major}$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+@@ -2649,8 +2463,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+@@ -2668,13 +2482,12 @@
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+ freebsd-*)
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
+ ;;
+ esac
+@@ -2699,15 +2512,26 @@
+ esac
+ ;;
+
++gnu*)
++ version_type=linux # correct to gnu/linux during the next big refactor
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ haiku*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LIBRARY_PATH
+- shlibpath_overrides_runpath=no
++ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+@@ -2725,15 +2549,14 @@
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
+- if test 32 = "$HPUX_IA64_MODE"; then
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ if test "X$HPUX_IA64_MODE" = X32; then
+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+- sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+ else
+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+- sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+ fi
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
+ shrext_cmds='.sl'
+@@ -2741,8 +2564,8 @@
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+@@ -2751,8 +2574,8 @@
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+@@ -2765,8 +2588,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+@@ -2777,7 +2600,7 @@
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+ *)
+- if test yes = "$lt_cv_prog_gnu_ld"; then
++ if test "$lt_cv_prog_gnu_ld" = yes; then
+ version_type=linux # correct to gnu/linux during the next big refactor
+ else
+ version_type=irix
+@@ -2785,8 +2608,8 @@
+ esac
+ need_lib_prefix=no
+ need_version=no
+- soname_spec='$libname$release$shared_ext$major'
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ case $host_os in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+@@ -2805,8 +2628,8 @@
+ esac
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+ shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+- sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ hardcode_into_libs=yes
+ ;;
+
+@@ -2815,33 +2638,13 @@
+ dynamic_linker=no
+ ;;
+
+-linux*android*)
+- version_type=none # Android doesn't support versioned libraries.
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='$libname$release$shared_ext'
+- soname_spec='$libname$release$shared_ext'
+- finish_cmds=
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+-
+- # This implies no fast_install, which is unacceptable.
+- # Some rework will be needed to allow for fast_install
+- # before this can be enabled.
+- hardcode_into_libs=yes
+-
+- dynamic_linker='Android linker'
+- # Don't embed -rpath directories since the linker doesn't support them.
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- ;;
+-
+ # This must be glibc/ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+@@ -2866,15 +2669,14 @@
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # Ideally, we could use ldconfig to report *all* directores which are
+- # searched for libraries, however this is still not possible. Aside from not
+- # being certain /sbin/ldconfig is available, command
+- # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+- # even though it is searched at run-time. Try to do the best guess by
+- # appending ld.so.conf contents (and includes) to the search path.
++ # Add ABI-specific directories to the system library path.
++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
++
++ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -2891,12 +2693,12 @@
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -2906,7 +2708,7 @@
+
+ newsos6)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
+@@ -2915,68 +2717,58 @@
+ version_type=qnx
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='ldqnx.so'
+ ;;
+
+-openbsd* | bitrig*)
++openbsd*)
+ version_type=sunos
+- sys_lib_dlsearch_path_spec=/usr/lib
++ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+- need_version=no
+- else
+- need_version=yes
+- fi
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ case $host_os in
++ openbsd2.[[89]] | openbsd2.[[89]].*)
++ shlibpath_overrides_runpath=no
++ ;;
++ *)
++ shlibpath_overrides_runpath=yes
++ ;;
++ esac
++ else
++ shlibpath_overrides_runpath=yes
++ fi
+ ;;
+
+ os2*)
+ libname_spec='$name'
+- version_type=windows
+- shrext_cmds=.dll
+- need_version=no
++ shrext_cmds=".dll"
+ need_lib_prefix=no
+- # OS/2 can only load a DLL with a base name of 8 characters or less.
+- soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+- v=$($ECHO $release$versuffix | tr -d .-);
+- n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+- $ECHO $n$v`$shared_ext'
+- library_names_spec='${libname}_dll.$libext'
++ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+- shlibpath_var=BEGINLIBPATH
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+- 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~
+- chmod a+x \$dldir/$dlname~
+- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+- fi'
+- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+- dlpath=$dir/\$dldll~
+- $RM \$dlpath'
++ shlibpath_var=LIBPATH
+ ;;
+
+ osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+- soname_spec='$libname$release$shared_ext$major'
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+ rdos*)
+@@ -2987,8 +2779,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+@@ -2998,11 +2790,11 @@
+
+ sunos4*)
+ version_type=sunos
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+@@ -3010,8 +2802,8 @@
+
+ sysv4 | sysv4.3*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_vendor in
+ sni)
+@@ -3032,24 +2824,24 @@
+ ;;
+
+ sysv4*MP*)
+- if test -d /usr/nec; then
++ if test -d /usr/nec ;then
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+- soname_spec='$libname$shared_ext.$major'
++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+- version_type=sco
++ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+@@ -3067,7 +2859,7 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+@@ -3075,8 +2867,8 @@
+
+ uts4*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+@@ -3085,30 +2877,20 @@
+ ;;
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+-test no = "$dynamic_linker" && can_build_shared=no
++test "$dynamic_linker" = no && can_build_shared=no
+
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+
+-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+- sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ fi
+-
+-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+- sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+ fi
+
+-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+-
+-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+-
+-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+-
+ _LT_DECL([], [variables_saved_for_relink], [1],
+ [Variables whose values should be saved in libtool wrapper scripts and
+ restored at link time])
+@@ -3141,41 +2923,39 @@
+ [Whether we should hardcode library paths into libraries])
+ _LT_DECL([], [sys_lib_search_path_spec], [2],
+ [Compile-time system search path for libraries])
+-_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+- [Detected run-time system search path for libraries])
+-_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+- [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
++_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
++ [Run-time system search path for libraries])
+ ])# _LT_SYS_DYNAMIC_LINKER
+
+
+ # _LT_PATH_TOOL_PREFIX(TOOL)
+ # --------------------------
+-# find a file program that can recognize shared library
++# find a file program which can recognize shared library
+ AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+ [m4_require([_LT_DECL_EGREP])dnl
+ AC_MSG_CHECKING([for $1])
+ AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+ [case $MAGIC_CMD in
+ [[\\/*] | ?:[\\/]*])
+- lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ ;;
+ *)
+- lt_save_MAGIC_CMD=$MAGIC_CMD
+- lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++ lt_save_MAGIC_CMD="$MAGIC_CMD"
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ dnl $ac_dummy forces splitting on constant user-supplied paths.
+ dnl POSIX.2 word splitting is done only on the output of word expansions,
+ dnl not every word. This closes a longstanding sh security hole.
+ ac_dummy="m4_if([$2], , $PATH, [$2])"
+ for ac_dir in $ac_dummy; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+- if test -f "$ac_dir/$1"; then
+- lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
++ if test -f $ac_dir/$1; then
++ lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+- MAGIC_CMD=$lt_cv_path_MAGIC_CMD
++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ :
+@@ -3198,11 +2978,11 @@
+ break
+ fi
+ done
+- IFS=$lt_save_ifs
+- MAGIC_CMD=$lt_save_MAGIC_CMD
++ IFS="$lt_save_ifs"
++ MAGIC_CMD="$lt_save_MAGIC_CMD"
+ ;;
+ esac])
+-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+ AC_MSG_RESULT($MAGIC_CMD)
+ else
+@@ -3220,7 +3000,7 @@
+
+ # _LT_PATH_MAGIC
+ # --------------
+-# find a file program that can recognize a shared library
++# find a file program which can recognize a shared library
+ m4_defun([_LT_PATH_MAGIC],
+ [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+@@ -3247,16 +3027,16 @@
+ AC_ARG_WITH([gnu-ld],
+ [AS_HELP_STRING([--with-gnu-ld],
+ [assume the C compiler uses GNU ld @<:@default=no@:>@])],
+- [test no = "$withval" || with_gnu_ld=yes],
++ [test "$withval" = no || with_gnu_ld=yes],
+ [with_gnu_ld=no])dnl
+
+ ac_prog=ld
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ AC_MSG_CHECKING([for ld used by $CC])
+ case $host in
+ *-*-mingw*)
+- # gcc leaves a trailing carriage return, which upsets mingw
++ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+@@ -3270,7 +3050,7 @@
+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+ done
+- test -z "$LD" && LD=$ac_prog
++ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+@@ -3281,37 +3061,37 @@
+ with_gnu_ld=unknown
+ ;;
+ esac
+-elif test yes = "$with_gnu_ld"; then
++elif test "$with_gnu_ld" = yes; then
+ AC_MSG_CHECKING([for GNU ld])
+ else
+ AC_MSG_CHECKING([for non-GNU ld])
+ fi
+ AC_CACHE_VAL(lt_cv_path_LD,
+ [if test -z "$LD"; then
+- lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+- lt_cv_path_LD=$ac_dir/$ac_prog
++ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+- test no != "$with_gnu_ld" && break
++ test "$with_gnu_ld" != no && break
+ ;;
+ *)
+- test yes != "$with_gnu_ld" && break
++ test "$with_gnu_ld" != yes && break
+ ;;
+ esac
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ else
+- lt_cv_path_LD=$LD # Let the user override the test with a path.
++ lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ fi])
+-LD=$lt_cv_path_LD
++LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+ AC_MSG_RESULT($LD)
+ else
+@@ -3365,13 +3145,13 @@
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+- if test yes != "$GCC"; then
++ if test "$GCC" != yes; then
+ reload_cmds=false
+ fi
+ ;;
+ darwin*)
+- if test yes = "$GCC"; then
+- reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
++ if test "$GCC" = yes; then
++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ else
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ fi
+@@ -3382,43 +3162,6 @@
+ ])# _LT_CMD_RELOAD
+
+
+-# _LT_PATH_DD
+-# -----------
+-# find a working dd
+-m4_defun([_LT_PATH_DD],
+-[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+-[printf 0123456789abcdef0123456789abcdef >conftest.i
+-cat conftest.i conftest.i >conftest2.i
+-: ${lt_DD:=$DD}
+-AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+-[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+- cmp -s conftest.i conftest.out \
+- && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+-fi])
+-rm -f conftest.i conftest2.i conftest.out])
+-])# _LT_PATH_DD
+-
+-
+-# _LT_CMD_TRUNCATE
+-# ----------------
+-# find command to truncate a binary pipe
+-m4_defun([_LT_CMD_TRUNCATE],
+-[m4_require([_LT_PATH_DD])
+-AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+-[printf 0123456789abcdef0123456789abcdef >conftest.i
+-cat conftest.i conftest.i >conftest2.i
+-lt_cv_truncate_bin=
+-if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+- cmp -s conftest.i conftest.out \
+- && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+-fi
+-rm -f conftest.i conftest2.i conftest.out
+-test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+-_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+- [Command to truncate a binary pipe])
+-])# _LT_CMD_TRUNCATE
+-
+-
+ # _LT_CHECK_MAGIC_METHOD
+ # ----------------------
+ # how to check for library dependencies
+@@ -3434,13 +3177,13 @@
+ # Need to set the preceding variable on all platforms that support
+ # interlibrary dependencies.
+ # 'none' -- dependencies not supported.
+-# 'unknown' -- same as none, but documents that we really don't know.
++# `unknown' -- same as none, but documents that we really don't know.
+ # 'pass_all' -- all dependencies passed with no checks.
+ # 'test_compile' -- check by making test program.
+ # 'file_magic [[regex]]' -- check by looking for files in library path
+-# that responds to the $file_magic_cmd with a given extended regex.
+-# If you have 'file' or equivalent on your system and you're not sure
+-# whether 'pass_all' will *always* work, you probably want this one.
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+ aix[[4-9]]*)
+@@ -3467,7 +3210,8 @@
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+- if ( file / ) >/dev/null 2>&1; then
++ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
++ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+@@ -3503,6 +3247,10 @@
+ fi
+ ;;
+
++gnu*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
+ haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+@@ -3541,7 +3289,7 @@
+ ;;
+
+ # This must be glibc/ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -3563,8 +3311,8 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-openbsd* | bitrig*)
+- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++openbsd*)
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+@@ -3617,9 +3365,6 @@
+ tpf*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+-os2*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+ esac
+ ])
+
+@@ -3660,38 +3405,33 @@
+ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+ [if test -n "$NM"; then
+ # Let the user override the test.
+- lt_cv_path_NM=$NM
++ lt_cv_path_NM="$NM"
+ else
+- lt_nm_to_check=${ac_tool_prefix}nm
++ lt_nm_to_check="${ac_tool_prefix}nm"
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
+- lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+- tmp_nm=$ac_dir/$lt_tmp_nm
+- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
++ tmp_nm="$ac_dir/$lt_tmp_nm"
++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ # Check to see if the nm accepts a BSD-compat flag.
+- # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
++ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # nm: unknown option "B" ignored
+ # Tru64's nm complains that /dev/null is an invalid object file
+- # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+- case $build_os in
+- mingw*) lt_bad_file=conftest.nm/nofile ;;
+- *) lt_bad_file=/dev/null ;;
+- esac
+- case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+- *$lt_bad_file* | *'Invalid file or object type'*)
++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++ */dev/null* | *'Invalid file or object type'*)
+ lt_cv_path_NM="$tmp_nm -B"
+- break 2
++ break
+ ;;
+ *)
+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+ */dev/null*)
+ lt_cv_path_NM="$tmp_nm -p"
+- break 2
++ break
+ ;;
+ *)
+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+@@ -3702,21 +3442,21 @@
+ esac
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ done
+ : ${lt_cv_path_NM=no}
+ fi])
+-if test no != "$lt_cv_path_NM"; then
+- NM=$lt_cv_path_NM
++if test "$lt_cv_path_NM" != "no"; then
++ NM="$lt_cv_path_NM"
+ else
+ # Didn't find any BSD compatible name lister, look for dumpbin.
+ if test -n "$DUMPBIN"; then :
+ # Let the user override the test.
+ else
+ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+- case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
++ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ *COFF*)
+- DUMPBIN="$DUMPBIN -symbols -headers"
++ DUMPBIN="$DUMPBIN -symbols"
+ ;;
+ *)
+ DUMPBIN=:
+@@ -3724,8 +3464,8 @@
+ esac
+ fi
+ AC_SUBST([DUMPBIN])
+- if test : != "$DUMPBIN"; then
+- NM=$DUMPBIN
++ if test "$DUMPBIN" != ":"; then
++ NM="$DUMPBIN"
+ fi
+ fi
+ test -z "$NM" && NM=nm
+@@ -3771,8 +3511,8 @@
+
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+- # two different shell functions defined in ltmain.sh;
+- # decide which one to use based on capabilities of $DLLTOOL
++ # 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
+@@ -3784,7 +3524,7 @@
+ ;;
+ *)
+ # fallback: assume linklib IS sharedlib
+- lt_cv_sharedlib_from_linklib_cmd=$ECHO
++ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ ;;
+ esac
+ ])
+@@ -3811,28 +3551,13 @@
+ lt_cv_path_mainfest_tool=yes
+ fi
+ rm -f conftest*])
+-if test yes != "$lt_cv_path_mainfest_tool"; then
++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_DLL_DEF_P([FILE])
+-# ---------------------
+-# True iff FILE is a Windows DLL '.def' file.
+-# Keep in sync with func_dll_def_p in the libtool script
+-AC_DEFUN([_LT_DLL_DEF_P],
+-[dnl
+- test DEF = "`$SED -n dnl
+- -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace
+- -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments
+- -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl
+- -e q dnl Only consider the first "real" line
+- $1`" dnl
+-])# _LT_DLL_DEF_P
+-
+-
+ # LT_LIB_M
+ # --------
+ # check for math library
+@@ -3844,11 +3569,11 @@
+ # These system don't have libm, or don't need it
+ ;;
+ *-ncr-sysv4.3*)
+- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
++ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+ ;;
+ *)
+- AC_CHECK_LIB(m, cos, LIBM=-lm)
++ AC_CHECK_LIB(m, cos, LIBM="-lm")
+ ;;
+ esac
+ AC_SUBST([LIBM])
+@@ -3867,7 +3592,7 @@
+
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ case $cc_basename in
+ nvcc*)
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+@@ -3919,7 +3644,7 @@
+ symcode='[[ABCDGISTW]]'
+ ;;
+ hpux*)
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ symcode='[[ABCDEGRST]]'
+ fi
+ ;;
+@@ -3952,44 +3677,14 @@
+ symcode='[[ABCDGIRSTW]]' ;;
+ esac
+
+-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+- # Gets list of data symbols to import.
+- lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+- # Adjust the below global symbol transforms to fixup imported variables.
+- lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+- lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+- lt_c_name_lib_hook="\
+- -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+- -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+-else
+- # Disable hooks by default.
+- lt_cv_sys_global_symbol_to_import=
+- lt_cdecl_hook=
+- lt_c_name_hook=
+- lt_c_name_lib_hook=
+-fi
+-
+ # Transform an extracted symbol line into a proper C declaration.
+ # Some systems (esp. on ia64) link data and code symbols differently,
+ # so use this general approach.
+-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+-$lt_cdecl_hook\
+-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
++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"\
+-$lt_c_name_hook\
+-" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+-" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+-
+-# Transform an extracted symbol line into symbol name with lib prefix and
+-# symbol address.
+-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+-$lt_c_name_lib_hook\
+-" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+-" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+-" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/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=
+@@ -4007,24 +3702,21 @@
+
+ # Write the raw and C identifiers.
+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+- # Fake it for dumpbin and say T for any non-static function,
+- # D for any global variable and I for any imported variable.
++ # Fake it for dumpbin and say T for any non-static function
++ # and D for any global variable.
+ # Also find C++ and __fastcall symbols from MSVC++,
+ # which start with @ or ?.
+ lt_cv_sys_global_symbol_pipe="$AWK ['"\
+ " {last_section=section; section=\$ 3};"\
+ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+-" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+-" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+-" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+ " \$ 0!~/External *\|/{next};"\
+ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+ " {if(hide[section]) next};"\
+-" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+-" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+-" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+-" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
++" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
++" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
++" s[1]~/^[@?]/{print s[1], s[1]; next};"\
++" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+ " ' prfx=^$ac_symprfx]"
+ else
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+@@ -4064,11 +3756,11 @@
+ 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 can't be const, because runtime
++#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__
++#elif defined(__osf__)
+ /* This system does not cope well with relocations in const data. */
+ # define LT@&t@_DLSYM_CONST
+ #else
+@@ -4094,7 +3786,7 @@
+ {
+ { "@PROGRAM@", (void *) 0 },
+ _LT_EOF
+- $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ cat <<\_LT_EOF >> conftest.$ac_ext
+ {0, (void *) 0}
+ };
+@@ -4114,9 +3806,9 @@
+ mv conftest.$ac_objext conftstm.$ac_objext
+ lt_globsym_save_LIBS=$LIBS
+ lt_globsym_save_CFLAGS=$CFLAGS
+- LIBS=conftstm.$ac_objext
++ 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
++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+ pipe_works=yes
+ fi
+ LIBS=$lt_globsym_save_LIBS
+@@ -4137,7 +3829,7 @@
+ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+- if test yes = "$pipe_works"; then
++ if test "$pipe_works" = yes; then
+ break
+ else
+ lt_cv_sys_global_symbol_pipe=
+@@ -4164,16 +3856,12 @@
+ [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],
+ [Transform the output of nm in a proper C declaration])
+-_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+- [Transform the output of nm into a list of symbols to manually relocate])
+ _LT_DECL([global_symbol_to_c_name_address],
+ [lt_cv_sys_global_symbol_to_c_name_address], [1],
+ [Transform the output of nm in a C name address pair])
+ _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_interface], [lt_cv_nm_interface], [1],
+- [The name lister interface])
+ _LT_DECL([], [nm_file_list_spec], [1],
+ [Specify filename containing input files for $NM])
+ ]) # _LT_CMD_GLOBAL_SYMBOLS
+@@ -4189,18 +3877,17 @@
+
+ m4_if([$1], [CXX], [
+ # C++ specific cases for pic, static, wl, etc.
+- if test yes = "$GXX"; then
++ if test "$GXX" = yes; then
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+
+ amigaos*)
+@@ -4211,8 +3898,8 @@
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+- # adding the '-m68020' flag to GCC prevents building anything better,
+- # like '-m68040'.
++ # adding the `-m68020' flag to GCC prevents building anything better,
++ # like `-m68040'.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
+@@ -4228,11 +3915,6 @@
+ # (--disable-auto-import) libraries
+ m4_if([$1], [GCJ], [],
+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+- case $host_os in
+- os2*)
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+- ;;
+- esac
+ ;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+@@ -4282,7 +3964,7 @@
+ case $host_os in
+ aix[[4-9]]*)
+ # All AIX code is PIC.
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ else
+@@ -4323,14 +4005,14 @@
+ case $cc_basename in
+ CC*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+- if test ia64 != "$host_cpu"; then
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++ if test "$host_cpu" != ia64; then
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ fi
+ ;;
+ aCC*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+@@ -4359,7 +4041,7 @@
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -4367,7 +4049,7 @@
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ ecpc* )
+- # old Intel C++ for x86_64, which still supported -KPIC.
++ # old Intel C++ for x86_64 which still supported -KPIC.
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+@@ -4512,18 +4194,17 @@
+ fi
+ ],
+ [
+- if test yes = "$GCC"; then
++ if test "$GCC" = yes; then
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+
+ amigaos*)
+@@ -4534,8 +4215,8 @@
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+- # adding the '-m68020' flag to GCC prevents building anything better,
+- # like '-m68040'.
++ # adding the `-m68020' flag to GCC prevents building anything better,
++ # like `-m68040'.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
+@@ -4552,11 +4233,6 @@
+ # (--disable-auto-import) libraries
+ m4_if([$1], [GCJ], [],
+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+- case $host_os in
+- os2*)
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+- ;;
+- esac
+ ;;
+
+ darwin* | rhapsody*)
+@@ -4627,7 +4303,7 @@
+ case $host_os in
+ aix*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ else
+@@ -4635,30 +4311,11 @@
+ fi
+ ;;
+
+- darwin* | rhapsody*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+- case $cc_basename in
+- 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'
+- ;;
+- esac
+- ;;
+-
+ mingw* | cygwin* | pw32* | os2* | 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'])
+- case $host_os in
+- os2*)
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+- ;;
+- esac
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -4674,7 +4331,7 @@
+ ;;
+ esac
+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+@@ -4683,9 +4340,9 @@
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+- # old Intel for x86_64, which still supported -KPIC.
++ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+@@ -4710,12 +4367,6 @@
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+- tcc*)
+- # Fabrice Bellard et al's Tiny C Compiler
+- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+- ;;
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+@@ -4813,7 +4464,7 @@
+ ;;
+
+ sysv4*MP*)
+- if test -d /usr/nec; then
++ if test -d /usr/nec ;then
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+@@ -4842,7 +4493,7 @@
+ fi
+ ])
+ case $host_os in
+- # For platforms that do not support PIC, -DPIC is meaningless:
++ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
+@@ -4908,21 +4559,17 @@
+ case $host_os in
+ aix[[4-9]]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+- # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+- # Without the "-l" option, or with the "-B" option, AIX nm treats
+- # weak defined symbols like other global defined symbols, whereas
+- # GNU nm marks them as "W".
+- # While the 'weak' keyword is ignored in the Export File, we need
+- # it in the Import File for the 'aix-soname' feature, so we have
+- # to replace the "-B" option with "-P" for AIX nm.
++ # -C means demangle to AIX nm, but means don't demangle with GNU nm
++ # Also, AIX nm treats weak defined symbols like other global defined
++ # symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+- _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+ ;;
+ pw32*)
+- _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
++ _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
+ cygwin* | mingw* | cegcc*)
+ case $cc_basename in
+@@ -4968,9 +4615,9 @@
+ # included in the symbol list
+ _LT_TAGVAR(include_expsyms, $1)=
+ # exclude_expsyms can be an extended regexp of symbols to exclude
+- # it will be wrapped by ' (' and ')$', so one must not match beginning or
+- # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+- # as well as any symbol that contains 'd'.
++ # it will be wrapped by ` (' and `)$', so one must not match beginning or
++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++ # as well as any symbol that contains `d'.
+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+@@ -4986,7 +4633,7 @@
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+- if test yes != "$GCC"; then
++ if test "$GCC" != yes; then
+ with_gnu_ld=no
+ fi
+ ;;
+@@ -4994,7 +4641,7 @@
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
+- openbsd* | bitrig*)
++ openbsd*)
+ with_gnu_ld=no
+ ;;
+ esac
+@@ -5004,7 +4651,7 @@
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+@@ -5026,24 +4673,24 @@
+ esac
+ fi
+
+- if test yes = "$lt_use_gnu_ld_interface"; then
++ if test "$lt_use_gnu_ld_interface" = yes; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+- wlarc='$wl'
++ wlarc='${wl}'
+
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+- _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ supports_anon_versioning=no
+- case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
++ case `$LD -v 2>&1` in
+ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+@@ -5056,7 +4703,7 @@
+ case $host_os in
+ aix[[3-9]]*)
+ # On AIX/PPC, the GNU linker is very broken
+- if test ia64 != "$host_cpu"; then
++ if test "$host_cpu" != ia64; then
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
+
+@@ -5075,7 +4722,7 @@
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)=''
+ ;;
+ m68k)
+@@ -5091,7 +4738,7 @@
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -5101,7 +4748,7 @@
+ # _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(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
+@@ -5109,89 +4756,61 @@
+ _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'
+- # If the export-symbols file already is a .def file, use it as
+- # is; otherwise, prepend EXPORTS...
+- _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); 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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ _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'
++ # 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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ haiku*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- os2*)
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_TAGVAR(hardcode_minus_L, $1)=yes
+- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+- shrext_cmds=.dll
+- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- prefix_cmds="$SED"~
+- if test EXPORTS = "`$SED 1q $export_symbols`"; then
+- prefix_cmds="$prefix_cmds -e 1d";
+- fi~
+- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- ;;
+-
+ interix[[3-9]]*)
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+- if test linux-dietlibc = "$host_os"; then
++ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
+ esac
+ fi
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+- && test no = "$tmp_diet"
++ && test "$tmp_diet" = no
+ then
+ tmp_addflag=' $pic_flag'
+ tmp_sharedflag='-shared'
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+ pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group f77 and f90 compilers
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+@@ -5202,47 +4821,42 @@
+ lf95*) # Lahey Fortran 8.1
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ tmp_sharedflag='--shared' ;;
+- nagfor*) # NAGFOR 5.3
+- tmp_sharedflag='-Wl,-shared' ;;
+ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
+ nvcc*) # Cuda Compiler Driver 2.2
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
+ ;;
+ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ esac
+- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+- if test yes = "$supports_anon_versioning"; then
++ 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~
+- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+
+ case $cc_basename in
+- tcc*)
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+- ;;
+ xlf* | bgf* | bgxlf* | mpixlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+- if test yes = "$supports_anon_versioning"; then
++ 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 $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ echo "local: *; };" >> $output_objdir/$libname.ver~
++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
+@@ -5256,8 +4870,8 @@
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+ else
+- _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'
++ _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
+ ;;
+
+@@ -5275,8 +4889,8 @@
+
+ _LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- _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'
++ _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
+@@ -5288,7 +4902,7 @@
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
+
+-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+ *** reliably create shared libraries on SCO systems. Therefore, libtool
+ *** is disabling shared libraries support. We urge you to upgrade GNU
+ *** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+@@ -5303,9 +4917,9 @@
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+- _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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _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'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -5322,15 +4936,15 @@
+
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- _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'
++ _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
+ ;;
+ esac
+
+- if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
++ if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+ runpath_var=
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+@@ -5346,7 +4960,7 @@
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+- if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ _LT_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -5354,57 +4968,34 @@
+ ;;
+
+ aix[[4-9]]*)
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+- no_entry_flag=
++ no_entry_flag=""
+ else
+ # If we're using GNU nm, then we don't want the "-C" option.
+- # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+- # Without the "-l" option, or with the "-B" option, AIX nm treats
+- # weak defined symbols like other global defined symbols, whereas
+- # GNU nm marks them as "W".
+- # While the 'weak' keyword is ignored in the Export File, we need
+- # it in the Import File for the 'aix-soname' feature, so we have
+- # to replace the "-B" option with "-P" for AIX nm.
++ # -C means demangle to AIX nm, but means don't demangle with GNU nm
++ # Also, AIX nm treats weak defined symbols like other global
++ # defined symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+- _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+- # have runtime linking enabled, and use it for executables.
+- # For shared libraries, we enable/disable runtime linking
+- # depending on the kind of the shared library created -
+- # when "with_aix_soname,aix_use_runtimelinking" is:
+- # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+- # "aix,yes" lib.so shared, rtl:yes, for executables
+- # lib.a static archive
+- # "both,no" lib.so.V(shr.o) shared, rtl:yes
+- # lib.a(lib.so.V) shared, rtl:no, for executables
+- # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+- # lib.a(lib.so.V) shared, rtl:no
+- # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+- # lib.a static archive
++ # need to do runtime linking.
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+- if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
+ done
+- if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+- # With aix-soname=svr4, we create the lib.so.V shared archives only,
+- # so we don't have lib.a shared libs to link our executables.
+- # We have to force runtime linking in this case.
+- aix_use_runtimelinking=yes
+- LDFLAGS="$LDFLAGS -Wl,-brtl"
+- fi
+ ;;
+ esac
+
+@@ -5423,21 +5014,13 @@
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+- _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+- case $with_aix_soname,$aix_use_runtimelinking in
+- aix,*) ;; # traditional, no import file
+- svr4,* | *,yes) # use import file
+- # The Import File defines what to hardcode.
+- _LT_TAGVAR(hardcode_direct, $1)=no
+- _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+- ;;
+- esac
++ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+- if test yes = "$GCC"; then
++ if test "$GCC" = yes; then
+ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+- collect2name=`$CC -print-prog-name=collect2`
++ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+ then
+@@ -5456,80 +5039,61 @@
+ ;;
+ esac
+ shared_flag='-shared'
+- if test yes = "$aix_use_runtimelinking"; then
+- shared_flag="$shared_flag "'$wl-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
+ fi
+- # Need to ensure runtime linking is disabled for the traditional
+- # shared library, or the linker may eventually find shared libraries
+- # /with/ Import File - we do not want to mix them.
+- shared_flag_aix='-shared'
+- shared_flag_svr4='-shared $wl-G'
+ else
+ # not using gcc
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+- if test yes = "$aix_use_runtimelinking"; then
+- shared_flag='$wl-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag='${wl}-G'
+ else
+- shared_flag='$wl-bM:SRE'
++ shared_flag='${wl}-bM:SRE'
+ fi
+- shared_flag_aix='$wl-bM:SRE'
+- shared_flag_svr4='$wl-G'
+ fi
+ fi
+
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+- if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
++ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ _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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
++ _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
+- if test ia64 = "$host_cpu"; then
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
++ if test "$host_cpu" = ia64; then
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ _LT_SYS_MODULE_PATH_AIX([$1])
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
++ _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.
+- _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+- _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+- if test yes = "$with_gnu_ld"; then
++ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+- # -brtl affects multiple linker settings, -berok does not and is overridden later
+- compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+- if test svr4 != "$with_aix_soname"; then
+- # This is similar to how AIX traditionally builds its shared libraries.
+- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+- fi
+- if test aix != "$with_aix_soname"; then
+- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+- else
+- # used by -dlpreopen to get the symbols
+- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+- fi
+- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
++ # This is similar to how AIX traditionally builds its shared libraries.
++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+@@ -5538,7 +5102,7 @@
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)=''
+ ;;
+ m68k)
+@@ -5568,17 +5132,16 @@
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=.dll
++ 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,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+- _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+- cp "$export_symbols" "$output_objdir/$soname.def";
+- echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+- else
+- $SED -e '\''s/^/-link -EXPORT:/'\'' < $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='
++ _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
+@@ -5587,18 +5150,18 @@
+ # 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'
++ 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
+@@ -5607,7 +5170,7 @@
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=.dll
++ 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.
+@@ -5657,33 +5220,33 @@
+ ;;
+
+ hpux9*)
+- if test yes = "$GCC"; then
+- _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 "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
++ if test "$GCC" = yes; then
++ _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 "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
++ _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
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+
+ hpux10*)
+- if test yes,no = "$GCC,$with_gnu_ld"; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++ _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
+- if test no = "$with_gnu_ld"; then
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
++ if test "$with_gnu_ld" = no; then
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+@@ -5691,25 +5254,25 @@
+ ;;
+
+ hpux11*)
+- if test yes,no = "$GCC,$with_gnu_ld"; then
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _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 $pic_flag $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 $pic_flag $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
+ case $host_cpu in
+ hppa*64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ m4_if($1, [], [
+@@ -5717,14 +5280,14 @@
+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+ _LT_LINKER_OPTION([if $CC understands -b],
+ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+- [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
++ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+- [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
++ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+ ;;
+ esac
+ fi
+- if test no = "$with_gnu_ld"; then
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
++ if test "$with_gnu_ld" = no; then
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+@@ -5735,7 +5298,7 @@
+ *)
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+@@ -5746,16 +5309,16 @@
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+- if test yes = "$GCC"; then
+- _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'
++ if test "$GCC" = yes; then
++ _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.
+ # 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"
++ [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; }]],
+@@ -5768,31 +5331,21 @@
+ end]])])],
+ [lt_cv_irix_exported_symbol=yes],
+ [lt_cv_irix_exported_symbol=no])
+- LDFLAGS=$save_LDFLAGS])
+- if test yes = "$lt_cv_irix_exported_symbol"; 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'
++ 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'
++ _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'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- linux*)
+- case $cc_basename in
+- tcc*)
+- # Fabrice Bellard et al's Tiny C Compiler
+- _LT_TAGVAR(ld_shlibs, $1)=yes
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- ;;
+- esac
+- ;;
+-
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+@@ -5807,7 +5360,7 @@
+ newsos6)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+@@ -5815,19 +5368,27 @@
+ *nto* | *qnx*)
+ ;;
+
+- openbsd* | bitrig*)
++ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ else
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
++ case $host_os in
++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ ;;
++ *)
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ ;;
++ esac
+ fi
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+@@ -5838,53 +5399,33 @@
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+- shrext_cmds=.dll
+- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- prefix_cmds="$SED"~
+- if test EXPORTS = "`$SED 1q $export_symbols`"; then
+- prefix_cmds="$prefix_cmds -e 1d";
+- fi~
+- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+- if test yes = "$GCC"; 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-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
++ 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}-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(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $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_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+- if test yes = "$GCC"; then
+- _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+- _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'
++ 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} $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 \*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -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)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -5895,24 +5436,24 @@
+
+ solaris*)
+ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+- if test yes = "$GCC"; then
+- wlarc='$wl'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ wlarc='${wl}'
++ _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 $pic_flag $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"*)
+ wlarc=''
+- _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ ;;
+ *)
+- wlarc='$wl'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
++ wlarc='${wl}'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $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 -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ ;;
+ esac
+ fi
+@@ -5922,11 +5463,11 @@
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+- # but understands '-z linker_flag'. GCC discards it without '$wl',
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- if test yes = "$GCC"; then
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
++ if test "$GCC" = yes; then
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ fi
+@@ -5936,10 +5477,10 @@
+ ;;
+
+ sunos4*)
+- if test sequent = "$host_vendor"; then
++ if test "x$host_vendor" = xsequent; then
+ # Use $CC to link under sequent, because it throws in some extra .o
+ # files that make .init and .fini sections work.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+@@ -5988,43 +5529,43 @@
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+- _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
+
+- if test yes = "$GCC"; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+- # Note: We CANNOT use -z defs as we might desire, because we do not
++ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+- _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+- _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+- if test yes = "$GCC"; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+@@ -6039,17 +5580,17 @@
+ ;;
+ esac
+
+- if test sni = "$host_vendor"; then
++ if test x$host_vendor = xsni; then
+ case $host in
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+ ;;
+ esac
+ fi
+ fi
+ ])
+ AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+-test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
++test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+ _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+@@ -6066,7 +5607,7 @@
+ # Assume -lc should be added
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+- if test yes,yes = "$GCC,$enable_shared"; then
++ if test "$enable_shared" = yes && test "$GCC" = yes; then
+ case $_LT_TAGVAR(archive_cmds, $1) in
+ *'~'*)
+ # FIXME: we may have to deal with multi-command sequences.
+@@ -6146,12 +5687,12 @@
+ _LT_TAGDECL([], [hardcode_libdir_separator], [1],
+ [Whether we need a single "-rpath" flag with a separated argument])
+ _LT_TAGDECL([], [hardcode_direct], [0],
+- [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
++ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ DIR into the resulting binary])
+ _LT_TAGDECL([], [hardcode_direct_absolute], [0],
+- [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
++ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ DIR into the resulting binary and the resulting library dependency is
+- "absolute", i.e impossible to change by setting $shlibpath_var if the
++ "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+ library is relocated])
+ _LT_TAGDECL([], [hardcode_minus_L], [0],
+ [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+@@ -6192,10 +5733,10 @@
+ # ------------------------
+ # Ensure that the configuration variables for a C compiler are suitably
+ # defined. These variables are subsequently used by _LT_CONFIG to write
+-# the compiler configuration to 'libtool'.
++# the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_C_CONFIG],
+ [m4_require([_LT_DECL_EGREP])dnl
+-lt_save_CC=$CC
++lt_save_CC="$CC"
+ AC_LANG_PUSH(C)
+
+ # Source file extension for C test sources.
+@@ -6235,18 +5776,18 @@
+ LT_SYS_DLOPEN_SELF
+ _LT_CMD_STRIPLIB
+
+- # Report what library types will actually be built
++ # Report which library types will actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+
+ AC_MSG_CHECKING([whether to build shared libraries])
+- test no = "$can_build_shared" && enable_shared=no
++ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+- test yes = "$enable_shared" && enable_static=no
++ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+@@ -6254,12 +5795,8 @@
+ ;;
+
+ aix[[4-9]]*)
+- if test ia64 != "$host_cpu"; then
+- case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+- yes,aix,yes) ;; # shared object as lib.so file only
+- yes,svr4,*) ;; # shared object as lib.so archive member only
+- yes,*) enable_static=no ;; # shared object in lib.a archive as well
+- esac
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+ esac
+@@ -6267,13 +5804,13 @@
+
+ AC_MSG_CHECKING([whether to build static libraries])
+ # Make sure either enable_shared or enable_static is yes.
+- test yes = "$enable_shared" || enable_static=yes
++ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+
+ _LT_CONFIG($1)
+ fi
+ AC_LANG_POP
+-CC=$lt_save_CC
++CC="$lt_save_CC"
+ ])# _LT_LANG_C_CONFIG
+
+
+@@ -6281,14 +5818,14 @@
+ # --------------------------
+ # Ensure that the configuration variables for a C++ compiler are suitably
+ # defined. These variables are subsequently used by _LT_CONFIG to write
+-# the compiler configuration to 'libtool'.
++# the compiler configuration to `libtool'.
+ 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 no != "$CXX" &&
+- ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+- (test g++ != "$CXX"))); then
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
+ AC_PROG_CXXCPP
+ else
+ _lt_caught_CXX_error=yes
+@@ -6330,7 +5867,7 @@
+ # the CXX compiler isn't working. Some variables (like enable_shared)
+ # are currently assumed to apply to all compilers on this platform,
+ # and will be corrupted by setting them based on a non-working compiler.
+-if test yes != "$_lt_caught_CXX_error"; then
++if test "$_lt_caught_CXX_error" != yes; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="int some_variable = 0;"
+
+@@ -6372,35 +5909,35 @@
+ if test -n "$compiler"; then
+ # We don't want -fno-exception when compiling C++ code, so set the
+ # no_builtin_flag separately
+- if test yes = "$GXX"; then
++ if test "$GXX" = yes; then
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ else
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+ fi
+
+- if test yes = "$GXX"; then
++ if test "$GXX" = yes; then
+ # Set up default GNU C++ configuration
+
+ LT_PATH_LD
+
+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
+ # archiving commands below assume that GNU ld is being used.
+- if test yes = "$with_gnu_ld"; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ if test "$with_gnu_ld" = yes; then
++ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+ # investigate it a little bit more. (MM)
+- wlarc='$wl'
++ wlarc='${wl}'
+
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+ $GREP 'no-whole-archive' > /dev/null; then
+- _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+@@ -6436,30 +5973,18 @@
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ aix[[4-9]]*)
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+- no_entry_flag=
++ no_entry_flag=""
+ else
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+- # have runtime linking enabled, and use it for executables.
+- # For shared libraries, we enable/disable runtime linking
+- # depending on the kind of the shared library created -
+- # when "with_aix_soname,aix_use_runtimelinking" is:
+- # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+- # "aix,yes" lib.so shared, rtl:yes, for executables
+- # lib.a static archive
+- # "both,no" lib.so.V(shr.o) shared, rtl:yes
+- # lib.a(lib.so.V) shared, rtl:no, for executables
+- # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+- # lib.a(lib.so.V) shared, rtl:no
+- # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+- # lib.a static archive
++ # need to do runtime linking.
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+@@ -6469,13 +5994,6 @@
+ ;;
+ esac
+ done
+- if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+- # With aix-soname=svr4, we create the lib.so.V shared archives only,
+- # so we don't have lib.a shared libs to link our executables.
+- # We have to force runtime linking in this case.
+- aix_use_runtimelinking=yes
+- LDFLAGS="$LDFLAGS -Wl,-brtl"
+- fi
+ ;;
+ esac
+
+@@ -6494,21 +6012,13 @@
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+- _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+- case $with_aix_soname,$aix_use_runtimelinking in
+- aix,*) ;; # no import file
+- svr4,* | *,yes) # use import file
+- # The Import File defines what to hardcode.
+- _LT_TAGVAR(hardcode_direct, $1)=no
+- _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+- ;;
+- esac
++ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+- if test yes = "$GXX"; then
++ if test "$GXX" = yes; then
+ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+- collect2name=`$CC -print-prog-name=collect2`
++ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+ then
+@@ -6526,84 +6036,64 @@
+ fi
+ esac
+ shared_flag='-shared'
+- if test yes = "$aix_use_runtimelinking"; then
+- shared_flag=$shared_flag' $wl-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
+ fi
+- # Need to ensure runtime linking is disabled for the traditional
+- # shared library, or the linker may eventually find shared libraries
+- # /with/ Import File - we do not want to mix them.
+- shared_flag_aix='-shared'
+- shared_flag_svr4='-shared $wl-G'
+ else
+ # not using gcc
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+- if test yes = "$aix_use_runtimelinking"; then
+- shared_flag='$wl-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag='${wl}-G'
+ else
+- shared_flag='$wl-bM:SRE'
++ shared_flag='${wl}-bM:SRE'
+ fi
+- shared_flag_aix='$wl-bM:SRE'
+- shared_flag_svr4='$wl-G'
+ fi
+ fi
+
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to
+ # export.
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+- if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
++ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+- # The "-G" linker flag allows undefined symbols.
+- _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
++ _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an empty
+ # executable.
+ _LT_SYS_MODULE_PATH_AIX([$1])
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
++ _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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
++ _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
+- if test ia64 = "$host_cpu"; then
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
++ if test "$host_cpu" = ia64; then
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ _LT_SYS_MODULE_PATH_AIX([$1])
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
++ _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.
+- _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+- _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+- if test yes = "$with_gnu_ld"; then
++ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+- # -brtl affects multiple linker settings, -berok does not and is overridden later
+- compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+- if test svr4 != "$with_aix_soname"; then
+- # This is similar to how AIX traditionally builds its shared
+- # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+- fi
+- if test aix != "$with_aix_soname"; then
+- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+- else
+- # used by -dlpreopen to get the symbols
+- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+- fi
+- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
++ # This is similar to how AIX traditionally builds its shared
++ # libraries.
++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+@@ -6613,7 +6103,7 @@
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -6641,58 +6131,57 @@
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=.dll
++ 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,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+- _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+- cp "$export_symbols" "$output_objdir/$soname.def";
+- echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+- else
+- $SED -e '\''s/^/-link -EXPORT:/'\'' < $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='
++ _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'
++ 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(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, use it as
+- # is; otherwise, prepend EXPORTS...
+- _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); 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'
++ _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
+@@ -6703,34 +6192,6 @@
+ _LT_DARWIN_LINKER_FEATURES($1)
+ ;;
+
+- os2*)
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_TAGVAR(hardcode_minus_L, $1)=yes
+- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+- shrext_cmds=.dll
+- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- prefix_cmds="$SED"~
+- if test EXPORTS = "`$SED 1q $export_symbols`"; then
+- prefix_cmds="$prefix_cmds -e 1d";
+- fi~
+- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- ;;
+-
+ dgux*)
+ case $cc_basename in
+ ec++*)
+@@ -6765,15 +6226,18 @@
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ ;;
+
++ gnu*)
++ ;;
++
+ haiku*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+ hpux9*)
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+ # but as the default
+@@ -6785,7 +6249,7 @@
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ aCC*)
+- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${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'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+@@ -6794,11 +6258,11 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ ;;
+ *)
+- if test yes = "$GXX"; then
+- _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 "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
++ if test "$GXX" = yes; then
++ _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
+@@ -6808,15 +6272,15 @@
+ ;;
+
+ hpux10*|hpux11*)
+- if test no = "$with_gnu_ld"; then
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
++ if test $with_gnu_ld = no; then
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
+ *)
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+ esac
+ fi
+@@ -6842,13 +6306,13 @@
+ aCC*)
+ case $host_cpu in
+ hppa*64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -b $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 -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ # Commands to make compiler produce verbose output that lists
+@@ -6859,20 +6323,20 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ ;;
+ *)
+- if test yes = "$GXX"; then
+- if test no = "$with_gnu_ld"; then
++ if test "$GXX" = yes; then
++ if test $with_gnu_ld = no; then
+ case $host_cpu in
+ hppa*64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _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 $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 $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 $pic_flag $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
+@@ -6887,22 +6351,22 @@
+ interix[[3-9]]*)
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+ irix5* | irix6*)
+ case $cc_basename in
+ CC*)
+ # SGI C++
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+@@ -6911,22 +6375,22 @@
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+ ;;
+ *)
+- if test yes = "$GXX"; then
+- if test no = "$with_gnu_ld"; then
+- _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'
++ if test "$GXX" = yes; then
++ if test "$with_gnu_ld" = no; then
++ _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 $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'
++ _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
+ ;;
+ esac
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
+
+- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -6934,8 +6398,8 @@
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
++ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+@@ -6944,10 +6408,10 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+ # Archives containing C++ object files must be created using
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+@@ -6961,59 +6425,59 @@
+ # earlier do not add the objects themselves.
+ case `$CC -V 2>&1` in
+ *"Version 7."*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ *) # Version 8.0 or newer
+ tmp_idyn=
+ case $host_cpu in
+ ia64*) tmp_idyn=' -i_dynamic';;
+ esac
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ esac
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ case `$CC -V` in
+ *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+ _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 | sort | $NL2SP`"'
++ rm -rf $tpldir~
++ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
++ 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 | sort | $NL2SP`~
+- $RANLIB $oldlib'
++ rm -rf $tpldir~
++ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
++ $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 | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
++ 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 | 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 | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ 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 | 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'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+ esac
+
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ ;;
+ cxx*)
+ # Compaq C++
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+ runpath_var=LD_RUN_PATH
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -7027,18 +6491,18 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+ ;;
+ xl* | mpixl* | bgxl*)
+ # IBM XL 8.0 on PPC, with GNU ld
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+- if test yes = "$supports_anon_versioning"; then
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$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~
+- $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ *)
+@@ -7046,10 +6510,10 @@
+ *Sun\ C*)
+ # Sun C++ 5.9
+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+ # Not sure whether something based on
+@@ -7107,17 +6571,22 @@
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ ;;
+
+- openbsd* | bitrig*)
++ openbsd2*)
++ # C++ shared libraries are fairly broken
++ _LT_TAGVAR(ld_shlibs, $1)=no
++ ;;
++
++ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+- _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+ output_verbose_link_cmd=func_echo_all
+ else
+@@ -7133,9 +6602,9 @@
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ # Archives containing C++ object files must be created using
+@@ -7153,17 +6622,17 @@
+ cxx*)
+ case $host in
+ osf3*)
+- _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ ;;
+ *)
+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -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)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+- echo "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+- $RM $lib.exp'
++ echo "-hidden">> $lib.exp~
++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
++ $RM $lib.exp'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ ;;
+ esac
+@@ -7178,21 +6647,21 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ ;;
+ *)
+- if test yes,no = "$GXX,$with_gnu_ld"; then
+- _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ case $host in
+ osf3*)
+- _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}-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'
++ _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
+
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ # Commands to make compiler produce verbose output that lists
+@@ -7238,9 +6707,9 @@
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $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 -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -7248,7 +6717,7 @@
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+- # but understands '-z linker_flag'.
++ # but understands `-z linker_flag'.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ ;;
+@@ -7265,30 +6734,30 @@
+ ;;
+ gcx*)
+ # Green Hills C++ Compiler
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+ # The C++ compiler must be used to create the archive.
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+ ;;
+ *)
+ # GNU C++ compiler with Solaris linker
+- if test yes,no = "$GXX,$with_gnu_ld"; then
+- _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
++ 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 $pic_flag -nostdlib $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 $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -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
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ else
+- # g++ 2.7 appears to require '-G' NOT '-shared' on this
++ # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # platform.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G -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 -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++ $CC -G -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
+@@ -7296,11 +6765,11 @@
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ fi
+
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
+ fi
+@@ -7309,52 +6778,52 @@
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+- _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+- # Note: We CANNOT use -z defs as we might desire, because we do not
++ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+- _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+- _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+- '"$_LT_TAGVAR(old_archive_cmds, $1)"
++ '"$_LT_TAGVAR(old_archive_cmds, $1)"
+ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+- '"$_LT_TAGVAR(reload_cmds, $1)"
++ '"$_LT_TAGVAR(reload_cmds, $1)"
+ ;;
+ *)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+@@ -7385,10 +6854,10 @@
+ esac
+
+ AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+- test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
++ test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+- _LT_TAGVAR(GCC, $1)=$GXX
+- _LT_TAGVAR(LD, $1)=$LD
++ _LT_TAGVAR(GCC, $1)="$GXX"
++ _LT_TAGVAR(LD, $1)="$LD"
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -7415,7 +6884,7 @@
+ lt_cv_path_LD=$lt_save_path_LD
+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+-fi # test yes != "$_lt_caught_CXX_error"
++fi # test "$_lt_caught_CXX_error" != yes
+
+ AC_LANG_POP
+ ])# _LT_LANG_CXX_CONFIG
+@@ -7437,14 +6906,13 @@
+ AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+ func_stripname_cnf ()
+ {
+- case @S|@2 in
+- .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+- *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
++ 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
+@@ -7528,13 +6996,13 @@
+ pre_test_object_deps_done=no
+
+ for p in `eval "$output_verbose_link_cmd"`; do
+- case $prev$p in
++ case ${prev}${p} in
+
+ -L* | -R* | -l*)
+ # Some compilers place space between "-{L,R}" and the path.
+ # Remove the space.
+- if test x-L = "$p" ||
+- test x-R = "$p"; then
++ if test $p = "-L" ||
++ test $p = "-R"; then
+ prev=$p
+ continue
+ fi
+@@ -7550,16 +7018,16 @@
+ case $p in
+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+ esac
+- if test no = "$pre_test_object_deps_done"; then
+- case $prev in
++ if test "$pre_test_object_deps_done" = no; then
++ 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.
+ if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+- _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
++ _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+ else
+- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
++ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+ fi
+ ;;
+ # The "-l" case would never come before the object being
+@@ -7567,9 +7035,9 @@
+ esac
+ else
+ if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+- _LT_TAGVAR(postdeps, $1)=$prev$p
++ _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+ else
+- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
++ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+ fi
+ fi
+ prev=
+@@ -7584,15 +7052,15 @@
+ continue
+ fi
+
+- if test no = "$pre_test_object_deps_done"; then
++ if test "$pre_test_object_deps_done" = no; then
+ if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+- _LT_TAGVAR(predep_objects, $1)=$p
++ _LT_TAGVAR(predep_objects, $1)="$p"
+ else
+ _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+ fi
+ else
+ if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+- _LT_TAGVAR(postdep_objects, $1)=$p
++ _LT_TAGVAR(postdep_objects, $1)="$p"
+ else
+ _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+ fi
+@@ -7623,6 +7091,51 @@
+ _LT_TAGVAR(postdep_objects,$1)=
+ _LT_TAGVAR(postdeps,$1)=
+ ;;
++
++linux*)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
++
++solaris*)
++ case $cc_basename in
++ 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
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++
++ # Adding this requires a known-good setup of shared libraries for
++ # Sun compiler versions before 5.6, else PIC objects from an old
++ # archive will be linked into the output, leading to subtle bugs.
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
+ esac
+ ])
+
+@@ -7631,7 +7144,7 @@
+ esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+ if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
++ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ fi
+ _LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+ [The directories searched by this compiler when creating a shared library])
+@@ -7651,10 +7164,10 @@
+ # --------------------------
+ # Ensure that the configuration variables for a Fortran 77 compiler are
+ # suitably defined. These variables are subsequently used by _LT_CONFIG
+-# to write the compiler configuration to 'libtool'.
++# to write the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_F77_CONFIG],
+ [AC_LANG_PUSH(Fortran 77)
+-if test -z "$F77" || test no = "$F77"; then
++if test -z "$F77" || test "X$F77" = "Xno"; then
+ _lt_disable_F77=yes
+ fi
+
+@@ -7691,7 +7204,7 @@
+ # the F77 compiler isn't working. Some variables (like enable_shared)
+ # are currently assumed to apply to all compilers on this platform,
+ # and will be corrupted by setting them based on a non-working compiler.
+-if test yes != "$_lt_disable_F77"; then
++if test "$_lt_disable_F77" != yes; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="\
+ subroutine t
+@@ -7713,7 +7226,7 @@
+ _LT_LINKER_BOILERPLATE
+
+ # Allow CC to be a program name with arguments.
+- lt_save_CC=$CC
++ lt_save_CC="$CC"
+ lt_save_GCC=$GCC
+ lt_save_CFLAGS=$CFLAGS
+ CC=${F77-"f77"}
+@@ -7727,25 +7240,21 @@
+ AC_MSG_RESULT([$can_build_shared])
+
+ AC_MSG_CHECKING([whether to build shared libraries])
+- test no = "$can_build_shared" && enable_shared=no
++ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+- test yes = "$enable_shared" && enable_static=no
++ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+ aix[[4-9]]*)
+- if test ia64 != "$host_cpu"; then
+- case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+- yes,aix,yes) ;; # shared object as lib.so file only
+- yes,svr4,*) ;; # shared object as lib.so archive member only
+- yes,*) enable_static=no ;; # shared object in lib.a archive as well
+- esac
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+ esac
+@@ -7753,11 +7262,11 @@
+
+ AC_MSG_CHECKING([whether to build static libraries])
+ # Make sure either enable_shared or enable_static is yes.
+- test yes = "$enable_shared" || enable_static=yes
++ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+
+- _LT_TAGVAR(GCC, $1)=$G77
+- _LT_TAGVAR(LD, $1)=$LD
++ _LT_TAGVAR(GCC, $1)="$G77"
++ _LT_TAGVAR(LD, $1)="$LD"
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -7774,9 +7283,9 @@
+ fi # test -n "$compiler"
+
+ GCC=$lt_save_GCC
+- CC=$lt_save_CC
+- CFLAGS=$lt_save_CFLAGS
+-fi # test yes != "$_lt_disable_F77"
++ CC="$lt_save_CC"
++ CFLAGS="$lt_save_CFLAGS"
++fi # test "$_lt_disable_F77" != yes
+
+ AC_LANG_POP
+ ])# _LT_LANG_F77_CONFIG
+@@ -7786,11 +7295,11 @@
+ # -------------------------
+ # Ensure that the configuration variables for a Fortran compiler are
+ # suitably defined. These variables are subsequently used by _LT_CONFIG
+-# to write the compiler configuration to 'libtool'.
++# to write the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_FC_CONFIG],
+ [AC_LANG_PUSH(Fortran)
+
+-if test -z "$FC" || test no = "$FC"; then
++if test -z "$FC" || test "X$FC" = "Xno"; then
+ _lt_disable_FC=yes
+ fi
+
+@@ -7827,7 +7336,7 @@
+ # the FC compiler isn't working. Some variables (like enable_shared)
+ # are currently assumed to apply to all compilers on this platform,
+ # and will be corrupted by setting them based on a non-working compiler.
+-if test yes != "$_lt_disable_FC"; then
++if test "$_lt_disable_FC" != yes; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="\
+ subroutine t
+@@ -7849,7 +7358,7 @@
+ _LT_LINKER_BOILERPLATE
+
+ # Allow CC to be a program name with arguments.
+- lt_save_CC=$CC
++ lt_save_CC="$CC"
+ lt_save_GCC=$GCC
+ lt_save_CFLAGS=$CFLAGS
+ CC=${FC-"f95"}
+@@ -7865,25 +7374,21 @@
+ AC_MSG_RESULT([$can_build_shared])
+
+ AC_MSG_CHECKING([whether to build shared libraries])
+- test no = "$can_build_shared" && enable_shared=no
++ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+- test yes = "$enable_shared" && enable_static=no
++ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+ aix[[4-9]]*)
+- if test ia64 != "$host_cpu"; then
+- case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+- yes,aix,yes) ;; # shared object as lib.so file only
+- yes,svr4,*) ;; # shared object as lib.so archive member only
+- yes,*) enable_static=no ;; # shared object in lib.a archive as well
+- esac
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+ esac
+@@ -7891,11 +7396,11 @@
+
+ AC_MSG_CHECKING([whether to build static libraries])
+ # Make sure either enable_shared or enable_static is yes.
+- test yes = "$enable_shared" || enable_static=yes
++ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+
+- _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+- _LT_TAGVAR(LD, $1)=$LD
++ _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
++ _LT_TAGVAR(LD, $1)="$LD"
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -7915,7 +7420,7 @@
+ GCC=$lt_save_GCC
+ CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
+-fi # test yes != "$_lt_disable_FC"
++fi # test "$_lt_disable_FC" != yes
+
+ AC_LANG_POP
+ ])# _LT_LANG_FC_CONFIG
+@@ -7925,7 +7430,7 @@
+ # --------------------------
+ # Ensure that the configuration variables for the GNU Java Compiler compiler
+ # are suitably defined. These variables are subsequently used by _LT_CONFIG
+-# to write the compiler configuration to 'libtool'.
++# to write the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_GCJ_CONFIG],
+ [AC_REQUIRE([LT_PROG_GCJ])dnl
+ AC_LANG_SAVE
+@@ -7959,7 +7464,7 @@
+ CFLAGS=$GCJFLAGS
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+-_LT_TAGVAR(LD, $1)=$LD
++_LT_TAGVAR(LD, $1)="$LD"
+ _LT_CC_BASENAME([$compiler])
+
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+@@ -7996,7 +7501,7 @@
+ # --------------------------
+ # Ensure that the configuration variables for the GNU Go compiler
+ # are suitably defined. These variables are subsequently used by _LT_CONFIG
+-# to write the compiler configuration to 'libtool'.
++# to write the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_GO_CONFIG],
+ [AC_REQUIRE([LT_PROG_GO])dnl
+ AC_LANG_SAVE
+@@ -8030,7 +7535,7 @@
+ CFLAGS=$GOFLAGS
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+-_LT_TAGVAR(LD, $1)=$LD
++_LT_TAGVAR(LD, $1)="$LD"
+ _LT_CC_BASENAME([$compiler])
+
+ # Go did not exist at the time GCC didn't implicitly link libc in.
+@@ -8067,7 +7572,7 @@
+ # -------------------------
+ # Ensure that the configuration variables for the Windows resource compiler
+ # are suitably defined. These variables are subsequently used by _LT_CONFIG
+-# to write the compiler configuration to 'libtool'.
++# to write the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_RC_CONFIG],
+ [AC_REQUIRE([LT_PROG_RC])dnl
+ AC_LANG_SAVE
+@@ -8083,7 +7588,7 @@
+ lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code=$lt_simple_compile_test_code
++lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_TAG_COMPILER
+@@ -8093,7 +7598,7 @@
+ _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=
+@@ -8122,7 +7627,7 @@
+ [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+ [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+ [AC_CHECK_TOOL(GCJ, gcj,)
+- test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+ AC_SUBST(GCJFLAGS)])])[]dnl
+ ])
+
+@@ -8233,7 +7738,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+- test ! -f "$lt_ac_sed" && continue
++ test ! -f $lt_ac_sed && continue
+ cat /dev/null > conftest.in
+ lt_ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+@@ -8250,9 +7755,9 @@
+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+ cmp -s conftest.out conftest.nl || break
+ # 10000 chars as input seems more than enough
+- test 10 -lt "$lt_ac_count" && break
++ test $lt_ac_count -gt 10 && break
+ lt_ac_count=`expr $lt_ac_count + 1`
+- if test "$lt_ac_count" -gt "$lt_ac_max"; then
++ if test $lt_ac_count -gt $lt_ac_max; then
+ lt_ac_max=$lt_ac_count
+ lt_cv_path_SED=$lt_ac_sed
+ fi
+@@ -8276,7 +7781,27 @@
+ # Find out whether the shell is Bourne or XSI compatible,
+ # or has some other useful features.
+ m4_defun([_LT_CHECK_SHELL_FEATURES],
+-[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
++# Try some XSI features
++xsi_shell=no
++( _lt_dummy="a/b/c"
++ 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
++AC_MSG_RESULT([$xsi_shell])
++_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
++
++AC_MSG_CHECKING([whether the shell understands "+="])
++lt_shell_append=no
++( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
++ >/dev/null 2>&1 \
++ && lt_shell_append=yes
++AC_MSG_RESULT([$lt_shell_append])
++_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
++
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ lt_unset=unset
+ else
+ lt_unset=false
+@@ -8300,9 +7825,102 @@
+ ])# _LT_CHECK_SHELL_FEATURES
+
+
++# _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_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##*/}"])
++
++ _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}"}])
++
++ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
++ func_split_long_opt_name=${1%%=*}
++ func_split_long_opt_arg=${1#*=}])
++
++ _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"}])
++
++ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
++ case ${1} in
++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
++ *) func_lo2o_result=${1} ;;
++ esac])
++
++ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
++
++ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
++
++ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
++fi
++
++if test x"$lt_shell_append" = xyes; then
++ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
++
++ _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"])
++
++ # 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
++ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
++fi
++])
++
+ # _LT_PATH_CONVERSION_FUNCTIONS
+ # -----------------------------
+-# Determine what file name conversion functions should be used by
++# 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],
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/ltmain.sh psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/ltmain.sh
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/ltmain.sh 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/ltmain.sh 2020-07-16 10:48:35.464542572 +0200
+@@ -1,12 +1,9 @@
+-#! /bin/sh
+-## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+-## by inline-source v2014-01-03.01
+
+-# libtool (GNU libtool) 2.4.6
+-# Provide generalized library-building support services.
++# libtool (GNU libtool) 2.4.2
+ # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007, 2008, 2009, 2010, 2011 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.
+
+@@ -26,2112 +23,881 @@
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+-
+-PROGRAM=libtool
+-PACKAGE=libtool
+-VERSION=2.4.6
+-package_revision=2.4.6
+-
+-
+-## ------ ##
+-## Usage. ##
+-## ------ ##
+-
+-# Run './libtool --help' for help with using this script from the
+-# command line.
+-
+-
+-## ------------------------------- ##
+-## User overridable command paths. ##
+-## ------------------------------- ##
+-
+-# After configure completes, it has a better idea of some of the
+-# shell tools we need than the defaults used by the functions shared
+-# with bootstrap, so set those here where they can still be over-
+-# ridden by the user, but otherwise take precedence.
+-
+-: ${AUTOCONF="autoconf"}
+-: ${AUTOMAKE="automake"}
+-
+-
+-## -------------------------- ##
+-## Source external libraries. ##
+-## -------------------------- ##
+-
+-# Much of our low-level functionality needs to be sourced from external
+-# libraries, which are installed to $pkgauxdir.
+-
+-# Set a version string for this script.
+-scriptversion=2015-01-20.17; # UTC
+-
+-# General shell script boiler plate, and helper functions.
+-# Written by Gary V. Vaughan, 2004
++# along with GNU Libtool; see the file COPYING. If not, a copy
++# can be downloaded from http://www.gnu.org/licenses/gpl.html,
++# or obtained by writing to the Free Software Foundation, Inc.,
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+-# Copyright (C) 2004-2015 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.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 3 of the License, or
+-# (at your option) any later version.
+-
+-# As a special exception to the GNU General Public License, if you distribute
+-# this file as part of a program or library that is built using GNU Libtool,
+-# you may include this file under the same distribution terms that you use
+-# for the rest of that program.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+-# General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+-# Please report bugs or propose patches to gary@gnu.org.
+-
+-
+-## ------ ##
+-## Usage. ##
+-## ------ ##
+-
+-# Evaluate this file near the top of your script to gain access to
+-# the functions and variables defined here:
++# Usage: $progname [OPTION]... [MODE-ARG]...
+ #
+-# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
++# Provide generalized library-building support services.
+ #
+-# If you need to override any of the default environment variable
+-# settings, do that before evaluating this file.
+-
+-
+-## -------------------- ##
+-## Shell normalisation. ##
+-## -------------------- ##
++# --config show all configuration variables
++# --debug enable verbose shell tracing
++# -n, --dry-run display commands without modifying any files
++# --features display basic configuration information and exit
++# --mode=MODE use operation mode MODE
++# --preserve-dup-deps don't remove duplicate dependency libraries
++# --quiet, --silent don't print informational messages
++# --no-quiet, --no-silent
++# print informational messages (default)
++# --no-warn don't display warning messages
++# --tag=TAG use configuration variables from tag TAG
++# -v, --verbose print more informational messages than default
++# --no-verbose don't print the extra informational messages
++# --version print version information
++# -h, --help, --help-all print short, long, or detailed help message
++#
++# MODE must be one of the following:
++#
++# clean remove files from the build directory
++# compile compile a source file into a libtool object
++# execute automatically set library path, then run a program
++# finish complete the installation of libtool libraries
++# install install libraries or executables
++# link create a library or an executable
++# uninstall remove libraries from an installed directory
++#
++# MODE-ARGS vary depending on the MODE. When passed as first option,
++# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
++# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
++#
++# When reporting a bug, please describe a test case to reproduce it and
++# include the following information:
++#
++# host-triplet: $host
++# shell: $SHELL
++# compiler: $LTCC
++# compiler flags: $LTCFLAGS
++# linker: $LD (gnu? $with_gnu_ld)
++# $progname: (GNU libtool) 2.4.2
++# automake: $automake_version
++# autoconf: $autoconf_version
++#
++# Report bugs to <bug-libtool@gnu.org>.
++# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
++# General help using GNU software: <http://www.gnu.org/gethelp/>.
+
+-# Some shells need a little help to be as Bourne compatible as possible.
+-# Before doing anything else, make sure all that help has been provided!
++PROGRAM=libtool
++PACKAGE=libtool
++VERSION=2.4.2
++TIMESTAMP=""
++package_revision=1.3337
+
+-DUALCASE=1; export DUALCASE # for MKS sh
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+ else
+- case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
+-fi
+-
+-# NLS nuisances: We save the old values in case they are required later.
+-_G_user_locale=
+-_G_safe_locale=
+-for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+-do
+- eval "if test set = \"\${$_G_var+set}\"; then
+- save_$_G_var=\$$_G_var
+- $_G_var=C
+- export $_G_var
+- _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+- _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
+- fi"
+-done
+-
+-# CDPATH.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+-
+-# Make sure IFS has a sensible default
+-sp=' '
+-nl='
+-'
+-IFS="$sp $nl"
+-
+-# There are apparently some retarded systems that use ';' as a PATH separator!
+-if test "${PATH_SEPARATOR+set}" != set; then
+- PATH_SEPARATOR=:
+- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+- PATH_SEPARATOR=';'
+- }
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
+
+-
+-
+-## ------------------------- ##
+-## Locate command utilities. ##
+-## ------------------------- ##
+-
+-
+-# func_executable_p FILE
+-# ----------------------
+-# Check that FILE is an executable regular file.
+-func_executable_p ()
++# A function that is used when there is no print builtin or printf.
++func_fallback_echo ()
+ {
+- test -f "$1" && test -x "$1"
+-}
+-
+-
+-# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+-# --------------------------------------------
+-# Search for either a program that responds to --version with output
+-# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+-# trying all the directories in PATH with each of the elements of
+-# PROGS_LIST.
+-#
+-# CHECK_FUNC should accept the path to a candidate program, and
+-# set $func_check_prog_result if it truncates its output less than
+-# $_G_path_prog_max characters.
+-func_path_progs ()
+-{
+- _G_progs_list=$1
+- _G_check_func=$2
+- _G_PATH=${3-"$PATH"}
+-
+- _G_path_prog_max=0
+- _G_path_prog_found=false
+- _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+- for _G_dir in $_G_PATH; do
+- IFS=$_G_save_IFS
+- test -z "$_G_dir" && _G_dir=.
+- for _G_prog_name in $_G_progs_list; do
+- for _exeext in '' .EXE; do
+- _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+- func_executable_p "$_G_path_prog" || continue
+- case `"$_G_path_prog" --version 2>&1` in
+- *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+- *) $_G_check_func $_G_path_prog
+- func_path_progs_result=$func_check_prog_result
+- ;;
+- esac
+- $_G_path_prog_found && break 3
+- done
+- done
+- done
+- IFS=$_G_save_IFS
+- test -z "$func_path_progs_result" && {
+- echo "no acceptable sed could be found in \$PATH" >&2
+- exit 1
+- }
+-}
+-
+-
+-# We want to be able to use the functions in this file before configure
+-# has figured out where the best binaries are kept, which means we have
+-# to search for them ourselves - except when the results are already set
+-# where we skip the searches.
+-
+-# Unless the user overrides by setting SED, search the path for either GNU
+-# sed, or the sed that truncates its output the least.
+-test -z "$SED" && {
+- _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+- for _G_i in 1 2 3 4 5 6 7; do
+- _G_sed_script=$_G_sed_script$nl$_G_sed_script
+- done
+- echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+- _G_sed_script=
+-
+- func_check_prog_sed ()
+- {
+- _G_path_prog=$1
+-
+- _G_count=0
+- printf 0123456789 >conftest.in
+- while :
+- do
+- cat conftest.in conftest.in >conftest.tmp
+- mv conftest.tmp conftest.in
+- cp conftest.in conftest.nl
+- echo '' >> conftest.nl
+- "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+- diff conftest.out conftest.nl >/dev/null 2>&1 || break
+- _G_count=`expr $_G_count + 1`
+- if test "$_G_count" -gt "$_G_path_prog_max"; then
+- # Best one so far, save it but keep looking for a better one
+- func_check_prog_result=$_G_path_prog
+- _G_path_prog_max=$_G_count
+- fi
+- # 10*(2^10) chars as input seems more than enough
+- test 10 -lt "$_G_count" && break
+- done
+- rm -f conftest.in conftest.tmp conftest.nl conftest.out
+- }
+-
+- func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+- rm -f conftest.sed
+- SED=$func_path_progs_result
++ eval 'cat <<_LTECHO_EOF
++$1
++_LTECHO_EOF'
+ }
+
++# NLS nuisances: We save the old values to restore during execute mode.
++lt_user_locale=
++lt_safe_locale=
++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++do
++ eval "if test \"\${$lt_var+set}\" = set; then
++ save_$lt_var=\$$lt_var
++ $lt_var=C
++ export $lt_var
++ lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
++ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
++ fi"
++done
++LC_ALL=C
++LANGUAGE=C
++export LANGUAGE LC_ALL
+
+-# Unless the user overrides by setting GREP, search the path for either GNU
+-# grep, or the grep that truncates its output the least.
+-test -z "$GREP" && {
+- func_check_prog_grep ()
+- {
+- _G_path_prog=$1
+-
+- _G_count=0
+- _G_path_prog_max=0
+- printf 0123456789 >conftest.in
+- while :
+- do
+- cat conftest.in conftest.in >conftest.tmp
+- mv conftest.tmp conftest.in
+- cp conftest.in conftest.nl
+- echo 'GREP' >> conftest.nl
+- "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+- diff conftest.out conftest.nl >/dev/null 2>&1 || break
+- _G_count=`expr $_G_count + 1`
+- if test "$_G_count" -gt "$_G_path_prog_max"; then
+- # Best one so far, save it but keep looking for a better one
+- func_check_prog_result=$_G_path_prog
+- _G_path_prog_max=$_G_count
+- fi
+- # 10*(2^10) chars as input seems more than enough
+- test 10 -lt "$_G_count" && break
+- done
+- rm -f conftest.in conftest.tmp conftest.nl conftest.out
+- }
++$lt_unset CDPATH
+
+- func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+- GREP=$func_path_progs_result
+-}
+
++# 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
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
+
+-## ------------------------------- ##
+-## User overridable command paths. ##
+-## ------------------------------- ##
+
+-# All uppercase variable names are used for environment variables. These
+-# variables can be overridden by the user before calling a script that
+-# uses them if a suitable command of that name is not already available
+-# in the command search PATH.
+
+ : ${CP="cp -f"}
+-: ${ECHO="printf %s\n"}
+-: ${EGREP="$GREP -E"}
+-: ${FGREP="$GREP -F"}
+-: ${LN_S="ln -s"}
++test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+ : ${MAKE="make"}
+ : ${MKDIR="mkdir"}
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
+ : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
++: ${Xsed="$SED -e 1s/^X//"}
+
++# Global variables:
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
++EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
++EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
+
+-## -------------------- ##
+-## Useful sed snippets. ##
+-## -------------------- ##
++exit_status=$EXIT_SUCCESS
+
+-sed_dirname='s|/[^/]*$||'
+-sed_basename='s|^.*/||'
++# Make sure IFS has a sensible default
++lt_nl='
++'
++IFS=" $lt_nl"
+
+-# Sed substitution that helps us do robust quoting. It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
++dirname="s,/[^/]*$,,"
++basename="s,^.*/,,"
+
+-# Same as above, but do not quote variable references.
+-sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
++# 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
+
+-# 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
+-# that contains forward slashes, into one that contains
+-# (escaped) backslashes. A very naive implementation.
+-sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
++# func_basename file
++func_basename ()
++{
++ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
++} # func_basename may be replaced by extended shell implementation
+
+-# Re-'\' parameter expansions in output of sed_double_quote_subst that
+-# were '\'-ed in input to the same. If an odd number of '\' preceded a
+-# '$' in input to sed_double_quote_subst, that '$' was protected from
+-# expansion. Since each input '\' is now two '\'s, look for any number
+-# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'.
+-_G_bs='\\'
+-_G_bs2='\\\\'
+-_G_bs4='\\\\\\\\'
+-_G_dollar='\$'
+-sed_double_backslash="\
+- s/$_G_bs4/&\\
+-/g
+- s/^$_G_bs2$_G_dollar/$_G_bs&/
+- s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+- s/\n//g"
++
++# 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 ()
++{
++ # 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
+
+
+-## ----------------- ##
+-## Global variables. ##
+-## ----------------- ##
+-
+-# Except for the global variables explicitly listed below, the following
+-# functions in the '^func_' namespace, and the '^require_' namespace
+-# variables initialised in the 'Resource management' section, sourcing
+-# this file will not pollute your global namespace with anything
+-# else. There's no portable way to scope variables in Bourne shell
+-# though, so actually running these functions will sometimes place
+-# results into a variable named after the function, and often use
+-# temporary variables in the '^_G_' namespace. If you are careful to
+-# avoid using those namespaces casually in your sourcing script, things
+-# should continue to work as you expect. And, of course, you can freely
+-# overwrite any of the functions or variables defined here before
+-# calling anything to customize them.
++# 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
+
+-EXIT_SUCCESS=0
+-EXIT_FAILURE=1
+-EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
+-EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
+
+-# Allow overriding, eg assuming that you follow the convention of
+-# putting '$debug_cmd' at the start of all your functions, you can get
+-# bash to show function call trace with:
+-#
+-# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+-debug_cmd=${debug_cmd-":"}
+-exit_cmd=:
++# These SED scripts presuppose an absolute path with a trailing slash.
++pathcar='s,^/\([^/]*\).*$,\1,'
++pathcdr='s,^/[^/]*,,'
++removedotparts=':dotsl
++ s@/\./@/@g
++ t dotsl
++ s,/\.$,/,'
++collapseslashes='s@/\{1,\}@/@g'
++finalslash='s,/*$,/,'
+
+-# By convention, finish your script with:
+-#
+-# exit $exit_status
+-#
+-# so that you can set exit_status to non-zero if you want to indicate
+-# something went wrong during execution without actually bailing out at
+-# the point of failure.
+-exit_status=$EXIT_SUCCESS
++# func_normal_abspath PATH
++# Remove doubled-up and trailing slashes, "." path components,
++# and cancel out any ".." path components in PATH after making
++# it an absolute path.
++# value returned in "$func_normal_abspath_result"
++func_normal_abspath ()
++{
++ # Start from root dir and reassemble the path.
++ func_normal_abspath_result=
++ func_normal_abspath_tpath=$1
++ func_normal_abspath_altnamespace=
++ case $func_normal_abspath_tpath in
++ "")
++ # Empty path, that just means $cwd.
++ func_stripname '' '/' "`pwd`"
++ func_normal_abspath_result=$func_stripname_result
++ return
++ ;;
++ # The next three entries are used to spot a run of precisely
++ # two leading slashes without using negated character classes;
++ # we take advantage of case's first-match behaviour.
++ ///*)
++ # Unusual form of absolute path, do nothing.
++ ;;
++ //*)
++ # Not necessarily an ordinary path; POSIX reserves leading '//'
++ # and for example Cygwin uses it to access remote file shares
++ # over CIFS/SMB, so we conserve a leading double slash if found.
++ func_normal_abspath_altnamespace=/
++ ;;
++ /*)
++ # Absolute path, do nothing.
++ ;;
++ *)
++ # Relative path, prepend $cwd.
++ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
++ ;;
++ esac
++ # Cancel out all the simple stuff to save iterations. We also want
++ # the path to end with a slash for ease of parsing, so make sure
++ # there is one (and only one) here.
++ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
++ -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
++ while :; do
++ # Processed it all yet?
++ if test "$func_normal_abspath_tpath" = / ; then
++ # If we ascended to the root using ".." the result may be empty now.
++ if test -z "$func_normal_abspath_result" ; then
++ func_normal_abspath_result=/
++ fi
++ break
++ fi
++ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
++ -e "$pathcar"`
++ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
++ -e "$pathcdr"`
++ # Figure out what to do with it
++ case $func_normal_abspath_tcomponent in
++ "")
++ # Trailing empty path component, ignore it.
++ ;;
++ ..)
++ # Parent dir; strip last assembled component from result.
++ func_dirname "$func_normal_abspath_result"
++ func_normal_abspath_result=$func_dirname_result
++ ;;
++ *)
++ # Actual path component, append it.
++ func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
++ ;;
++ esac
++ done
++ # Restore leading double-slash if one was found on entry.
++ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
++}
+
+-# 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
+-# positional parameter $0, within a function call, is the name of the
+-# function.
+-progpath=$0
++# func_relative_path SRCDIR DSTDIR
++# generates a relative path from SRCDIR to DSTDIR, with a trailing
++# slash if non-empty, suitable for immediately appending a filename
++# without needing to append a separator.
++# value returned in "$func_relative_path_result"
++func_relative_path ()
++{
++ func_relative_path_result=
++ func_normal_abspath "$1"
++ func_relative_path_tlibdir=$func_normal_abspath_result
++ func_normal_abspath "$2"
++ func_relative_path_tbindir=$func_normal_abspath_result
++
++ # Ascend the tree starting from libdir
++ while :; do
++ # check if we have found a prefix of bindir
++ case $func_relative_path_tbindir in
++ $func_relative_path_tlibdir)
++ # found an exact match
++ func_relative_path_tcancelled=
++ break
++ ;;
++ $func_relative_path_tlibdir*)
++ # found a matching prefix
++ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
++ func_relative_path_tcancelled=$func_stripname_result
++ if test -z "$func_relative_path_result"; then
++ func_relative_path_result=.
++ fi
++ break
++ ;;
++ *)
++ func_dirname $func_relative_path_tlibdir
++ func_relative_path_tlibdir=${func_dirname_result}
++ if test "x$func_relative_path_tlibdir" = x ; then
++ # Have to descend all the way to the root!
++ func_relative_path_result=../$func_relative_path_result
++ func_relative_path_tcancelled=$func_relative_path_tbindir
++ break
++ fi
++ func_relative_path_result=../$func_relative_path_result
++ ;;
++ esac
++ done
+
+-# The name of this program.
+-progname=`$ECHO "$progpath" |$SED "$sed_basename"`
++ # Now calculate path; take care to avoid doubling-up slashes.
++ func_stripname '' '/' "$func_relative_path_result"
++ func_relative_path_result=$func_stripname_result
++ func_stripname '/' '/' "$func_relative_path_tcancelled"
++ if test "x$func_stripname_result" != x ; then
++ func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
++ fi
+
+-# Make sure we have an absolute progpath for reexecution:
++ # Normalisation. If bindir is libdir, return empty string,
++ # else relative path ending with a slash; either way, target
++ # file name can be directly appended.
++ if test ! -z "$func_relative_path_result"; then
++ func_stripname './' '' "$func_relative_path_result/"
++ func_relative_path_result=$func_stripname_result
++ fi
++}
++
++# The name of this program:
++func_dirname_and_basename "$progpath"
++progname=$func_basename_result
++
++# Make sure we have an absolute path for reexecution:
+ case $progpath in
+ [\\/]*|[A-Za-z]:\\*) ;;
+ *[\\/]*)
+- progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
++ progdir=$func_dirname_result
+ progdir=`cd "$progdir" && pwd`
+- progpath=$progdir/$progname
++ progpath="$progdir/$progname"
+ ;;
+ *)
+- _G_IFS=$IFS
++ save_IFS="$IFS"
+ IFS=${PATH_SEPARATOR-:}
+ for progdir in $PATH; do
+- IFS=$_G_IFS
++ IFS="$save_IFS"
+ test -x "$progdir/$progname" && break
+ done
+- IFS=$_G_IFS
++ IFS="$save_IFS"
+ test -n "$progdir" || progdir=`pwd`
+- progpath=$progdir/$progname
++ progpath="$progdir/$progname"
+ ;;
+ esac
+
++# Sed substitution that helps us do robust quoting. It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed="${SED}"' -e 1s/^X//'
++sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+-## ----------------- ##
+-## Standard options. ##
+-## ----------------- ##
+-
+-# The following options affect the operation of the functions defined
+-# below, and should be set appropriately depending on run-time para-
+-# meters passed on the command line.
+-
+-opt_dry_run=false
+-opt_quiet=false
+-opt_verbose=false
+-
+-# Categories 'all' and 'none' are always available. Append any others
+-# you will pass as the first argument to func_warning from your own
+-# code.
+-warning_categories=
+-
+-# By default, display warnings according to 'opt_warning_types'. Set
+-# 'warning_func' to ':' to elide all warnings, or func_fatal_error to
+-# treat the next displayed warning as a fatal error.
+-warning_func=func_warn_and_continue
+-
+-# Set to 'all' to display all warnings, 'none' to suppress all
+-# warnings, or a space delimited list of some subset of
+-# 'warning_categories' to display only the listed warnings.
+-opt_warning_types=all
+-
+-
+-## -------------------- ##
+-## Resource management. ##
+-## -------------------- ##
+-
+-# This section contains definitions for functions that each ensure a
+-# particular resource (a file, or a non-empty configuration variable for
+-# example) is available, and if appropriate to extract default values
+-# from pertinent package files. Call them using their associated
+-# 'require_*' variable to ensure that they are executed, at most, once.
+-#
+-# It's entirely deliberate that calling these functions can set
+-# variables that don't obey the namespace limitations obeyed by the rest
+-# of this file, in order that that they be as useful as possible to
+-# callers.
+-
+-
+-# require_term_colors
+-# -------------------
+-# Allow display of bold text on terminals that support it.
+-require_term_colors=func_require_term_colors
+-func_require_term_colors ()
+-{
+- $debug_cmd
+-
+- test -t 1 && {
+- # COLORTERM and USE_ANSI_COLORS environment variables take
+- # precedence, because most terminfo databases neglect to describe
+- # whether color sequences are supported.
+- test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+-
+- if test 1 = "$USE_ANSI_COLORS"; then
+- # Standard ANSI escape sequences
+- tc_reset='[0m'
+- tc_bold='[1m'; tc_standout='[7m'
+- tc_red='[31m'; tc_green='[32m'
+- tc_blue='[34m'; tc_cyan='[36m'
+- else
+- # Otherwise trust the terminfo database after all.
+- test -n "`tput sgr0 2>/dev/null`" && {
+- tc_reset=`tput sgr0`
+- test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+- tc_standout=$tc_bold
+- test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+- test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+- test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+- test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+- test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+- }
+- fi
+- }
+-
+- require_term_colors=:
+-}
+-
+-
+-## ----------------- ##
+-## Function library. ##
+-## ----------------- ##
+-
+-# This section contains a variety of useful functions to call in your
+-# scripts. Take note of the portable wrappers for features provided by
+-# some modern shells, which will fall back to slower equivalents on
+-# less featureful shells.
+-
+-
+-# func_append VAR VALUE
+-# ---------------------
+-# Append VALUE onto the existing contents of VAR.
+-
+- # We should try to minimise forks, especially on Windows where they are
+- # unreasonably slow, so skip the feature probes when bash or zsh are
+- # being used:
+- if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+- : ${_G_HAVE_ARITH_OP="yes"}
+- : ${_G_HAVE_XSI_OPS="yes"}
+- # The += operator was introduced in bash 3.1
+- case $BASH_VERSION in
+- [12].* | 3.0 | 3.0*) ;;
+- *)
+- : ${_G_HAVE_PLUSEQ_OP="yes"}
+- ;;
+- esac
+- fi
+-
+- # _G_HAVE_PLUSEQ_OP
+- # Can be empty, in which case the shell is probed, "yes" if += is
+- # useable or anything else if it does not work.
+- test -z "$_G_HAVE_PLUSEQ_OP" \
+- && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+- && _G_HAVE_PLUSEQ_OP=yes
+-
+-if test yes = "$_G_HAVE_PLUSEQ_OP"
+-then
+- # This is an XSI compatible shell, allowing a faster implementation...
+- eval 'func_append ()
+- {
+- $debug_cmd
+-
+- eval "$1+=\$2"
+- }'
+-else
+- # ...otherwise fall back to using expr, which is often a shell builtin.
+- func_append ()
+- {
+- $debug_cmd
+-
+- eval "$1=\$$1\$2"
+- }
+-fi
+-
+-
+-# func_append_quoted VAR VALUE
+-# ----------------------------
+-# Quote VALUE and append to the end of shell variable VAR, separated
+-# by a space.
+-if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+- eval 'func_append_quoted ()
+- {
+- $debug_cmd
+-
+- func_quote_for_eval "$2"
+- eval "$1+=\\ \$func_quote_for_eval_result"
+- }'
+-else
+- func_append_quoted ()
+- {
+- $debug_cmd
+-
+- func_quote_for_eval "$2"
+- eval "$1=\$$1\\ \$func_quote_for_eval_result"
+- }
+-fi
+-
+-
+-# func_append_uniq VAR VALUE
+-# --------------------------
+-# Append unique VALUE onto the existing contents of VAR, assuming
+-# entries are delimited by the first character of VALUE. For example:
+-#
+-# func_append_uniq options " --another-option option-argument"
+-#
+-# will only append to $options if " --another-option option-argument "
+-# is not already present somewhere in $options already (note spaces at
+-# each end implied by leading space in second argument).
+-func_append_uniq ()
+-{
+- $debug_cmd
+-
+- eval _G_current_value='`$ECHO $'$1'`'
+- _G_delim=`expr "$2" : '\(.\)'`
+-
+- case $_G_delim$_G_current_value$_G_delim in
+- *"$2$_G_delim"*) ;;
+- *) func_append "$@" ;;
+- esac
+-}
+-
+-
+-# func_arith TERM...
+-# ------------------
+-# Set func_arith_result to the result of evaluating TERMs.
+- test -z "$_G_HAVE_ARITH_OP" \
+- && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+- && _G_HAVE_ARITH_OP=yes
+-
+-if test yes = "$_G_HAVE_ARITH_OP"; then
+- eval 'func_arith ()
+- {
+- $debug_cmd
+-
+- func_arith_result=$(( $* ))
+- }'
+-else
+- func_arith ()
+- {
+- $debug_cmd
+-
+- func_arith_result=`expr "$@"`
+- }
+-fi
+-
+-
+-# func_basename FILE
+-# ------------------
+-# Set func_basename_result to FILE with everything up to and including
+-# the last / stripped.
+-if test yes = "$_G_HAVE_XSI_OPS"; then
+- # If this shell supports suffix pattern removal, then use it to avoid
+- # forking. Hide the definitions single quotes in case the shell chokes
+- # on unsupported syntax...
+- _b='func_basename_result=${1##*/}'
+- _d='case $1 in
+- */*) func_dirname_result=${1%/*}$2 ;;
+- * ) func_dirname_result=$3 ;;
+- esac'
+-
+-else
+- # ...otherwise fall back to using sed.
+- _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+- _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"`
+- if test "X$func_dirname_result" = "X$1"; then
+- func_dirname_result=$3
+- else
+- func_append func_dirname_result "$2"
+- fi'
+-fi
+-
+-eval 'func_basename ()
+-{
+- $debug_cmd
+-
+- '"$_b"'
+-}'
+-
+-
+-# func_dirname FILE APPEND NONDIR_REPLACEMENT
+-# -------------------------------------------
+-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+-# otherwise set result to NONDIR_REPLACEMENT.
+-eval 'func_dirname ()
+-{
+- $debug_cmd
+-
+- '"$_d"'
+-}'
++# 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'
+
+-# 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"
+-# For efficiency, we do not delegate to the functions above but instead
+-# duplicate the functionality here.
+-eval 'func_dirname_and_basename ()
+-{
+- $debug_cmd
++# 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'
+
+- '"$_b"'
+- '"$_d"'
+-}'
++# 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.
++# Since each input `\' is now two `\'s, look for any number of runs of
++# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
++bs='\\'
++bs2='\\\\'
++bs4='\\\\\\\\'
++dollar='\$'
++sed_double_backslash="\
++ s/$bs4/&\\
++/g
++ s/^$bs2$dollar/$bs&/
++ s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
++ s/\n//g"
+
++# Standard options:
++opt_dry_run=false
++opt_help=false
++opt_quiet=false
++opt_verbose=false
++opt_warning=:
+
+-# func_echo ARG...
+-# ----------------
+-# Echo program name prefixed message.
++# func_echo arg...
++# Echo program name prefixed message, along with the current mode
++# name if it has been set yet.
+ func_echo ()
+ {
+- $debug_cmd
++ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
++}
+
+- _G_message=$*
++# func_verbose arg...
++# Echo program name prefixed message in verbose mode only.
++func_verbose ()
++{
++ $opt_verbose && func_echo ${1+"$@"}
+
+- func_echo_IFS=$IFS
+- IFS=$nl
+- for _G_line in $_G_message; do
+- IFS=$func_echo_IFS
+- $ECHO "$progname: $_G_line"
+- done
+- IFS=$func_echo_IFS
++ # A bug in bash halts the script if the last line of a function
++ # fails when set -e is in force, so we need another command to
++ # work around that:
++ :
+ }
+
+-
+-# func_echo_all ARG...
+-# --------------------
++# func_echo_all arg...
+ # Invoke $ECHO with all args, space-separated.
+ func_echo_all ()
+ {
+ $ECHO "$*"
+ }
+
+-
+-# func_echo_infix_1 INFIX ARG...
+-# ------------------------------
+-# Echo program name, followed by INFIX on the first line, with any
+-# additional lines not showing INFIX.
+-func_echo_infix_1 ()
+-{
+- $debug_cmd
+-
+- $require_term_colors
+-
+- _G_infix=$1; shift
+- _G_indent=$_G_infix
+- _G_prefix="$progname: $_G_infix: "
+- _G_message=$*
+-
+- # Strip color escape sequences before counting printable length
+- for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+- do
+- test -n "$_G_tc" && {
+- _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+- _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+- }
+- done
+- _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes
+-
+- func_echo_infix_1_IFS=$IFS
+- IFS=$nl
+- for _G_line in $_G_message; do
+- IFS=$func_echo_infix_1_IFS
+- $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+- _G_prefix=$_G_indent
+- done
+- IFS=$func_echo_infix_1_IFS
+-}
+-
+-
+-# func_error ARG...
+-# -----------------
++# func_error arg...
+ # Echo program name prefixed message to standard error.
+ func_error ()
+ {
+- $debug_cmd
++ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
++}
+
+- $require_term_colors
++# func_warning arg...
++# Echo program name prefixed warning message to standard error.
++func_warning ()
++{
++ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+
+- func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2
++ # bash bug again:
++ :
+ }
+
+-
+-# func_fatal_error ARG...
+-# -----------------------
++# func_fatal_error arg...
+ # Echo program name prefixed message to standard error, and exit.
+ func_fatal_error ()
+ {
+- $debug_cmd
+-
+- func_error "$*"
++ func_error ${1+"$@"}
+ exit $EXIT_FAILURE
+ }
+
++# func_fatal_help arg...
++# Echo program name prefixed message to standard error, followed by
++# a help hint, and exit.
++func_fatal_help ()
++{
++ func_error ${1+"$@"}
++ func_fatal_error "$help"
++}
++help="Try \`$progname --help' for more information." ## default
++
+
+-# func_grep EXPRESSION FILENAME
+-# -----------------------------
++# func_grep expression filename
+ # Check whether EXPRESSION matches any line of FILENAME, without output.
+ func_grep ()
+ {
+- $debug_cmd
+-
+ $GREP "$1" "$2" >/dev/null 2>&1
+ }
+
+
+-# func_len STRING
+-# ---------------
+-# Set func_len_result to the length of STRING. STRING may not
+-# start with a hyphen.
+- test -z "$_G_HAVE_XSI_OPS" \
+- && (eval 'x=a/b/c;
+- test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+- && _G_HAVE_XSI_OPS=yes
+-
+-if test yes = "$_G_HAVE_XSI_OPS"; then
+- eval 'func_len ()
+- {
+- $debug_cmd
+-
+- func_len_result=${#1}
+- }'
+-else
+- func_len ()
+- {
+- $debug_cmd
+-
+- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+- }
+-fi
+-
+-
+-# func_mkdir_p DIRECTORY-PATH
+-# ---------------------------
++# func_mkdir_p directory-path
+ # Make sure the entire path to DIRECTORY-PATH is available.
+ func_mkdir_p ()
+ {
+- $debug_cmd
+-
+- _G_directory_path=$1
+- _G_dir_list=
++ my_directory_path="$1"
++ my_dir_list=
+
+- if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
++ if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+- # Protect directory names starting with '-'
+- case $_G_directory_path in
+- -*) _G_directory_path=./$_G_directory_path ;;
++ # Protect directory names starting with `-'
++ case $my_directory_path in
++ -*) my_directory_path="./$my_directory_path" ;;
+ esac
+
+ # While some portion of DIR does not yet exist...
+- while test ! -d "$_G_directory_path"; do
++ while test ! -d "$my_directory_path"; do
+ # ...make a list in topmost first order. Use a colon delimited
+ # list incase some portion of path contains whitespace.
+- _G_dir_list=$_G_directory_path:$_G_dir_list
++ my_dir_list="$my_directory_path:$my_dir_list"
+
+ # If the last portion added has no slash in it, the list is done
+- case $_G_directory_path in */*) ;; *) break ;; esac
++ case $my_directory_path in */*) ;; *) break ;; esac
+
+ # ...otherwise throw away the child directory and loop
+- _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
++ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+ done
+- _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
++ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+
+- func_mkdir_p_IFS=$IFS; IFS=:
+- for _G_dir in $_G_dir_list; do
+- IFS=$func_mkdir_p_IFS
+- # mkdir can fail with a 'File exist' error if two processes
++ save_mkdir_p_IFS="$IFS"; IFS=':'
++ for my_dir in $my_dir_list; do
++ IFS="$save_mkdir_p_IFS"
++ # mkdir can fail with a `File exist' error if two processes
+ # try to create one of the directories concurrently. Don't
+ # stop in that case!
+- $MKDIR "$_G_dir" 2>/dev/null || :
++ $MKDIR "$my_dir" 2>/dev/null || :
+ done
+- IFS=$func_mkdir_p_IFS
++ IFS="$save_mkdir_p_IFS"
+
+ # Bail out if we (or some other process) failed to create a directory.
+- test -d "$_G_directory_path" || \
+- func_fatal_error "Failed to create '$1'"
++ test -d "$my_directory_path" || \
++ func_fatal_error "Failed to create \`$1'"
+ fi
+ }
+
+
+-# func_mktempdir [BASENAME]
+-# -------------------------
++# func_mktempdir [string]
+ # Make a temporary directory that won't clash with other running
+ # libtool processes, and avoids race conditions if possible. If
+-# given, BASENAME is the basename for that directory.
++# given, STRING is the basename for that directory.
+ func_mktempdir ()
+ {
+- $debug_cmd
++ my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+- _G_template=${TMPDIR-/tmp}/${1-$progname}
+-
+- if test : = "$opt_dry_run"; then
++ if test "$opt_dry_run" = ":"; then
+ # Return a directory name, but don't create it in dry-run mode
+- _G_tmpdir=$_G_template-$$
++ my_tmpdir="${my_template}-$$"
+ else
+
+ # If mktemp works, use that first and foremost
+- _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
++ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+- if test ! -d "$_G_tmpdir"; then
++ if test ! -d "$my_tmpdir"; then
+ # Failing that, at least try and use $RANDOM to avoid a race
+- _G_tmpdir=$_G_template-${RANDOM-0}$$
++ my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+- func_mktempdir_umask=`umask`
++ save_mktempdir_umask=`umask`
+ umask 0077
+- $MKDIR "$_G_tmpdir"
+- umask $func_mktempdir_umask
++ $MKDIR "$my_tmpdir"
++ umask $save_mktempdir_umask
+ fi
+
+ # If we're not in dry-run mode, bomb out on failure
+- test -d "$_G_tmpdir" || \
+- func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
++ test -d "$my_tmpdir" || \
++ func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+ fi
+
+- $ECHO "$_G_tmpdir"
++ $ECHO "$my_tmpdir"
+ }
+
+
+-# func_normal_abspath PATH
+-# ------------------------
+-# Remove doubled-up and trailing slashes, "." path components,
+-# and cancel out any ".." path components in PATH after making
+-# it an absolute path.
+-func_normal_abspath ()
++# func_quote_for_eval arg
++# Aesthetically quote ARG to be evaled later.
++# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
++# is double-quoted, suitable for a subsequent eval, whereas
++# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
++# which are still active within double quotes backslashified.
++func_quote_for_eval ()
+ {
+- $debug_cmd
++ case $1 in
++ *[\\\`\"\$]*)
++ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
++ *)
++ func_quote_for_eval_unquoted_result="$1" ;;
++ esac
+
+- # These SED scripts presuppose an absolute path with a trailing slash.
+- _G_pathcar='s|^/\([^/]*\).*$|\1|'
+- _G_pathcdr='s|^/[^/]*||'
+- _G_removedotparts=':dotsl
+- s|/\./|/|g
+- t dotsl
+- s|/\.$|/|'
+- _G_collapseslashes='s|/\{1,\}|/|g'
+- _G_finalslash='s|/*$|/|'
+-
+- # Start from root dir and reassemble the path.
+- func_normal_abspath_result=
+- func_normal_abspath_tpath=$1
+- func_normal_abspath_altnamespace=
+- case $func_normal_abspath_tpath in
+- "")
+- # Empty path, that just means $cwd.
+- func_stripname '' '/' "`pwd`"
+- func_normal_abspath_result=$func_stripname_result
+- return
+- ;;
+- # The next three entries are used to spot a run of precisely
+- # two leading slashes without using negated character classes;
+- # we take advantage of case's first-match behaviour.
+- ///*)
+- # Unusual form of absolute path, do nothing.
+- ;;
+- //*)
+- # Not necessarily an ordinary path; POSIX reserves leading '//'
+- # and for example Cygwin uses it to access remote file shares
+- # over CIFS/SMB, so we conserve a leading double slash if found.
+- func_normal_abspath_altnamespace=/
+- ;;
+- /*)
+- # Absolute path, do nothing.
++ case $func_quote_for_eval_unquoted_result in
++ # Double-quote args containing shell metacharacters to delay
++ # word splitting, command substitution and and variable
++ # expansion for a subsequent eval.
++ # Many Bourne shells cannot handle close brackets correctly
++ # in scan sets, so we specify it separately.
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+ ;;
+ *)
+- # Relative path, prepend $cwd.
+- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+- ;;
++ func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+ esac
+-
+- # Cancel out all the simple stuff to save iterations. We also want
+- # the path to end with a slash for ease of parsing, so make sure
+- # there is one (and only one) here.
+- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+- -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+- while :; do
+- # Processed it all yet?
+- if test / = "$func_normal_abspath_tpath"; then
+- # If we ascended to the root using ".." the result may be empty now.
+- if test -z "$func_normal_abspath_result"; then
+- func_normal_abspath_result=/
+- fi
+- break
+- fi
+- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+- -e "$_G_pathcar"`
+- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+- -e "$_G_pathcdr"`
+- # Figure out what to do with it
+- case $func_normal_abspath_tcomponent in
+- "")
+- # Trailing empty path component, ignore it.
+- ;;
+- ..)
+- # Parent dir; strip last assembled component from result.
+- func_dirname "$func_normal_abspath_result"
+- func_normal_abspath_result=$func_dirname_result
+- ;;
+- *)
+- # Actual path component, append it.
+- func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+- ;;
+- esac
+- done
+- # Restore leading double-slash if one was found on entry.
+- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+-}
+-
+-
+-# func_notquiet ARG...
+-# --------------------
+-# Echo program name prefixed message only when not in quiet mode.
+-func_notquiet ()
+-{
+- $debug_cmd
+-
+- $opt_quiet || func_echo ${1+"$@"}
+-
+- # A bug in bash halts the script if the last line of a function
+- # fails when set -e is in force, so we need another command to
+- # work around that:
+- :
+-}
+-
+-
+-# func_relative_path SRCDIR DSTDIR
+-# --------------------------------
+-# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+-func_relative_path ()
+-{
+- $debug_cmd
+-
+- func_relative_path_result=
+- func_normal_abspath "$1"
+- func_relative_path_tlibdir=$func_normal_abspath_result
+- func_normal_abspath "$2"
+- func_relative_path_tbindir=$func_normal_abspath_result
+-
+- # Ascend the tree starting from libdir
+- while :; do
+- # check if we have found a prefix of bindir
+- case $func_relative_path_tbindir in
+- $func_relative_path_tlibdir)
+- # found an exact match
+- func_relative_path_tcancelled=
+- break
+- ;;
+- $func_relative_path_tlibdir*)
+- # found a matching prefix
+- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+- func_relative_path_tcancelled=$func_stripname_result
+- if test -z "$func_relative_path_result"; then
+- func_relative_path_result=.
+- fi
+- break
+- ;;
+- *)
+- func_dirname $func_relative_path_tlibdir
+- func_relative_path_tlibdir=$func_dirname_result
+- if test -z "$func_relative_path_tlibdir"; then
+- # Have to descend all the way to the root!
+- func_relative_path_result=../$func_relative_path_result
+- func_relative_path_tcancelled=$func_relative_path_tbindir
+- break
+- fi
+- func_relative_path_result=../$func_relative_path_result
+- ;;
+- esac
+- done
+-
+- # Now calculate path; take care to avoid doubling-up slashes.
+- func_stripname '' '/' "$func_relative_path_result"
+- func_relative_path_result=$func_stripname_result
+- func_stripname '/' '/' "$func_relative_path_tcancelled"
+- if test -n "$func_stripname_result"; then
+- func_append func_relative_path_result "/$func_stripname_result"
+- fi
+-
+- # Normalisation. If bindir is libdir, return '.' else relative path.
+- if test -n "$func_relative_path_result"; then
+- func_stripname './' '' "$func_relative_path_result"
+- func_relative_path_result=$func_stripname_result
+- fi
+-
+- test -n "$func_relative_path_result" || func_relative_path_result=.
+-
+- :
+ }
+
+
+-# func_quote_for_eval ARG...
+-# --------------------------
+-# Aesthetically quote ARGs to be evaled later.
+-# This function returns two values:
+-# i) func_quote_for_eval_result
+-# double-quoted, suitable for a subsequent eval
+-# ii) func_quote_for_eval_unquoted_result
+-# has all characters that are still active within double
+-# quotes backslashified.
+-func_quote_for_eval ()
+-{
+- $debug_cmd
+-
+- func_quote_for_eval_unquoted_result=
+- func_quote_for_eval_result=
+- while test 0 -lt $#; do
+- case $1 in
+- *[\\\`\"\$]*)
+- _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+- *)
+- _G_unquoted_arg=$1 ;;
+- esac
+- if test -n "$func_quote_for_eval_unquoted_result"; then
+- func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+- else
+- func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+- fi
+-
+- case $_G_unquoted_arg in
+- # Double-quote args containing shell metacharacters to delay
+- # word splitting, command substitution and variable expansion
+- # for a subsequent eval.
+- # Many Bourne shells cannot handle close brackets correctly
+- # in scan sets, so we specify it separately.
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+- _G_quoted_arg=\"$_G_unquoted_arg\"
+- ;;
+- *)
+- _G_quoted_arg=$_G_unquoted_arg
+- ;;
+- esac
+-
+- if test -n "$func_quote_for_eval_result"; then
+- func_append func_quote_for_eval_result " $_G_quoted_arg"
+- else
+- func_append func_quote_for_eval_result "$_G_quoted_arg"
+- fi
+- shift
+- done
+-}
+-
+-
+-# func_quote_for_expand ARG
+-# -------------------------
++# func_quote_for_expand arg
+ # Aesthetically quote ARG to be evaled later; same as above,
+ # but do not quote variable references.
+ func_quote_for_expand ()
+ {
+- $debug_cmd
+-
+ case $1 in
+ *[\\\`\"]*)
+- _G_arg=`$ECHO "$1" | $SED \
+- -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
++ my_arg=`$ECHO "$1" | $SED \
++ -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+ *)
+- _G_arg=$1 ;;
++ my_arg="$1" ;;
+ esac
+
+- case $_G_arg in
++ case $my_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting and command substitution for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+- _G_arg=\"$_G_arg\"
++ my_arg="\"$my_arg\""
+ ;;
+ esac
+
+- func_quote_for_expand_result=$_G_arg
++ func_quote_for_expand_result="$my_arg"
+ }
+
+
+-# func_stripname PREFIX SUFFIX NAME
+-# ---------------------------------
+-# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+-# 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).
+-if test yes = "$_G_HAVE_XSI_OPS"; then
+- eval 'func_stripname ()
+- {
+- $debug_cmd
+-
+- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+- # positional parameters, so assign one to ordinary variable first.
+- func_stripname_result=$3
+- func_stripname_result=${func_stripname_result#"$1"}
+- func_stripname_result=${func_stripname_result%"$2"}
+- }'
+-else
+- func_stripname ()
+- {
+- $debug_cmd
+-
+- case $2 in
+- .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+- *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+- esac
+- }
+-fi
+-
+-
+-# func_show_eval CMD [FAIL_EXP]
+-# -----------------------------
+-# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
++# func_show_eval cmd [fail_exp]
++# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
+ # not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+ # is given, then evaluate it.
+ func_show_eval ()
+ {
+- $debug_cmd
+-
+- _G_cmd=$1
+- _G_fail_exp=${2-':'}
++ my_cmd="$1"
++ my_fail_exp="${2-:}"
+
+- func_quote_for_expand "$_G_cmd"
+- eval "func_notquiet $func_quote_for_expand_result"
++ ${opt_silent-false} || {
++ func_quote_for_expand "$my_cmd"
++ eval "func_echo $func_quote_for_expand_result"
++ }
+
+- $opt_dry_run || {
+- eval "$_G_cmd"
+- _G_status=$?
+- if test 0 -ne "$_G_status"; then
+- eval "(exit $_G_status); $_G_fail_exp"
++ if ${opt_dry_run-false}; then :; else
++ eval "$my_cmd"
++ my_status=$?
++ if test "$my_status" -eq 0; then :; else
++ eval "(exit $my_status); $my_fail_exp"
+ fi
+- }
++ fi
+ }
+
+
+-# func_show_eval_locale CMD [FAIL_EXP]
+-# ------------------------------------
+-# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
++# func_show_eval_locale cmd [fail_exp]
++# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
+ # not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+ # is given, then evaluate it. Use the saved locale for evaluation.
+ func_show_eval_locale ()
+ {
+- $debug_cmd
+-
+- _G_cmd=$1
+- _G_fail_exp=${2-':'}
++ my_cmd="$1"
++ my_fail_exp="${2-:}"
+
+- $opt_quiet || {
+- func_quote_for_expand "$_G_cmd"
++ ${opt_silent-false} || {
++ func_quote_for_expand "$my_cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+
+- $opt_dry_run || {
+- eval "$_G_user_locale
+- $_G_cmd"
+- _G_status=$?
+- eval "$_G_safe_locale"
+- if test 0 -ne "$_G_status"; then
+- eval "(exit $_G_status); $_G_fail_exp"
++ if ${opt_dry_run-false}; then :; else
++ eval "$lt_user_locale
++ $my_cmd"
++ my_status=$?
++ eval "$lt_safe_locale"
++ if test "$my_status" -eq 0; then :; else
++ eval "(exit $my_status); $my_fail_exp"
+ fi
+- }
++ 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 ()
+ {
+- $debug_cmd
+-
+- case $1 in
+- [0-9]* | *[!a-zA-Z0-9_]*)
+- func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+- ;;
+- * )
+- func_tr_sh_result=$1
+- ;;
+- esac
+-}
+-
+-
+-# func_verbose ARG...
+-# -------------------
+-# Echo program name prefixed message in verbose mode only.
+-func_verbose ()
+-{
+- $debug_cmd
+-
+- $opt_verbose && func_echo "$*"
+-
+- :
+-}
+-
+-
+-# func_warn_and_continue ARG...
+-# -----------------------------
+-# Echo program name prefixed warning message to standard error.
+-func_warn_and_continue ()
+-{
+- $debug_cmd
+-
+- $require_term_colors
+-
+- func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+-}
+-
+-
+-# func_warning CATEGORY ARG...
+-# ----------------------------
+-# Echo program name prefixed warning message to standard error. Warning
+-# messages can be filtered according to CATEGORY, where this function
+-# elides messages where CATEGORY is not listed in the global variable
+-# 'opt_warning_types'.
+-func_warning ()
+-{
+- $debug_cmd
+-
+- # CATEGORY must be in the warning_categories list!
+- case " $warning_categories " in
+- *" $1 "*) ;;
+- *) func_internal_error "invalid warning category '$1'" ;;
+- esac
+-
+- _G_category=$1
+- shift
+-
+- case " $opt_warning_types " in
+- *" $_G_category "*) $warning_func ${1+"$@"} ;;
+- esac
+-}
+-
+-
+-# func_sort_ver VER1 VER2
+-# -----------------------
+-# 'sort -V' is not generally available.
+-# Note this deviates from the version comparison in automake
+-# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+-# but this should suffice as we won't be specifying old
+-# version formats or redundant trailing .0 in bootstrap.conf.
+-# If we did want full compatibility then we should probably
+-# use m4_version_compare from autoconf.
+-func_sort_ver ()
+-{
+- $debug_cmd
+-
+- printf '%s\n%s\n' "$1" "$2" \
+- | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+-}
+-
+-# func_lt_ver PREV CURR
+-# ---------------------
+-# Return true if PREV and CURR are in the correct order according to
+-# func_sort_ver, otherwise false. Use it like this:
+-#
+-# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+-func_lt_ver ()
+-{
+- $debug_cmd
+-
+- test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+-}
+-
+-
+-# Local variables:
+-# mode: shell-script
+-# sh-indentation: 2
+-# eval: (add-hook 'before-save-hook 'time-stamp)
+-# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+-# time-stamp-time-zone: "UTC"
+-# End:
+-#! /bin/sh
+-
+-# Set a version string for this script.
+-scriptversion=2014-01-07.03; # UTC
+-
+-# A portable, pluggable option parser for Bourne shell.
+-# Written by Gary V. Vaughan, 2010
+-
+-# Copyright (C) 2010-2015 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.
+-
+-# This program is free software: you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation, either version 3 of the License, or
+-# (at your option) any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+-# Please report bugs or propose patches to gary@gnu.org.
+-
+-
+-## ------ ##
+-## Usage. ##
+-## ------ ##
+-
+-# This file is a library for parsing options in your shell scripts along
+-# with assorted other useful supporting features that you can make use
+-# of too.
+-#
+-# For the simplest scripts you might need only:
+-#
+-# #!/bin/sh
+-# . relative/path/to/funclib.sh
+-# . relative/path/to/options-parser
+-# scriptversion=1.0
+-# func_options ${1+"$@"}
+-# eval set dummy "$func_options_result"; shift
+-# ...rest of your script...
+-#
+-# In order for the '--version' option to work, you will need to have a
+-# suitably formatted comment like the one at the top of this file
+-# starting with '# Written by ' and ending with '# warranty; '.
+-#
+-# For '-h' and '--help' to work, you will also need a one line
+-# description of your script's purpose in a comment directly above the
+-# '# Written by ' line, like the one at the top of this file.
+-#
+-# The default options also support '--debug', which will turn on shell
+-# execution tracing (see the comment above debug_cmd below for another
+-# use), and '--verbose' and the func_verbose function to allow your script
+-# to display verbose messages only when your user has specified
+-# '--verbose'.
+-#
+-# After sourcing this file, you can plug processing for additional
+-# options by amending the variables from the 'Configuration' section
+-# below, and following the instructions in the 'Option parsing'
+-# section further down.
+-
+-## -------------- ##
+-## Configuration. ##
+-## -------------- ##
+-
+-# You should override these variables in your script after sourcing this
+-# file so that they reflect the customisations you have added to the
+-# option parser.
+-
+-# The usage line for option parsing errors and the start of '-h' and
+-# '--help' output messages. You can embed shell variables for delayed
+-# expansion at the time the message is displayed, but you will need to
+-# quote other shell meta-characters carefully to prevent them being
+-# expanded when the contents are evaled.
+-usage='$progpath [OPTION]...'
+-
+-# Short help message in response to '-h' and '--help'. Add to this or
+-# override it after sourcing this library to reflect the full set of
+-# options your script accepts.
+-usage_message="\
+- --debug enable verbose shell tracing
+- -W, --warnings=CATEGORY
+- report the warnings falling in CATEGORY [all]
+- -v, --verbose verbosely report processing
+- --version print version information and exit
+- -h, --help print short or long help message and exit
+-"
+-
+-# Additional text appended to 'usage_message' in response to '--help'.
+-long_help_message="
+-Warning categories include:
+- 'all' show all warnings
+- 'none' turn off all the warnings
+- 'error' warnings are treated as fatal errors"
+-
+-# Help message printed before fatal option parsing errors.
+-fatal_help="Try '\$progname --help' for more information."
+-
+-
+-
+-## ------------------------- ##
+-## Hook function management. ##
+-## ------------------------- ##
+-
+-# This section contains functions for adding, removing, and running hooks
+-# to the main code. A hook is just a named list of of function, that can
+-# be run in order later on.
+-
+-# func_hookable FUNC_NAME
+-# -----------------------
+-# Declare that FUNC_NAME will run hooks added with
+-# 'func_add_hook FUNC_NAME ...'.
+-func_hookable ()
+-{
+- $debug_cmd
+-
+- func_append hookable_fns " $1"
+-}
+-
+-
+-# func_add_hook FUNC_NAME HOOK_FUNC
+-# ---------------------------------
+-# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must
+-# first have been declared "hookable" by a call to 'func_hookable'.
+-func_add_hook ()
+-{
+- $debug_cmd
+-
+- case " $hookable_fns " in
+- *" $1 "*) ;;
+- *) func_fatal_error "'$1' does not accept hook functions." ;;
+- esac
+-
+- eval func_append ${1}_hooks '" $2"'
+-}
+-
+-
+-# func_remove_hook FUNC_NAME HOOK_FUNC
+-# ------------------------------------
+-# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+-func_remove_hook ()
+-{
+- $debug_cmd
+-
+- eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+-}
+-
+-
+-# func_run_hooks FUNC_NAME [ARG]...
+-# ---------------------------------
+-# Run all hook functions registered to FUNC_NAME.
+-# It is assumed that the list of hook functions contains nothing more
+-# than a whitespace-delimited list of legal shell function names, and
+-# no effort is wasted trying to catch shell meta-characters or preserve
+-# whitespace.
+-func_run_hooks ()
+-{
+- $debug_cmd
+-
+- case " $hookable_fns " in
+- *" $1 "*) ;;
+- *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+- esac
+-
+- eval _G_hook_fns=\$$1_hooks; shift
+-
+- for _G_hook in $_G_hook_fns; do
+- eval $_G_hook '"$@"'
+-
+- # store returned options list back into positional
+- # parameters for next 'cmd' execution.
+- eval _G_hook_result=\$${_G_hook}_result
+- eval set dummy "$_G_hook_result"; shift
+- done
+-
+- func_quote_for_eval ${1+"$@"}
+- func_run_hooks_result=$func_quote_for_eval_result
+-}
+-
+-
+-
+-## --------------- ##
+-## Option parsing. ##
+-## --------------- ##
+-
+-# In order to add your own option parsing hooks, you must accept the
+-# full positional parameter list in your hook function, remove any
+-# options that you action, and then pass back the remaining unprocessed
+-# options in '<hooked_function_name>_result', escaped suitably for
+-# 'eval'. Like this:
+-#
+-# my_options_prep ()
+-# {
+-# $debug_cmd
+-#
+-# # Extend the existing usage message.
+-# usage_message=$usage_message'
+-# -s, --silent don'\''t print informational messages
+-# '
+-#
+-# func_quote_for_eval ${1+"$@"}
+-# my_options_prep_result=$func_quote_for_eval_result
+-# }
+-# func_add_hook func_options_prep my_options_prep
+-#
+-#
+-# my_silent_option ()
+-# {
+-# $debug_cmd
+-#
+-# # Note that for efficiency, we parse as many options as we can
+-# # recognise in a loop before passing the remainder back to the
+-# # caller on the first unrecognised argument we encounter.
+-# while test $# -gt 0; do
+-# opt=$1; shift
+-# case $opt in
+-# --silent|-s) opt_silent=: ;;
+-# # Separate non-argument short options:
+-# -s*) func_split_short_opt "$_G_opt"
+-# set dummy "$func_split_short_opt_name" \
+-# "-$func_split_short_opt_arg" ${1+"$@"}
+-# shift
+-# ;;
+-# *) set dummy "$_G_opt" "$*"; shift; break ;;
+-# esac
+-# done
+-#
+-# func_quote_for_eval ${1+"$@"}
+-# my_silent_option_result=$func_quote_for_eval_result
+-# }
+-# func_add_hook func_parse_options my_silent_option
+-#
+-#
+-# my_option_validation ()
+-# {
+-# $debug_cmd
+-#
+-# $opt_silent && $opt_verbose && func_fatal_help "\
+-# '--silent' and '--verbose' options are mutually exclusive."
+-#
+-# func_quote_for_eval ${1+"$@"}
+-# my_option_validation_result=$func_quote_for_eval_result
+-# }
+-# func_add_hook func_validate_options my_option_validation
+-#
+-# You'll alse need to manually amend $usage_message to reflect the extra
+-# options you parse. It's preferable to append if you can, so that
+-# multiple option parsing hooks can be added safely.
+-
+-
+-# func_options [ARG]...
+-# ---------------------
+-# All the functions called inside func_options are hookable. See the
+-# individual implementations for details.
+-func_hookable func_options
+-func_options ()
+-{
+- $debug_cmd
+-
+- func_options_prep ${1+"$@"}
+- eval func_parse_options \
+- ${func_options_prep_result+"$func_options_prep_result"}
+- eval func_validate_options \
+- ${func_parse_options_result+"$func_parse_options_result"}
+-
+- eval func_run_hooks func_options \
+- ${func_validate_options_result+"$func_validate_options_result"}
+-
+- # save modified positional parameters for caller
+- func_options_result=$func_run_hooks_result
+-}
+-
+-
+-# func_options_prep [ARG]...
+-# --------------------------
+-# All initialisations required before starting the option parse loop.
+-# Note that when calling hook functions, we pass through the list of
+-# positional parameters. If a hook function modifies that list, and
+-# needs to propogate that back to rest of this script, then the complete
+-# modified list must be put in 'func_run_hooks_result' before
+-# returning.
+-func_hookable func_options_prep
+-func_options_prep ()
+-{
+- $debug_cmd
+-
+- # Option defaults:
+- opt_verbose=false
+- opt_warning_types=
+-
+- func_run_hooks func_options_prep ${1+"$@"}
+-
+- # save modified positional parameters for caller
+- func_options_prep_result=$func_run_hooks_result
+-}
+-
+-
+-# func_parse_options [ARG]...
+-# ---------------------------
+-# The main option parsing loop.
+-func_hookable func_parse_options
+-func_parse_options ()
+-{
+- $debug_cmd
+-
+- func_parse_options_result=
+-
+- # this just eases exit handling
+- while test $# -gt 0; do
+- # Defer to hook functions for initial option parsing, so they
+- # get priority in the event of reusing an option name.
+- func_run_hooks func_parse_options ${1+"$@"}
+-
+- # Adjust func_parse_options positional parameters to match
+- eval set dummy "$func_run_hooks_result"; shift
+-
+- # Break out of the loop if we already parsed every option.
+- test $# -gt 0 || break
+-
+- _G_opt=$1
+- shift
+- case $_G_opt in
+- --debug|-x) debug_cmd='set -x'
+- func_echo "enabling shell trace mode"
+- $debug_cmd
+- ;;
+-
+- --no-warnings|--no-warning|--no-warn)
+- set dummy --warnings none ${1+"$@"}
+- shift
+- ;;
+-
+- --warnings|--warning|-W)
+- test $# = 0 && func_missing_arg $_G_opt && break
+- case " $warning_categories $1" in
+- *" $1 "*)
+- # trailing space prevents matching last $1 above
+- func_append_uniq opt_warning_types " $1"
+- ;;
+- *all)
+- opt_warning_types=$warning_categories
+- ;;
+- *none)
+- opt_warning_types=none
+- warning_func=:
+- ;;
+- *error)
+- opt_warning_types=$warning_categories
+- warning_func=func_fatal_error
+- ;;
+- *)
+- func_fatal_error \
+- "unsupported warning category: '$1'"
+- ;;
+- esac
+- shift
+- ;;
+-
+- --verbose|-v) opt_verbose=: ;;
+- --version) func_version ;;
+- -\?|-h) func_usage ;;
+- --help) func_help ;;
+-
+- # Separate optargs to long options (plugins may need this):
+- --*=*) func_split_equals "$_G_opt"
+- set dummy "$func_split_equals_lhs" \
+- "$func_split_equals_rhs" ${1+"$@"}
+- shift
+- ;;
+-
+- # Separate optargs to short options:
+- -W*)
+- func_split_short_opt "$_G_opt"
+- set dummy "$func_split_short_opt_name" \
+- "$func_split_short_opt_arg" ${1+"$@"}
+- shift
+- ;;
+-
+- # Separate non-argument short options:
+- -\?*|-h*|-v*|-x*)
+- func_split_short_opt "$_G_opt"
+- set dummy "$func_split_short_opt_name" \
+- "-$func_split_short_opt_arg" ${1+"$@"}
+- shift
+- ;;
+-
+- --) break ;;
+- -*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
+- *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+- esac
+- done
+-
+- # save modified positional parameters for caller
+- func_quote_for_eval ${1+"$@"}
+- func_parse_options_result=$func_quote_for_eval_result
++ 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_validate_options [ARG]...
+-# ------------------------------
+-# Perform any sanity checks on option settings and/or unconsumed
+-# arguments.
+-func_hookable func_validate_options
+-func_validate_options ()
++# func_version
++# Echo version message to standard output and exit.
++func_version ()
+ {
+- $debug_cmd
+-
+- # Display all warnings if -W was not given.
+- test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+-
+- func_run_hooks func_validate_options ${1+"$@"}
++ $opt_debug
+
+- # Bail if the options were screwed!
+- $exit_cmd $EXIT_FAILURE
+-
+- # save modified positional parameters for caller
+- func_validate_options_result=$func_run_hooks_result
++ $SED -n '/(C)/!b go
++ :more
++ /\./!{
++ N
++ s/\n# / /
++ b more
++ }
++ :go
++ /^# '$PROGRAM' (GNU /,/# warranty; / {
++ s/^# //
++ s/^# *$//
++ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
++ p
++ }' < "$progpath"
++ exit $?
+ }
+
+-
+-
+-## ----------------- ##
+-## Helper functions. ##
+-## ----------------- ##
+-
+-# This section contains the helper functions used by the rest of the
+-# hookable option parser framework in ascii-betical order.
+-
+-
+-# func_fatal_help ARG...
+-# ----------------------
+-# Echo program name prefixed message to standard error, followed by
+-# a help hint, and exit.
+-func_fatal_help ()
++# func_usage
++# Echo short help message to standard output and exit.
++func_usage ()
+ {
+- $debug_cmd
++ $opt_debug
+
+- eval \$ECHO \""Usage: $usage"\"
+- eval \$ECHO \""$fatal_help"\"
+- func_error ${1+"$@"}
+- exit $EXIT_FAILURE
++ $SED -n '/^# Usage:/,/^# *.*--help/ {
++ s/^# //
++ s/^# *$//
++ s/\$progname/'$progname'/
++ p
++ }' < "$progpath"
++ echo
++ $ECHO "run \`$progname --help | more' for full usage"
++ exit $?
+ }
+
+-
+-# func_help
+-# ---------
+-# Echo long help message to standard output and exit.
++# func_help [NOEXIT]
++# Echo long help message to standard output and exit,
++# unless 'noexit' is passed as argument.
+ func_help ()
+ {
+- $debug_cmd
++ $opt_debug
+
+- func_usage_message
+- $ECHO "$long_help_message"
+- exit 0
++ $SED -n '/^# Usage:/,/# Report bugs to/ {
++ :print
++ s/^# //
++ s/^# *$//
++ s*\$progname*'$progname'*
++ s*\$host*'"$host"'*
++ s*\$SHELL*'"$SHELL"'*
++ s*\$LTCC*'"$LTCC"'*
++ s*\$LTCFLAGS*'"$LTCFLAGS"'*
++ s*\$LD*'"$LD"'*
++ s/\$with_gnu_ld/'"$with_gnu_ld"'/
++ s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
++ s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
++ p
++ d
++ }
++ /^# .* home page:/b print
++ /^# General help using/b print
++ ' < "$progpath"
++ ret=$?
++ if test -z "$1"; then
++ exit $ret
++ fi
+ }
+
+-
+-# func_missing_arg ARGNAME
+-# ------------------------
++# func_missing_arg argname
+ # Echo program name prefixed message to standard error and set global
+ # exit_cmd.
+ func_missing_arg ()
+ {
+- $debug_cmd
++ $opt_debug
+
+- func_error "Missing argument for '$1'."
++ func_error "missing argument for $1."
+ exit_cmd=exit
+ }
+
+
+-# func_split_equals STRING
+-# ------------------------
+-# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+-# splitting STRING at the '=' sign.
+-test -z "$_G_HAVE_XSI_OPS" \
+- && (eval 'x=a/b/c;
+- test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+- && _G_HAVE_XSI_OPS=yes
+-
+-if test yes = "$_G_HAVE_XSI_OPS"
+-then
+- # This is an XSI compatible shell, allowing a faster implementation...
+- eval 'func_split_equals ()
+- {
+- $debug_cmd
+-
+- func_split_equals_lhs=${1%%=*}
+- func_split_equals_rhs=${1#*=}
+- test "x$func_split_equals_lhs" = "x$1" \
+- && func_split_equals_rhs=
+- }'
+-else
+- # ...otherwise fall back to using expr, which is often a shell builtin.
+- func_split_equals ()
+- {
+- $debug_cmd
+-
+- func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+- func_split_equals_rhs=
+- test "x$func_split_equals_lhs" = "x$1" \
+- || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+- }
+-fi #func_split_equals
+-
+-
+-# func_split_short_opt SHORTOPT
+-# -----------------------------
++# 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.
+-if test yes = "$_G_HAVE_XSI_OPS"
+-then
+- # This is an XSI compatible shell, allowing a faster implementation...
+- eval 'func_split_short_opt ()
+- {
+- $debug_cmd
+-
+- func_split_short_opt_arg=${1#??}
+- func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+- }'
+-else
+- # ...otherwise fall back to using expr, which is often a shell builtin.
+- func_split_short_opt ()
+- {
+- $debug_cmd
+-
+- func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+- func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+- }
+-fi #func_split_short_opt
+-
+-
+-# func_usage
+-# ----------
+-# Echo short help message to standard output and exit.
+-func_usage ()
++func_split_short_opt ()
+ {
+- $debug_cmd
++ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
++ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+
+- func_usage_message
+- $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+- exit 0
+-}
++ 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_usage_message
+-# ------------------
+-# Echo short help message to standard output.
+-func_usage_message ()
++# 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 ()
+ {
+- $debug_cmd
++ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
++ my_sed_long_arg='1s/^--[^=]*=//'
+
+- eval \$ECHO \""Usage: $usage"\"
+- echo
+- $SED -n 's|^# ||
+- /^Written by/{
+- x;p;x
+- }
+- h
+- /^Written by/q' < "$progpath"
+- echo
+- eval \$ECHO \""$usage_message"\"
+-}
++ 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=:
+
+-# func_version
+-# ------------
+-# Echo version message to standard output and exit.
+-func_version ()
+-{
+- $debug_cmd
+
+- printf '%s\n' "$progname $scriptversion"
+- $SED -n '
+- /(C)/!b go
+- :more
+- /\./!{
+- N
+- s|\n# | |
+- b more
+- }
+- :go
+- /^# Written by /,/# warranty; / {
+- s|^# ||
+- s|^# *$||
+- s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+- p
+- }
+- /^# Written by / {
+- s|^# ||
+- p
+- }
+- /^warranty; /q' < "$progpath"
+
+- exit $?
+-}
+
+
+-# Local variables:
+-# mode: shell-script
+-# sh-indentation: 2
+-# eval: (add-hook 'before-save-hook 'time-stamp)
+-# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+-# time-stamp-time-zone: "UTC"
+-# End:
++magic="%%%MAGIC variable%%%"
++magic_exe="%%%MAGIC EXE variable%%%"
+
+-# Set a version string.
+-scriptversion='(GNU libtool) 2.4.6'
++# Global variables.
++nonopt=
++preserve_args=
++lo2o="s/\\.lo\$/.${objext}/"
++o2lo="s/\\.${objext}\$/.lo/"
++extracted_archives=
++extracted_serial=0
+
++# 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_echo ARG...
+-# ----------------
+-# Libtool also displays the current mode in messages, so override
+-# funclib.sh func_echo with this custom definition.
+-func_echo ()
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
+ {
+- $debug_cmd
+-
+- _G_message=$*
+-
+- func_echo_IFS=$IFS
+- IFS=$nl
+- for _G_line in $_G_message; do
+- IFS=$func_echo_IFS
+- $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+- done
+- IFS=$func_echo_IFS
+-}
++ eval "${1}=\$${1}\${2}"
++} # func_append may be replaced by extended shell implementation
+
+-
+-# func_warning ARG...
+-# -------------------
+-# Libtool warnings are not categorized, so override funclib.sh
+-# func_warning with this simpler definition.
+-func_warning ()
++# func_append_quoted var value
++# Quote VALUE and append to the end of shell variable VAR, separated
++# by a space.
++func_append_quoted ()
+ {
+- $debug_cmd
++ func_quote_for_eval "${2}"
++ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
++} # func_append_quoted may be replaced by extended shell implementation
+
+- $warning_func ${1+"$@"}
+-}
+-
+-
+-## ---------------- ##
+-## Options parsing. ##
+-## ---------------- ##
+-
+-# Hook in the functions to make sure our own options are parsed during
+-# the option parsing loop.
+-
+-usage='$progpath [OPTION]... [MODE-ARG]...'
+-
+-# Short help message in response to '-h'.
+-usage_message="Options:
+- --config show all configuration variables
+- --debug enable verbose shell tracing
+- -n, --dry-run display commands without modifying any files
+- --features display basic configuration information and exit
+- --mode=MODE use operation mode MODE
+- --no-warnings equivalent to '-Wnone'
+- --preserve-dup-deps don't remove duplicate dependency libraries
+- --quiet, --silent don't print informational messages
+- --tag=TAG use configuration variables from tag TAG
+- -v, --verbose print more informational messages than default
+- --version print version information
+- -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all]
+- -h, --help, --help-all print short, long, or detailed help message
+-"
+
+-# Additional text appended to 'usage_message' in response to '--help'.
+-func_help ()
++# func_arith arithmetic-term...
++func_arith ()
+ {
+- $debug_cmd
+-
+- func_usage_message
+- $ECHO "$long_help_message
+-
+-MODE must be one of the following:
+-
+- clean remove files from the build directory
+- compile compile a source file into a libtool object
+- execute automatically set library path, then run a program
+- finish complete the installation of libtool libraries
+- install install libraries or executables
+- link create a library or an executable
+- uninstall remove libraries from an installed directory
+-
+-MODE-ARGS vary depending on the MODE. When passed as first option,
+-'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+-Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+-
+-When reporting a bug, please describe a test case to reproduce it and
+-include the following information:
+-
+- host-triplet: $host
+- shell: $SHELL
+- compiler: $LTCC
+- compiler flags: $LTCFLAGS
+- linker: $LD (gnu? $with_gnu_ld)
+- version: $progname (GNU libtool) 2.4.6
+- automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+- autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+-
+-Report bugs to <bug-libtool@gnu.org>.
+-GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+-General help using GNU software: <http://www.gnu.org/gethelp/>."
+- exit 0
+-}
++ func_arith_result=`expr "${@}"`
++} # func_arith may be replaced by extended shell implementation
+
+
+-# func_lo2o OBJECT-NAME
+-# ---------------------
+-# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+-# object suffix.
++# 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
+
+-lo2o=s/\\.lo\$/.$objext/
+-o2lo=s/\\.$objext\$/.lo/
+
+-if test yes = "$_G_HAVE_XSI_OPS"; then
+- eval 'func_lo2o ()
+- {
+- case $1 in
+- *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+- * ) func_lo2o_result=$1 ;;
+- esac
+- }'
++# 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
+- # ---------------------------
+- # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+- # suffix to a '.lo' libtool-object suffix.
+- eval 'func_xform ()
+- {
+- func_xform_result=${1%.*}.lo
+- }'
+-else
+- # ...otherwise fall back to using sed.
+- func_lo2o ()
+- {
+- func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+- }
+
+- func_xform ()
+- {
+- func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+- }
+-fi
++# 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...
+-# -------------------------------
++# func_fatal_configuration arg...
+ # Echo program name prefixed message to standard error, followed by
+ # a configuration failure hint, and exit.
+ func_fatal_configuration ()
+ {
+- func__fatal_error ${1+"$@"} \
+- "See the $PACKAGE documentation for more information." \
+- "Fatal configuration error."
++ func_error ${1+"$@"}
++ func_error "See the $PACKAGE documentation for more information."
++ func_fatal_error "Fatal configuration error."
+ }
+
+
+ # func_config
+-# -----------
+ # Display the configuration for all the tags in this script.
+ func_config ()
+ {
+@@ -2149,19 +915,17 @@
+ exit $?
+ }
+
+-
+ # func_features
+-# -------------
+ # Display the features supported by this script.
+ func_features ()
+ {
+ echo "host: $host"
+- if test yes = "$build_libtool_libs"; then
++ if test "$build_libtool_libs" = yes; then
+ echo "enable shared libraries"
+ else
+ echo "disable shared libraries"
+ fi
+- if test yes = "$build_old_libs"; then
++ if test "$build_old_libs" = yes; then
+ echo "enable static libraries"
+ else
+ echo "disable static libraries"
+@@ -2170,297 +934,289 @@
+ exit $?
+ }
+
+-
+-# func_enable_tag TAGNAME
+-# -----------------------
++# func_enable_tag tagname
+ # Verify that TAGNAME is valid, and either flag an error and exit, or
+ # enable the TAGNAME tag. We also add TAGNAME to the global $taglist
+ # variable here.
+ func_enable_tag ()
+ {
+- # Global variable:
+- tagname=$1
++ # Global variable:
++ tagname="$1"
+
+- re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+- re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+- sed_extractcf=/$re_begincf/,/$re_endcf/p
+-
+- # Validate tagname.
+- case $tagname in
+- *[!-_A-Za-z0-9,/]*)
+- func_fatal_error "invalid tag name: $tagname"
+- ;;
+- esac
++ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
++ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
++ sed_extractcf="/$re_begincf/,/$re_endcf/p"
++
++ # Validate tagname.
++ case $tagname in
++ *[!-_A-Za-z0-9,/]*)
++ func_fatal_error "invalid tag name: $tagname"
++ ;;
++ esac
+
+- # Don't test for the "default" C tag, as we know it's
+- # there but not specially marked.
+- case $tagname in
+- CC) ;;
++ # Don't test for the "default" C tag, as we know it's
++ # there but not specially marked.
++ case $tagname in
++ CC) ;;
+ *)
+- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+- taglist="$taglist $tagname"
++ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
++ taglist="$taglist $tagname"
+
+- # Evaluate the configuration. Be careful to quote the path
+- # and the sed script, to avoid splitting on whitespace, but
+- # also don't use non-portable quotes within backquotes within
+- # quotes we have to do it in 2 steps:
+- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+- eval "$extractedcf"
+- else
+- func_error "ignoring unknown tag $tagname"
+- fi
+- ;;
+- esac
++ # Evaluate the configuration. Be careful to quote the path
++ # and the sed script, to avoid splitting on whitespace, but
++ # also don't use non-portable quotes within backquotes within
++ # quotes we have to do it in 2 steps:
++ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
++ eval "$extractedcf"
++ else
++ func_error "ignoring unknown tag $tagname"
++ fi
++ ;;
++ esac
+ }
+
+-
+ # 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
++ 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
++ 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
++ 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
+-
+- exit $EXIT_MISMATCH
+ fi
++
++ exit $EXIT_MISMATCH
++ fi
+ }
+
+
+-# libtool_options_prep [ARG]...
+-# -----------------------------
+-# Preparation for options parsed by libtool.
+-libtool_options_prep ()
+-{
+- $debug_mode
+-
+- # Option defaults:
+- opt_config=false
+- opt_dlopen=
+- opt_dry_run=false
+- opt_help=false
+- opt_mode=
+- opt_preserve_dup_deps=false
+- opt_quiet=false
++# 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
+
+- nonopt=
+- preserve_args=
+
+- # 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
+
+- # Pass back the list of options.
+- func_quote_for_eval ${1+"$@"}
+- libtool_options_prep_result=$func_quote_for_eval_result
+-}
+-func_add_hook func_options_prep libtool_options_prep
++# 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_warning=:
++opt_verbose=:
++opt_silent=false
++opt_verbose=false
+
+
+-# libtool_parse_options [ARG]...
+-# ---------------------------------
+-# Provide handling for libtool specific options.
+-libtool_parse_options ()
++# Parse options once, thoroughly. This comes as soon as possible in the
++# script to make things like `--version' happen as quickly as we can.
+ {
+- $debug_cmd
+-
+- # Perform our own loop to consume as many options as possible in
+- # each iteration.
+- while test $# -gt 0; do
+- _G_opt=$1
+- shift
+- case $_G_opt in
+- --dry-run|--dryrun|-n)
+- opt_dry_run=:
+- ;;
+-
+- --config) func_config ;;
+-
+- --dlopen|-dlopen)
+- opt_dlopen="${opt_dlopen+$opt_dlopen
+-}$1"
+- shift
+- ;;
+-
+- --preserve-dup-deps)
+- opt_preserve_dup_deps=: ;;
+-
+- --features) func_features ;;
+-
+- --finish) set dummy --mode finish ${1+"$@"}; shift ;;
+-
+- --help) opt_help=: ;;
+-
+- --help-all) opt_help=': help-all' ;;
+-
+- --mode) test $# = 0 && func_missing_arg $_G_opt && break
+- opt_mode=$1
+- 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 $_G_opt"
+- exit_cmd=exit
+- break
+- ;;
+- esac
+- shift
+- ;;
+-
+- --no-silent|--no-quiet)
+- opt_quiet=false
+- func_append preserve_args " $_G_opt"
+- ;;
+-
+- --no-warnings|--no-warning|--no-warn)
+- opt_warning=false
+- func_append preserve_args " $_G_opt"
+- ;;
+-
+- --no-verbose)
+- opt_verbose=false
+- func_append preserve_args " $_G_opt"
+- ;;
+-
+- --silent|--quiet)
+- opt_quiet=:
+- opt_verbose=false
+- func_append preserve_args " $_G_opt"
+- ;;
+-
+- --tag) test $# = 0 && func_missing_arg $_G_opt && break
+- opt_tag=$1
+- func_append preserve_args " $_G_opt $1"
+- func_enable_tag "$1"
+- shift
+- ;;
+-
+- --verbose|-v) opt_quiet=false
+- opt_verbose=:
+- func_append preserve_args " $_G_opt"
+- ;;
++ # this just eases exit handling
++ while test $# -gt 0; do
++ opt="$1"
++ shift
++ case $opt in
++ --debug|-x) opt_debug='set -x'
++ func_echo "enabling shell trace mode"
++ $opt_debug
++ ;;
++ --dry-run|--dryrun|-n)
++ opt_dry_run=:
++ ;;
++ --config)
++ opt_config=:
++func_config
++ ;;
++ --dlopen|-dlopen)
++ optarg="$1"
++ opt_dlopen="${opt_dlopen+$opt_dlopen
++}$optarg"
++ shift
++ ;;
++ --preserve-dup-deps)
++ opt_preserve_dup_deps=:
++ ;;
++ --features)
++ opt_features=:
++func_features
++ ;;
++ --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
++func_append preserve_args " $opt"
++ ;;
++ --no-warning|--no-warn)
++ opt_warning=false
++func_append preserve_args " $opt"
++ ;;
++ --no-verbose)
++ opt_verbose=false
++func_append preserve_args " $opt"
++ ;;
++ --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:
++ --*=*)
++ func_split_long_opt "$opt"
++ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
++ shift
++ ;;
++
++ # 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
+
+- # An option not handled by this hook function:
+- *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+- esac
+- done
++ # Validate options:
+
++ # save first non-option argument
++ if test "$#" -gt 0; then
++ nonopt="$opt"
++ shift
++ fi
+
+- # save modified positional parameters for caller
+- func_quote_for_eval ${1+"$@"}
+- libtool_parse_options_result=$func_quote_for_eval_result
+-}
+-func_add_hook func_parse_options libtool_parse_options
++ # preserve --debug
++ test "$opt_debug" = : || func_append preserve_args " --debug"
+
++ case $host in
++ *cygwin* | *mingw* | *pw32* | *cegcc*)
++ # don't eliminate duplications in $postdeps and $predeps
++ opt_duplicate_compiler_generated_deps=:
++ ;;
++ *)
++ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
++ ;;
++ esac
+
++ $opt_help || {
++ # Sanity checks first:
++ func_check_version_match
+
+-# libtool_validate_options [ARG]...
+-# ---------------------------------
+-# Perform any sanity checks on option settings and/or unconsumed
+-# arguments.
+-libtool_validate_options ()
+-{
+- # save first non-option argument
+- if test 0 -lt $#; then
+- nonopt=$1
+- shift
++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
++ func_fatal_configuration "not configured to build any kind of library"
+ fi
+
+- # preserve --debug
+- test : = "$debug_cmd" || func_append preserve_args " --debug"
++ # Darwin sucks
++ eval std_shrext=\"$shrext_cmds\"
+
+- case $host in
+- # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+- # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+- *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+- # don't eliminate duplications in $postdeps and $predeps
+- opt_duplicate_compiler_generated_deps=:
+- ;;
+- *)
+- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+- ;;
+- esac
++ # 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
+
+- $opt_help || {
+- # Sanity checks first:
+- func_check_version_match
+-
+- test yes != "$build_libtool_libs" \
+- && test yes != "$build_old_libs" \
+- && func_fatal_configuration "not configured to build any kind of library"
+-
+- # Darwin sucks
+- eval std_shrext=\"$shrext_cmds\"
+-
+- # Only execute mode is allowed to have -dlopen flags.
+- if test -n "$opt_dlopen" && test execute != "$opt_mode"; 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=$opt_mode' for more information."
+- }
++ # Change the help message to a mode-specific one.
++ generic_help="$help"
++ help="Try \`$progname --help --mode=$opt_mode' for more information."
++ }
+
+- # Pass back the unparsed argument list
+- func_quote_for_eval ${1+"$@"}
+- libtool_validate_options_result=$func_quote_for_eval_result
+-}
+-func_add_hook func_validate_options libtool_validate_options
+
++ # Bail if the options were screwed
++ $exit_cmd $EXIT_FAILURE
++}
+
+-# Process options as early as possible so that --help and --version
+-# can return quickly.
+-func_options ${1+"$@"}
+-eval set dummy "$func_options_result"; shift
+
+
+
+@@ -2468,52 +1224,24 @@
+ ## Main. ##
+ ## ----------- ##
+
+-magic='%%%MAGIC variable%%%'
+-magic_exe='%%%MAGIC EXE variable%%%'
+-
+-# Global variables.
+-extracted_archives=
+-extracted_serial=0
+-
+-# 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=
+-
+-
+-# A function that is used when there is no print builtin or printf.
+-func_fallback_echo ()
+-{
+- eval 'cat <<_LTECHO_EOF
+-$1
+-_LTECHO_EOF'
+-}
+-
+-# func_generated_by_libtool
+-# True iff stdin has been generated by Libtool. This function is only
+-# a basic sanity check; it will hardly flush out determined imposters.
+-func_generated_by_libtool_p ()
+-{
+- $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+-}
+-
+ # func_lalib_p file
+-# True iff FILE is a libtool '.la' library or '.lo' object file.
++# True iff FILE is a libtool `.la' library or `.lo' object file.
+ # This function is only a basic sanity check; it will hardly flush out
+ # determined imposters.
+ func_lalib_p ()
+ {
+ test -f "$1" &&
+- $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
++ $SED -e 4q "$1" 2>/dev/null \
++ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+ }
+
+ # func_lalib_unsafe_p file
+-# True iff FILE is a libtool '.la' library or '.lo' object file.
++# True iff FILE is a libtool `.la' library or `.lo' object file.
+ # This function implements the same check as func_lalib_p without
+ # resorting to external programs. To this end, it redirects stdin and
+ # closes it afterwards, without saving the original file descriptor.
+ # As a safety measure, use it only where a negative result would be
+-# fatal anyway. Works if 'file' does not exist.
++# fatal anyway. Works if `file' does not exist.
+ func_lalib_unsafe_p ()
+ {
+ lalib_p=no
+@@ -2521,13 +1249,13 @@
+ for lalib_p_l in 1 2 3 4
+ do
+ read lalib_p_line
+- case $lalib_p_line in
++ case "$lalib_p_line" in
+ \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+ esac
+ done
+ exec 0<&5 5<&-
+ fi
+- test yes = "$lalib_p"
++ test "$lalib_p" = yes
+ }
+
+ # func_ltwrapper_script_p file
+@@ -2536,8 +1264,7 @@
+ # determined imposters.
+ func_ltwrapper_script_p ()
+ {
+- test -f "$1" &&
+- $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
++ func_lalib_p "$1"
+ }
+
+ # func_ltwrapper_executable_p file
+@@ -2562,7 +1289,7 @@
+ {
+ 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_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ }
+
+ # func_ltwrapper_p file
+@@ -2581,13 +1308,11 @@
+ # FAIL_CMD may read-access the current command in variable CMD!
+ func_execute_cmds ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ save_ifs=$IFS; IFS='~'
+ for cmd in $1; do
+- IFS=$sp$nl
+- eval cmd=\"$cmd\"
+ IFS=$save_ifs
++ eval cmd=\"$cmd\"
+ func_show_eval "$cmd" "${2-:}"
+ done
+ IFS=$save_ifs
+@@ -2599,11 +1324,10 @@
+ # Note that it is not necessary on cygwin/mingw to append a dot to
+ # FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+ # behavior happens only for exec(3), not for open(2)! Also, sourcing
+-# 'FILE.' does not work on cygwin managed mounts.
++# `FILE.' does not work on cygwin managed mounts.
+ func_source ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ case $1 in
+ */* | *\\*) . "$1" ;;
+ *) . "./$1" ;;
+@@ -2630,10 +1354,10 @@
+ # store the result into func_replace_sysroot_result.
+ func_replace_sysroot ()
+ {
+- case $lt_sysroot:$1 in
++ case "$lt_sysroot:$1" in
+ ?*:"$lt_sysroot"*)
+ func_stripname "$lt_sysroot" '' "$1"
+- func_replace_sysroot_result='='$func_stripname_result
++ func_replace_sysroot_result="=$func_stripname_result"
+ ;;
+ *)
+ # Including no sysroot.
+@@ -2650,8 +1374,7 @@
+ # arg is usually of the form 'gcc ...'
+ func_infer_tag ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ if test -n "$available_tags" && test -z "$tagname"; then
+ CC_quoted=
+ for arg in $CC; do
+@@ -2670,7 +1393,7 @@
+ for z in $available_tags; do
+ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+ # Evaluate the configuration.
+- eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+ CC_quoted=
+ for arg in $CC; do
+ # Double-quote args containing other shell metacharacters.
+@@ -2695,7 +1418,7 @@
+ # line option must be used.
+ if test -z "$tagname"; then
+ func_echo "unable to infer tagged configuration"
+- func_fatal_error "specify a tag with '--tag'"
++ func_fatal_error "specify a tag with \`--tag'"
+ # else
+ # func_verbose "using $tagname tagged configuration"
+ fi
+@@ -2711,15 +1434,15 @@
+ # but don't create it if we're doing a dry run.
+ func_write_libtool_object ()
+ {
+- write_libobj=$1
+- if test yes = "$build_libtool_libs"; then
+- write_lobj=\'$2\'
++ write_libobj=${1}
++ if test "$build_libtool_libs" = yes; then
++ write_lobj=\'${2}\'
+ else
+ write_lobj=none
+ fi
+
+- if test yes = "$build_old_libs"; then
+- write_oldobj=\'$3\'
++ if test "$build_old_libs" = yes; then
++ write_oldobj=\'${3}\'
+ else
+ write_oldobj=none
+ fi
+@@ -2727,7 +1450,7 @@
+ $opt_dry_run || {
+ cat >${write_libobj}T <<EOF
+ # $write_libobj - a libtool object file
+-# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ #
+ # Please DO NOT delete this file!
+ # It is necessary for linking the library.
+@@ -2739,7 +1462,7 @@
+ non_pic_object=$write_oldobj
+
+ EOF
+- $MV "${write_libobj}T" "$write_libobj"
++ $MV "${write_libobj}T" "${write_libobj}"
+ }
+ }
+
+@@ -2759,9 +1482,8 @@
+ # be empty on error (or when ARG is empty)
+ func_convert_core_file_wine_to_w32 ()
+ {
+- $debug_cmd
+-
+- func_convert_core_file_wine_to_w32_result=$1
++ $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
+@@ -2769,9 +1491,9 @@
+ # *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
++ 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 "$sed_naive_backslashify"`
++ $SED -e "$lt_sed_naive_backslashify"`
+ else
+ func_convert_core_file_wine_to_w32_result=
+ fi
+@@ -2792,19 +1514,18 @@
+ # are convertible, then the result may be empty.
+ func_convert_core_path_wine_to_w32 ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ # unfortunately, winepath doesn't convert paths, only file names
+- func_convert_core_path_wine_to_w32_result=
++ 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 -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
++ 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
+@@ -2833,8 +1554,7 @@
+ # environment variable; do not put it in $PATH.
+ func_cygpath ()
+ {
+- $debug_cmd
+-
++ $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
+@@ -2843,7 +1563,7 @@
+ fi
+ else
+ func_cygpath_result=
+- func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
++ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+ fi
+ }
+ #end: func_cygpath
+@@ -2854,11 +1574,10 @@
+ # result in func_convert_core_msys_to_w32_result.
+ func_convert_core_msys_to_w32 ()
+ {
+- $debug_cmd
+-
++ $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 "$sed_naive_backslashify"`
++ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+ }
+ #end: func_convert_core_msys_to_w32
+
+@@ -2869,14 +1588,13 @@
+ # func_to_host_file_result to ARG1).
+ func_convert_file_check ()
+ {
+- $debug_cmd
+-
+- if test -z "$2" && test -n "$1"; then
++ $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 " \`$1'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback:
+- func_to_host_file_result=$1
++ func_to_host_file_result="$1"
+ fi
+ }
+ # end func_convert_file_check
+@@ -2888,11 +1606,10 @@
+ # func_to_host_file_result to a simplistic fallback value (see below).
+ func_convert_path_check ()
+ {
+- $debug_cmd
+-
++ $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 " \`$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.
+@@ -2901,7 +1618,7 @@
+ func_to_host_path_result=`echo "$3" |
+ $SED -e "$lt_replace_pathsep_chars"`
+ else
+- func_to_host_path_result=$3
++ func_to_host_path_result="$3"
+ fi
+ fi
+ }
+@@ -2913,10 +1630,9 @@
+ # and appending REPL if ORIG matches BACKPAT.
+ func_convert_path_front_back_pathsep ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ case $4 in
+- $1 ) func_to_host_path_result=$3$func_to_host_path_result
++ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+ ;;
+ esac
+ case $4 in
+@@ -2930,7 +1646,7 @@
+ ##################################################
+ # $build to $host FILE NAME CONVERSION FUNCTIONS #
+ ##################################################
+-# invoked via '$to_host_file_cmd ARG'
++# 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.
+@@ -2941,8 +1657,7 @@
+ # in func_to_host_file_result.
+ func_to_host_file ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ $to_host_file_cmd "$1"
+ }
+ # end func_to_host_file
+@@ -2954,8 +1669,7 @@
+ # in (the comma separated) LAZY, no conversion takes place.
+ func_to_tool_file ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ case ,$2, in
+ *,"$to_tool_file_cmd",*)
+ func_to_tool_file_result=$1
+@@ -2973,7 +1687,7 @@
+ # Copy ARG to func_to_host_file_result.
+ func_convert_file_noop ()
+ {
+- func_to_host_file_result=$1
++ func_to_host_file_result="$1"
+ }
+ # end func_convert_file_noop
+
+@@ -2984,12 +1698,11 @@
+ # func_to_host_file_result.
+ func_convert_file_msys_to_w32 ()
+ {
+- $debug_cmd
+-
+- func_to_host_file_result=$1
++ $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
++ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+ }
+@@ -3001,9 +1714,8 @@
+ # func_to_host_file_result.
+ func_convert_file_cygwin_to_w32 ()
+ {
+- $debug_cmd
+-
+- func_to_host_file_result=$1
++ $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.
+@@ -3019,12 +1731,11 @@
+ # and a working winepath. Returns result in func_to_host_file_result.
+ func_convert_file_nix_to_w32 ()
+ {
+- $debug_cmd
+-
+- func_to_host_file_result=$1
++ $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
++ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+ }
+@@ -3036,13 +1747,12 @@
+ # Returns result in func_to_host_file_result.
+ func_convert_file_msys_to_cygwin ()
+ {
+- $debug_cmd
+-
+- func_to_host_file_result=$1
++ $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
++ func_to_host_file_result="$func_cygpath_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+ }
+@@ -3055,14 +1765,13 @@
+ # in func_to_host_file_result.
+ func_convert_file_nix_to_cygwin ()
+ {
+- $debug_cmd
+-
+- func_to_host_file_result=$1
++ $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
++ func_to_host_file_result="$func_cygpath_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+ }
+@@ -3072,7 +1781,7 @@
+ #############################################
+ # $build to $host PATH CONVERSION FUNCTIONS #
+ #############################################
+-# invoked via '$to_host_path_cmd ARG'
++# 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.
+@@ -3096,11 +1805,10 @@
+ to_host_path_cmd=
+ func_init_to_host_path_cmd ()
+ {
+- $debug_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
++ to_host_path_cmd="func_convert_path_${func_stripname_result}"
+ fi
+ }
+
+@@ -3110,8 +1818,7 @@
+ # in func_to_host_path_result.
+ func_to_host_path ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ func_init_to_host_path_cmd
+ $to_host_path_cmd "$1"
+ }
+@@ -3122,7 +1829,7 @@
+ # Copy ARG to func_to_host_path_result.
+ func_convert_path_noop ()
+ {
+- func_to_host_path_result=$1
++ func_to_host_path_result="$1"
+ }
+ # end func_convert_path_noop
+
+@@ -3133,9 +1840,8 @@
+ # func_to_host_path_result.
+ func_convert_path_msys_to_w32 ()
+ {
+- $debug_cmd
+-
+- func_to_host_path_result=$1
++ $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 ';.';
+@@ -3143,7 +1849,7 @@
+ 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_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"
+@@ -3157,9 +1863,8 @@
+ # func_to_host_file_result.
+ func_convert_path_cygwin_to_w32 ()
+ {
+- $debug_cmd
+-
+- func_to_host_path_result=$1
++ $opt_debug
++ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # See func_convert_path_msys_to_w32:
+ func_stripname : : "$1"
+@@ -3178,15 +1883,14 @@
+ # a working winepath. Returns result in func_to_host_file_result.
+ func_convert_path_nix_to_w32 ()
+ {
+- $debug_cmd
+-
+- func_to_host_path_result=$1
++ $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_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"
+@@ -3200,16 +1904,15 @@
+ # Returns result in func_to_host_file_result.
+ func_convert_path_msys_to_cygwin ()
+ {
+- $debug_cmd
+-
+- func_to_host_path_result=$1
++ $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_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"
+@@ -3224,9 +1927,8 @@
+ # func_to_host_file_result.
+ func_convert_path_nix_to_cygwin ()
+ {
+- $debug_cmd
+-
+- func_to_host_path_result=$1
++ $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
+@@ -3235,7 +1937,7 @@
+ 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_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"
+@@ -3244,31 +1946,13 @@
+ # end func_convert_path_nix_to_cygwin
+
+
+-# func_dll_def_p FILE
+-# True iff FILE is a Windows DLL '.def' file.
+-# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+-func_dll_def_p ()
+-{
+- $debug_cmd
+-
+- func_dll_def_p_tmp=`$SED -n \
+- -e 's/^[ ]*//' \
+- -e '/^\(;.*\)*$/d' \
+- -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \
+- -e q \
+- "$1"`
+- test DEF = "$func_dll_def_p_tmp"
+-}
+-
+-
+ # func_mode_compile arg...
+ func_mode_compile ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ # Get the compilation command and the source file.
+ base_compile=
+- srcfile=$nonopt # always keep a non-empty value in "srcfile"
++ srcfile="$nonopt" # always keep a non-empty value in "srcfile"
+ suppress_opt=yes
+ suppress_output=
+ arg_mode=normal
+@@ -3281,12 +1965,12 @@
+ case $arg_mode in
+ arg )
+ # do not "continue". Instead, add this to base_compile
+- lastarg=$arg
++ lastarg="$arg"
+ arg_mode=normal
+ ;;
+
+ target )
+- libobj=$arg
++ libobj="$arg"
+ arg_mode=normal
+ continue
+ ;;
+@@ -3296,7 +1980,7 @@
+ case $arg in
+ -o)
+ test -n "$libobj" && \
+- func_fatal_error "you cannot specify '-o' more than once"
++ func_fatal_error "you cannot specify \`-o' more than once"
+ arg_mode=target
+ continue
+ ;;
+@@ -3325,12 +2009,12 @@
+ func_stripname '-Wc,' '' "$arg"
+ args=$func_stripname_result
+ lastarg=
+- save_ifs=$IFS; IFS=,
++ save_ifs="$IFS"; IFS=','
+ for arg in $args; do
+- IFS=$save_ifs
++ IFS="$save_ifs"
+ func_append_quoted lastarg "$arg"
+ done
+- IFS=$save_ifs
++ IFS="$save_ifs"
+ func_stripname ' ' '' "$lastarg"
+ lastarg=$func_stripname_result
+
+@@ -3343,8 +2027,8 @@
+ # Accept the current argument as the source file.
+ # The previous "srcfile" becomes the current argument.
+ #
+- lastarg=$srcfile
+- srcfile=$arg
++ lastarg="$srcfile"
++ srcfile="$arg"
+ ;;
+ esac # case $arg
+ ;;
+@@ -3359,13 +2043,13 @@
+ func_fatal_error "you must specify an argument for -Xcompile"
+ ;;
+ target)
+- func_fatal_error "you must specify a target with '-o'"
++ func_fatal_error "you must specify a target with \`-o'"
+ ;;
+ *)
+ # Get the name of the library object.
+ test -z "$libobj" && {
+ func_basename "$srcfile"
+- libobj=$func_basename_result
++ libobj="$func_basename_result"
+ }
+ ;;
+ esac
+@@ -3385,7 +2069,7 @@
+ case $libobj in
+ *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+ *)
+- func_fatal_error "cannot determine name of library object from '$libobj'"
++ func_fatal_error "cannot determine name of library object from \`$libobj'"
+ ;;
+ esac
+
+@@ -3394,8 +2078,8 @@
+ for arg in $later; do
+ case $arg in
+ -shared)
+- test yes = "$build_libtool_libs" \
+- || func_fatal_configuration "cannot build a shared library"
++ test "$build_libtool_libs" != yes && \
++ func_fatal_configuration "can not build a shared library"
+ build_old_libs=no
+ continue
+ ;;
+@@ -3421,17 +2105,17 @@
+ func_quote_for_eval "$libobj"
+ test "X$libobj" != "X$func_quote_for_eval_result" \
+ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \
+- && func_warning "libobj name '$libobj' may not contain shell special characters."
++ && func_warning "libobj name \`$libobj' may not contain shell special characters."
+ func_dirname_and_basename "$obj" "/" ""
+- objname=$func_basename_result
+- xdir=$func_dirname_result
+- lobj=$xdir$objdir/$objname
++ objname="$func_basename_result"
++ xdir="$func_dirname_result"
++ lobj=${xdir}$objdir/$objname
+
+ test -z "$base_compile" && \
+ func_fatal_help "you must specify a compilation command"
+
+ # Delete any leftover library objects.
+- if test yes = "$build_old_libs"; then
++ if test "$build_old_libs" = yes; then
+ removelist="$obj $lobj $libobj ${libobj}T"
+ else
+ removelist="$lobj $libobj ${libobj}T"
+@@ -3443,16 +2127,16 @@
+ pic_mode=default
+ ;;
+ esac
+- if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
++ if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+ # non-PIC code in shared libraries is not supported
+ pic_mode=default
+ fi
+
+ # Calculate the filename of the output object if compiler does
+ # not support -o with -c
+- if test no = "$compiler_c_o"; then
+- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+- lockfile=$output_obj.lock
++ if test "$compiler_c_o" = no; then
++ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
++ lockfile="$output_obj.lock"
+ else
+ output_obj=
+ need_locks=no
+@@ -3461,12 +2145,12 @@
+
+ # Lock this critical section if it is needed
+ # We use this script file to make the link, it avoids creating a new file
+- if test yes = "$need_locks"; then
++ if test "$need_locks" = yes; then
+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+ func_echo "Waiting for $lockfile to be removed"
+ sleep 2
+ done
+- elif test warn = "$need_locks"; then
++ elif test "$need_locks" = warn; then
+ if test -f "$lockfile"; then
+ $ECHO "\
+ *** ERROR, $lockfile exists and contains:
+@@ -3474,7 +2158,7 @@
+
+ This indicates that another process is trying to use the same
+ temporary object file, and libtool could not work around it because
+-your compiler does not support '-c' and '-o' together. If you
++your compiler does not support \`-c' and \`-o' together. If you
+ repeat this compilation, it may succeed, by chance, but you had better
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+@@ -3496,11 +2180,11 @@
+ qsrcfile=$func_quote_for_eval_result
+
+ # Only build a PIC object if we are building libtool libraries.
+- if test yes = "$build_libtool_libs"; then
++ if test "$build_libtool_libs" = yes; then
+ # Without this assignment, base_compile gets emptied.
+ fbsd_hideous_sh_bug=$base_compile
+
+- if test no != "$pic_mode"; then
++ if test "$pic_mode" != no; then
+ command="$base_compile $qsrcfile $pic_flag"
+ else
+ # Don't build PIC code
+@@ -3517,7 +2201,7 @@
+ func_show_eval_locale "$command" \
+ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+- if test warn = "$need_locks" &&
++ if test "$need_locks" = warn &&
+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+ $ECHO "\
+ *** ERROR, $lockfile contains:
+@@ -3528,7 +2212,7 @@
+
+ This indicates that another process is trying to use the same
+ temporary object file, and libtool could not work around it because
+-your compiler does not support '-c' and '-o' together. If you
++your compiler does not support \`-c' and \`-o' together. If you
+ repeat this compilation, it may succeed, by chance, but you had better
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+@@ -3544,20 +2228,20 @@
+ fi
+
+ # Allow error messages only from the first compilation.
+- if test yes = "$suppress_opt"; then
++ if test "$suppress_opt" = yes; then
+ suppress_output=' >/dev/null 2>&1'
+ fi
+ fi
+
+ # Only build a position-dependent object if we build old libraries.
+- if test yes = "$build_old_libs"; then
+- if test yes != "$pic_mode"; then
++ if test "$build_old_libs" = yes; then
++ if test "$pic_mode" != yes; then
+ # Don't build PIC code
+ command="$base_compile $qsrcfile$pie_flag"
+ else
+ command="$base_compile $qsrcfile $pic_flag"
+ fi
+- if test yes = "$compiler_c_o"; then
++ if test "$compiler_c_o" = yes; then
+ func_append command " -o $obj"
+ fi
+
+@@ -3566,7 +2250,7 @@
+ func_show_eval_locale "$command" \
+ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+- if test warn = "$need_locks" &&
++ if test "$need_locks" = warn &&
+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+ $ECHO "\
+ *** ERROR, $lockfile contains:
+@@ -3577,7 +2261,7 @@
+
+ This indicates that another process is trying to use the same
+ temporary object file, and libtool could not work around it because
+-your compiler does not support '-c' and '-o' together. If you
++your compiler does not support \`-c' and \`-o' together. If you
+ repeat this compilation, it may succeed, by chance, but you had better
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+@@ -3597,7 +2281,7 @@
+ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+ # Unlock the critical section if it was locked
+- if test no != "$need_locks"; then
++ if test "$need_locks" != no; then
+ removelist=$lockfile
+ $RM "$lockfile"
+ fi
+@@ -3607,7 +2291,7 @@
+ }
+
+ $opt_help || {
+- test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
++ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+ }
+
+ func_mode_help ()
+@@ -3627,7 +2311,7 @@
+ Remove files from the build directory.
+
+ RM is the name of the program to use to delete files associated with each FILE
+-(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
++(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+ to RM.
+
+ If FILE is a libtool library, object or program, all the files associated
+@@ -3646,16 +2330,16 @@
+ -no-suppress do not suppress compiler output for multiple passes
+ -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
++ -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
+
+-COMPILE-COMMAND is a command to be used in creating a 'standard' object file
++COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+ from the given SOURCEFILE.
+
+ The output file name is determined by removing the directory component from
+-SOURCEFILE, then substituting the C source code suffix '.c' with the
+-library object suffix, '.lo'."
++SOURCEFILE, then substituting the C source code suffix \`.c' with the
++library object suffix, \`.lo'."
+ ;;
+
+ execute)
+@@ -3668,7 +2352,7 @@
+
+ -dlopen FILE add the directory containing FILE to the library path
+
+-This mode sets the library path environment variable according to '-dlopen'
++This mode sets the library path environment variable according to \`-dlopen'
+ flags.
+
+ If any of the ARGS are libtool executable wrappers, then they are translated
+@@ -3687,7 +2371,7 @@
+ Each LIBDIR is a directory that contains libtool libraries.
+
+ The commands that this mode executes may require superuser privileges. Use
+-the '--dry-run' option if you just want to see what would be executed."
++the \`--dry-run' option if you just want to see what would be executed."
+ ;;
+
+ install)
+@@ -3697,7 +2381,7 @@
+ Install executables or libraries.
+
+ INSTALL-COMMAND is the installation command. The first component should be
+-either the 'install' or 'cp' program.
++either the \`install' or \`cp' program.
+
+ The following components of INSTALL-COMMAND are treated specially:
+
+@@ -3723,7 +2407,7 @@
+ -avoid-version do not add a version suffix if possible
+ -bindir BINDIR specify path to binaries directory (for systems where
+ libraries must be found in the PATH setting at runtime)
+- -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime
++ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+ -export-symbols SYMFILE
+@@ -3737,8 +2421,7 @@
+ -no-install link a not-installable executable
+ -no-undefined declare that a library does not refer to external symbols
+ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
+- -objectlist FILE use a list of object files found in FILE to specify objects
+- -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes)
++ -objectlist FILE Use a list of object files found in FILE to specify objects
+ -precious-files-regex REGEX
+ don't remove output files matching REGEX
+ -release RELEASE specify package release information
+@@ -3758,20 +2441,20 @@
+ -Xlinker FLAG pass linker-specific FLAG directly to the linker
+ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
+
+-All other options (arguments beginning with '-') are ignored.
++All other options (arguments beginning with \`-') are ignored.
+
+-Every other argument is treated as a filename. Files ending in '.la' are
++Every other argument is treated as a filename. Files ending in \`.la' are
+ treated as uninstalled libtool libraries, other files are standard or library
+ object files.
+
+-If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+-only library objects ('.lo' files) may be specified, and '-rpath' is
++If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
++only library objects (\`.lo' files) may be specified, and \`-rpath' is
+ required, except when creating a convenience library.
+
+-If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+-using 'ar' and 'ranlib', or on Windows using 'lib'.
++If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
++using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+-If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
++If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+ is created, otherwise an executable program is created."
+ ;;
+
+@@ -3782,7 +2465,7 @@
+ Remove libraries from an installation directory.
+
+ RM is the name of the program to use to delete files associated with each FILE
+-(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
++(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+ to RM.
+
+ If FILE is a libtool library, all the files associated with it are deleted.
+@@ -3790,17 +2473,17 @@
+ ;;
+
+ *)
+- func_fatal_help "invalid operation mode '$opt_mode'"
++ func_fatal_help "invalid operation mode \`$opt_mode'"
+ ;;
+ esac
+
+ echo
+- $ECHO "Try '$progname --help' for more information about other modes."
++ $ECHO "Try \`$progname --help' for more information about other modes."
+ }
+
+ # Now that we've collected a possible --mode arg, show help if necessary
+ if $opt_help; then
+- if test : = "$opt_help"; then
++ if test "$opt_help" = :; then
+ func_mode_help
+ else
+ {
+@@ -3808,7 +2491,7 @@
+ for opt_mode in compile link execute install finish uninstall clean; do
+ func_mode_help
+ done
+- } | $SED -n '1p; 2,$s/^Usage:/ or: /p'
++ } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+ {
+ func_help noexit
+ for opt_mode in compile link execute install finish uninstall clean; do
+@@ -3816,7 +2499,7 @@
+ func_mode_help
+ done
+ } |
+- $SED '1d
++ sed '1d
+ /^When reporting/,/^Report/{
+ H
+ d
+@@ -3833,17 +2516,16 @@
+ # func_mode_execute arg...
+ func_mode_execute ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ # The first argument is the command name.
+- cmd=$nonopt
++ cmd="$nonopt"
+ test -z "$cmd" && \
+ func_fatal_help "you must specify a COMMAND"
+
+ # Handle -dlopen flags immediately.
+ for file in $opt_dlopen; do
+ test -f "$file" \
+- || func_fatal_help "'$file' is not a file"
++ || func_fatal_help "\`$file' is not a file"
+
+ dir=
+ case $file in
+@@ -3853,7 +2535,7 @@
+
+ # 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"
++ || func_fatal_help "\`$lib' is not a valid libtool archive"
+
+ # Read the libtool library.
+ dlname=
+@@ -3864,18 +2546,18 @@
+ if test -z "$dlname"; then
+ # Warn if it was a shared library.
+ test -n "$library_names" && \
+- func_warning "'$file' was not linked with '-export-dynamic'"
++ func_warning "\`$file' was not linked with \`-export-dynamic'"
+ continue
+ fi
+
+ func_dirname "$file" "" "."
+- dir=$func_dirname_result
++ dir="$func_dirname_result"
+
+ if test -f "$dir/$objdir/$dlname"; then
+ func_append dir "/$objdir"
+ else
+ if test ! -f "$dir/$dlname"; then
+- func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
++ func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+ fi
+ fi
+ ;;
+@@ -3883,18 +2565,18 @@
+ *.lo)
+ # Just add the directory containing the .lo file.
+ func_dirname "$file" "" "."
+- dir=$func_dirname_result
++ dir="$func_dirname_result"
+ ;;
+
+ *)
+- func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
++ func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+ continue
+ ;;
+ esac
+
+ # Get the absolute pathname.
+ absdir=`cd "$dir" && pwd`
+- test -n "$absdir" && dir=$absdir
++ test -n "$absdir" && dir="$absdir"
+
+ # Now add the directory to shlibpath_var.
+ if eval "test -z \"\$$shlibpath_var\""; then
+@@ -3906,7 +2588,7 @@
+
+ # This variable tells wrapper scripts just to set shlibpath_var
+ # rather than running their programs.
+- libtool_execute_magic=$magic
++ libtool_execute_magic="$magic"
+
+ # Check if any of the arguments is a wrapper script.
+ args=
+@@ -3919,12 +2601,12 @@
+ if func_ltwrapper_script_p "$file"; then
+ func_source "$file"
+ # Transform arg to wrapped name.
+- file=$progdir/$program
++ file="$progdir/$program"
+ elif func_ltwrapper_executable_p "$file"; then
+ func_ltwrapper_scriptname "$file"
+ func_source "$func_ltwrapper_scriptname_result"
+ # Transform arg to wrapped name.
+- file=$progdir/$program
++ file="$progdir/$program"
+ fi
+ ;;
+ esac
+@@ -3932,15 +2614,7 @@
+ func_append_quoted args "$file"
+ done
+
+- if $opt_dry_run; then
+- # Display what would be done.
+- if test -n "$shlibpath_var"; then
+- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+- echo "export $shlibpath_var"
+- fi
+- $ECHO "$cmd$args"
+- exit $EXIT_SUCCESS
+- else
++ if test "X$opt_dry_run" = Xfalse; then
+ if test -n "$shlibpath_var"; then
+ # Export the shlibpath_var.
+ eval "export $shlibpath_var"
+@@ -3957,18 +2631,25 @@
+ done
+
+ # Now prepare to actually exec the command.
+- exec_cmd=\$cmd$args
++ exec_cmd="\$cmd$args"
++ else
++ # Display what would be done.
++ if test -n "$shlibpath_var"; then
++ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
++ echo "export $shlibpath_var"
++ fi
++ $ECHO "$cmd$args"
++ exit $EXIT_SUCCESS
+ fi
+ }
+
+-test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
++test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+
+
+ # func_mode_finish arg...
+ func_mode_finish ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ libs=
+ libdirs=
+ admincmds=
+@@ -3982,11 +2663,11 @@
+ if func_lalib_unsafe_p "$opt"; then
+ func_append libs " $opt"
+ else
+- func_warning "'$opt' is not a valid libtool archive"
++ func_warning "\`$opt' is not a valid libtool archive"
+ fi
+
+ else
+- func_fatal_error "invalid argument '$opt'"
++ func_fatal_error "invalid argument \`$opt'"
+ fi
+ done
+
+@@ -4001,12 +2682,12 @@
+ # Remove sysroot references
+ if $opt_dry_run; then
+ for lib in $libs; do
+- echo "removing references to $lt_sysroot and '=' prefixes from $lib"
++ 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 \
++ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+ > $tmpdir/tmp-la
+ mv -f $tmpdir/tmp-la $lib
+ done
+@@ -4031,7 +2712,7 @@
+ fi
+
+ # Exit here if they wanted silent mode.
+- $opt_quiet && exit $EXIT_SUCCESS
++ $opt_silent && exit $EXIT_SUCCESS
+
+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+ echo "----------------------------------------------------------------------"
+@@ -4042,27 +2723,27 @@
+ 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 "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 " - 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 " - 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"
++ $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'"
++ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ fi
+ echo
+
+@@ -4081,20 +2762,18 @@
+ exit $EXIT_SUCCESS
+ }
+
+-test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
++test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+
+
+ # func_mode_install arg...
+ func_mode_install ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ # There may be an optional sh(1) argument at the beginning of
+ # install_prog (especially on Windows NT).
+- if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
++ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ # Allow the use of GNU shtool's install command.
+- case $nonopt in *shtool*) :;; *) false;; esac
+- then
++ case $nonopt in *shtool*) :;; *) false;; esac; then
+ # Aesthetically quote it.
+ func_quote_for_eval "$nonopt"
+ install_prog="$func_quote_for_eval_result "
+@@ -4121,7 +2800,7 @@
+ opts=
+ prev=
+ install_type=
+- isdir=false
++ isdir=no
+ stripme=
+ no_mode=:
+ for arg
+@@ -4134,7 +2813,7 @@
+ fi
+
+ case $arg in
+- -d) isdir=: ;;
++ -d) isdir=yes ;;
+ -f)
+ if $install_cp; then :; else
+ prev=$arg
+@@ -4152,7 +2831,7 @@
+ *)
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
+- if test X-m = "X$prev" && test -n "$install_override_mode"; then
++ if test "x$prev" = x-m && test -n "$install_override_mode"; then
+ arg2=$install_override_mode
+ no_mode=false
+ fi
+@@ -4177,7 +2856,7 @@
+ func_fatal_help "you must specify an install program"
+
+ test -n "$prev" && \
+- func_fatal_help "the '$prev' option requires an argument"
++ func_fatal_help "the \`$prev' option requires an argument"
+
+ if test -n "$install_override_mode" && $no_mode; then
+ if $install_cp; then :; else
+@@ -4199,19 +2878,19 @@
+ dest=$func_stripname_result
+
+ # Check to see that the destination is a directory.
+- test -d "$dest" && isdir=:
+- if $isdir; then
+- destdir=$dest
++ test -d "$dest" && isdir=yes
++ if test "$isdir" = yes; then
++ destdir="$dest"
+ destname=
+ else
+ func_dirname_and_basename "$dest" "" "."
+- destdir=$func_dirname_result
+- destname=$func_basename_result
++ destdir="$func_dirname_result"
++ destname="$func_basename_result"
+
+ # Not a directory, so check to see that there is only one file specified.
+ set dummy $files; shift
+ test "$#" -gt 1 && \
+- func_fatal_help "'$dest' is not a directory"
++ func_fatal_help "\`$dest' is not a directory"
+ fi
+ case $destdir in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+@@ -4220,7 +2899,7 @@
+ case $file in
+ *.lo) ;;
+ *)
+- func_fatal_help "'$destdir' must be an absolute directory name"
++ func_fatal_help "\`$destdir' must be an absolute directory name"
+ ;;
+ esac
+ done
+@@ -4229,7 +2908,7 @@
+
+ # This variable tells wrapper scripts just to set variables rather
+ # than running their programs.
+- libtool_install_magic=$magic
++ libtool_install_magic="$magic"
+
+ staticlibs=
+ future_libdirs=
+@@ -4249,7 +2928,7 @@
+
+ # 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"
++ || func_fatal_help "\`$file' is not a valid libtool archive"
+
+ library_names=
+ old_library=
+@@ -4271,7 +2950,7 @@
+ fi
+
+ func_dirname "$file" "/" ""
+- dir=$func_dirname_result
++ dir="$func_dirname_result"
+ func_append dir "$objdir"
+
+ if test -n "$relink_command"; then
+@@ -4285,7 +2964,7 @@
+ # are installed into $libdir/../bin (currently, that works fine)
+ # but it's something to keep an eye on.
+ test "$inst_prefix_dir" = "$destdir" && \
+- func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
++ func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+@@ -4294,36 +2973,29 @@
+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ fi
+
+- func_warning "relinking '$file'"
++ func_warning "relinking \`$file'"
+ func_show_eval "$relink_command" \
+- 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
++ 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+ fi
+
+ # See the names of the shared library.
+ set dummy $library_names; shift
+ if test -n "$1"; then
+- realname=$1
++ realname="$1"
+ shift
+
+- srcname=$realname
+- test -n "$relink_command" && srcname=${realname}T
++ srcname="$realname"
++ test -n "$relink_command" && srcname="$realname"T
+
+ # Install the shared library and build the symlinks.
+ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+ 'exit $?'
+- tstripme=$stripme
++ tstripme="$stripme"
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ case $realname in
+ *.dll.a)
+- tstripme=
+- ;;
+- esac
+- ;;
+- os2*)
+- case $realname in
+- *_dll.a)
+- tstripme=
++ tstripme=""
+ ;;
+ esac
+ ;;
+@@ -4334,7 +3006,7 @@
+
+ if test "$#" -gt 0; then
+ # Delete the old symlinks, and create new ones.
+- # Try 'ln -sf' first, because the 'ln' binary might depend on
++ # Try `ln -sf' first, because the `ln' binary might depend on
+ # the symlink we replace! Solaris /bin/ln does not understand -f,
+ # so we also need to try rm && ln -s.
+ for linkname
+@@ -4345,14 +3017,14 @@
+ fi
+
+ # Do each command in the postinstall commands.
+- lib=$destdir/$realname
++ lib="$destdir/$realname"
+ func_execute_cmds "$postinstall_cmds" 'exit $?'
+ fi
+
+ # Install the pseudo-library for information purposes.
+ func_basename "$file"
+- name=$func_basename_result
+- instname=$dir/${name}i
++ name="$func_basename_result"
++ instname="$dir/$name"i
+ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+ # Maybe install the static library, too.
+@@ -4364,11 +3036,11 @@
+
+ # Figure out destination file name, if it wasn't already specified.
+ if test -n "$destname"; then
+- destfile=$destdir/$destname
++ destfile="$destdir/$destname"
+ else
+ func_basename "$file"
+- destfile=$func_basename_result
+- destfile=$destdir/$destfile
++ destfile="$func_basename_result"
++ destfile="$destdir/$destfile"
+ fi
+
+ # Deduce the name of the destination old-style object file.
+@@ -4378,11 +3050,11 @@
+ staticdest=$func_lo2o_result
+ ;;
+ *.$objext)
+- staticdest=$destfile
++ staticdest="$destfile"
+ destfile=
+ ;;
+ *)
+- func_fatal_help "cannot copy a libtool object to '$destfile'"
++ func_fatal_help "cannot copy a libtool object to \`$destfile'"
+ ;;
+ esac
+
+@@ -4391,7 +3063,7 @@
+ func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+ # Install the old object if enabled.
+- if test yes = "$build_old_libs"; then
++ if test "$build_old_libs" = yes; then
+ # Deduce the name of the old-style object file.
+ func_lo2o "$file"
+ staticobj=$func_lo2o_result
+@@ -4403,23 +3075,23 @@
+ *)
+ # Figure out destination file name, if it wasn't already specified.
+ if test -n "$destname"; then
+- destfile=$destdir/$destname
++ destfile="$destdir/$destname"
+ else
+ func_basename "$file"
+- destfile=$func_basename_result
+- destfile=$destdir/$destfile
++ destfile="$func_basename_result"
++ destfile="$destdir/$destfile"
+ fi
+
+ # If the file is missing, and there is a .exe on the end, strip it
+ # because it is most likely a libtool script we actually want to
+ # install
+- stripped_ext=
++ stripped_ext=""
+ case $file in
+ *.exe)
+ if test ! -f "$file"; then
+ func_stripname '' '.exe' "$file"
+ file=$func_stripname_result
+- stripped_ext=.exe
++ stripped_ext=".exe"
+ fi
+ ;;
+ esac
+@@ -4447,19 +3119,19 @@
+
+ # Check the variables that should have been set.
+ test -z "$generated_by_libtool_version" && \
+- func_fatal_error "invalid libtool wrapper script '$wrapper'"
++ func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+
+- finalize=:
++ finalize=yes
+ for lib in $notinst_deplibs; do
+ # Check to see that each library is installed.
+ libdir=
+ if test -f "$lib"; then
+ func_source "$lib"
+ fi
+- libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
++ libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ if test -n "$libdir" && test ! -f "$libfile"; then
+- func_warning "'$lib' has not been installed in '$libdir'"
+- finalize=false
++ func_warning "\`$lib' has not been installed in \`$libdir'"
++ finalize=no
+ fi
+ done
+
+@@ -4467,29 +3139,29 @@
+ func_source "$wrapper"
+
+ outputname=
+- if test no = "$fast_install" && test -n "$relink_command"; then
++ if test "$fast_install" = no && test -n "$relink_command"; then
+ $opt_dry_run || {
+- if $finalize; then
++ if test "$finalize" = yes; then
+ tmpdir=`func_mktempdir`
+ func_basename "$file$stripped_ext"
+- file=$func_basename_result
+- outputname=$tmpdir/$file
++ file="$func_basename_result"
++ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+- $opt_quiet || {
++ $opt_silent || {
+ func_quote_for_expand "$relink_command"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+ if eval "$relink_command"; then :
+ else
+- func_error "error: relink '$file' with the above command before installing it"
++ func_error "error: relink \`$file' with the above command before installing it"
+ $opt_dry_run || ${RM}r "$tmpdir"
+ continue
+ fi
+- file=$outputname
++ file="$outputname"
+ else
+- func_warning "cannot relink '$file'"
++ func_warning "cannot relink \`$file'"
+ fi
+ }
+ else
+@@ -4526,10 +3198,10 @@
+
+ for file in $staticlibs; do
+ func_basename "$file"
+- name=$func_basename_result
++ name="$func_basename_result"
+
+ # Set up the ranlib parameters.
+- oldlib=$destdir/$name
++ oldlib="$destdir/$name"
+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+ tool_oldlib=$func_to_tool_file_result
+
+@@ -4544,18 +3216,18 @@
+ done
+
+ test -n "$future_libdirs" && \
+- func_warning "remember to run '$progname --finish$future_libdirs'"
++ func_warning "remember to run \`$progname --finish$future_libdirs'"
+
+ 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'
++ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ else
+ exit $EXIT_SUCCESS
+ fi
+ }
+
+-test install = "$opt_mode" && func_mode_install ${1+"$@"}
++test "$opt_mode" = install && func_mode_install ${1+"$@"}
+
+
+ # func_generate_dlsyms outputname originator pic_p
+@@ -4563,17 +3235,16 @@
+ # a dlpreopen symbol table.
+ func_generate_dlsyms ()
+ {
+- $debug_cmd
+-
+- my_outputname=$1
+- my_originator=$2
+- my_pic_p=${3-false}
+- my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
++ $opt_debug
++ my_outputname="$1"
++ my_originator="$2"
++ my_pic_p="${3-no}"
++ my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+ my_dlsyms=
+
+- if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$NM" && test -n "$global_symbol_pipe"; then
+- my_dlsyms=${my_outputname}S.c
++ my_dlsyms="${my_outputname}S.c"
+ else
+ func_error "not configured to extract global symbols from dlpreopened files"
+ fi
+@@ -4584,7 +3255,7 @@
+ "") ;;
+ *.c)
+ # Discover the nlist of each of the dlfiles.
+- nlist=$output_objdir/$my_outputname.nm
++ nlist="$output_objdir/${my_outputname}.nm"
+
+ func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+@@ -4592,36 +3263,34 @@
+ func_verbose "creating $output_objdir/$my_dlsyms"
+
+ $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+-/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+-/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
++/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
++/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+
+ #ifdef __cplusplus
+ extern \"C\" {
+ #endif
+
+-#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
++#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+ #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 can't be const, because runtime
++#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__
++#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
+
+-#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+-
+ /* External symbol declarations for the compiler. */\
+ "
+
+- if test yes = "$dlself"; then
+- func_verbose "generating symbol list for '$output'"
++ if test "$dlself" = yes; then
++ func_verbose "generating symbol list for \`$output'"
+
+ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+@@ -4629,7 +3298,7 @@
+ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ for progfile in $progfiles; do
+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+- func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
++ 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
+
+@@ -4649,10 +3318,10 @@
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+- export_symbols=$output_objdir/$outputname.exp
++ export_symbols="$output_objdir/$outputname.exp"
+ $opt_dry_run || {
+ $RM $export_symbols
+- eval "$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* )
+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+@@ -4662,7 +3331,7 @@
+ }
+ else
+ $opt_dry_run || {
+- eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++ 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
+@@ -4676,22 +3345,22 @@
+ fi
+
+ for dlprefile in $dlprefiles; do
+- func_verbose "extracting global C symbols from '$dlprefile'"
++ func_verbose "extracting global C symbols from \`$dlprefile'"
+ func_basename "$dlprefile"
+- name=$func_basename_result
++ name="$func_basename_result"
+ 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=
++ 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
++ if test -n "$dlprefile_dlname" ; then
+ func_basename "$dlprefile_dlname"
+- dlprefile_dlbasename=$func_basename_result
++ dlprefile_dlbasename="$func_basename_result"
+ else
+ # no lafile. user explicitly requested -dlpreopen <import library>.
+ $sharedlib_from_linklib_cmd "$dlprefile"
+@@ -4699,7 +3368,7 @@
+ fi
+ fi
+ $opt_dry_run || {
+- if test -n "$dlprefile_dlbasename"; then
++ if test -n "$dlprefile_dlbasename" ; then
+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+ else
+ func_warning "Could not compute DLL name from $name"
+@@ -4755,11 +3424,6 @@
+ echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+ fi
+
+- func_show_eval '$RM "${nlist}I"'
+- if test -n "$global_symbol_to_import"; then
+- eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+- fi
+-
+ echo >> "$output_objdir/$my_dlsyms" "\
+
+ /* The mapping between symbol names and symbols. */
+@@ -4768,30 +3432,11 @@
+ void *address;
+ } lt_dlsymlist;
+ extern LT_DLSYM_CONST lt_dlsymlist
+-lt_${my_prefix}_LTX_preloaded_symbols[];\
+-"
+-
+- if test -s "$nlist"I; then
+- echo >> "$output_objdir/$my_dlsyms" "\
+-static void lt_syminit(void)
+-{
+- LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+- for (; symbol->name; ++symbol)
+- {"
+- $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+- echo >> "$output_objdir/$my_dlsyms" "\
+- }
+-}"
+- fi
+- echo >> "$output_objdir/$my_dlsyms" "\
++lt_${my_prefix}_LTX_preloaded_symbols[];
+ LT_DLSYM_CONST lt_dlsymlist
+ lt_${my_prefix}_LTX_preloaded_symbols[] =
+-{ {\"$my_originator\", (void *) 0},"
+-
+- if test -s "$nlist"I; then
+- echo >> "$output_objdir/$my_dlsyms" "\
+- {\"@INIT@\", (void *) <_syminit},"
+- fi
++{\
++ { \"$my_originator\", (void *) 0 },"
+
+ case $need_lib_prefix in
+ no)
+@@ -4833,7 +3478,9 @@
+ *-*-hpux*)
+ pic_flag_for_symtable=" $pic_flag" ;;
+ *)
+- $my_pic_p && pic_flag_for_symtable=" $pic_flag"
++ if test "X$my_pic_p" != Xno; then
++ pic_flag_for_symtable=" $pic_flag"
++ fi
+ ;;
+ esac
+ ;;
+@@ -4850,10 +3497,10 @@
+ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+ # Clean up the generated files.
+- func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
++ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+
+ # Transform the symbol file into the correct name.
+- symfileobj=$output_objdir/${my_outputname}S.$objext
++ symfileobj="$output_objdir/${my_outputname}S.$objext"
+ case $host in
+ *cygwin* | *mingw* | *cegcc* )
+ if test -f "$output_objdir/$my_outputname.def"; then
+@@ -4871,7 +3518,7 @@
+ esac
+ ;;
+ *)
+- func_fatal_error "unknown suffix for '$my_dlsyms'"
++ func_fatal_error "unknown suffix for \`$my_dlsyms'"
+ ;;
+ esac
+ else
+@@ -4885,32 +3532,6 @@
+ fi
+ }
+
+-# 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 ()
+-{
+- $debug_cmd
+-
+- 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 ()
+-{
+- $debug_cmd
+-
+- 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_win32_libid arg
+ # return the library type of file 'arg'
+ #
+@@ -4920,9 +3541,8 @@
+ # Despite the name, also deal with 64 bit binaries.
+ func_win32_libid ()
+ {
+- $debug_cmd
+-
+- win32_libid_type=unknown
++ $opt_debug
++ win32_libid_type="unknown"
+ win32_fileres=`file -L $1 2>/dev/null`
+ case $win32_fileres in
+ *ar\ archive\ import\ library*) # definitely import
+@@ -4932,29 +3552,16 @@
+ # 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
+- case $nm_interface in
+- "MS dumpbin")
+- if func_cygming_ms_implib_p "$1" ||
+- func_cygming_gnu_implib_p "$1"
+- then
+- win32_nmres=import
+- else
+- win32_nmres=
+- fi
+- ;;
+- *)
+- 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 '
++ 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 /{
+- s|.*|import|
++ s,.*,import,
+ p
+ q
+ }
+ }'`
+- ;;
+- esac
+ case $win32_nmres in
+ import*) win32_libid_type="x86 archive import";;
+ *) win32_libid_type="x86 archive static";;
+@@ -4986,8 +3593,7 @@
+ # $sharedlib_from_linklib_result
+ func_cygming_dll_for_implib ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+ }
+
+@@ -5004,8 +3610,7 @@
+ # specified import library.
+ func_cygming_dll_for_implib_fallback_core ()
+ {
+- $debug_cmd
+-
++ $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"':/{
+@@ -5041,8 +3646,8 @@
+ /./p' |
+ # we now have a list, one entry per line, of the stringified
+ # contents of the appropriate section of all members of the
+- # archive that possess that section. Heuristic: eliminate
+- # all those that have a first or second character that is
++ # 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
+@@ -5053,6 +3658,30 @@
+ $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
+@@ -5066,17 +3695,16 @@
+ # $sharedlib_from_linklib_result
+ func_cygming_dll_for_implib_fallback ()
+ {
+- $debug_cmd
+-
+- if func_cygming_gnu_implib_p "$1"; then
++ $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
++ 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=
++ sharedlib_from_linklib_result=""
+ fi
+ }
+
+@@ -5084,11 +3712,10 @@
+ # func_extract_an_archive dir oldlib
+ func_extract_an_archive ()
+ {
+- $debug_cmd
+-
+- f_ex_an_ar_dir=$1; shift
+- f_ex_an_ar_oldlib=$1
+- if test yes = "$lock_old_archive_extraction"; then
++ $opt_debug
++ f_ex_an_ar_dir="$1"; shift
++ f_ex_an_ar_oldlib="$1"
++ if test "$lock_old_archive_extraction" = yes; then
+ lockfile=$f_ex_an_ar_oldlib.lock
+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+ func_echo "Waiting for $lockfile to be removed"
+@@ -5097,7 +3724,7 @@
+ fi
+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+ 'stat=$?; rm -f "$lockfile"; exit $stat'
+- if test yes = "$lock_old_archive_extraction"; then
++ if test "$lock_old_archive_extraction" = yes; then
+ $opt_dry_run || rm -f "$lockfile"
+ fi
+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+@@ -5111,23 +3738,22 @@
+ # func_extract_archives gentop oldlib ...
+ func_extract_archives ()
+ {
+- $debug_cmd
+-
+- my_gentop=$1; shift
++ $opt_debug
++ my_gentop="$1"; shift
+ my_oldlibs=${1+"$@"}
+- my_oldobjs=
+- my_xlib=
+- my_xabs=
+- my_xdir=
++ my_oldobjs=""
++ my_xlib=""
++ my_xabs=""
++ my_xdir=""
+
+ for my_xlib in $my_oldlibs; do
+ # Extract the objects.
+ case $my_xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
++ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+ *) my_xabs=`pwd`"/$my_xlib" ;;
+ esac
+ func_basename "$my_xlib"
+- my_xlib=$func_basename_result
++ my_xlib="$func_basename_result"
+ my_xlib_u=$my_xlib
+ while :; do
+ case " $extracted_archives " in
+@@ -5139,7 +3765,7 @@
+ esac
+ done
+ extracted_archives="$extracted_archives $my_xlib_u"
+- my_xdir=$my_gentop/$my_xlib_u
++ my_xdir="$my_gentop/$my_xlib_u"
+
+ func_mkdir_p "$my_xdir"
+
+@@ -5152,23 +3778,22 @@
+ cd $my_xdir || exit $?
+ darwin_archive=$my_xabs
+ darwin_curdir=`pwd`
+- func_basename "$darwin_archive"
+- darwin_base_archive=$func_basename_result
++ darwin_base_archive=`basename "$darwin_archive"`
+ darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+ if test -n "$darwin_arches"; then
+ darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+ darwin_arch=
+ func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+- for darwin_arch in $darwin_arches; do
+- func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+- $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+- cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+- func_extract_an_archive "`pwd`" "$darwin_base_archive"
++ for darwin_arch in $darwin_arches ; do
++ func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+ cd "$darwin_curdir"
+- $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
++ $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+ done # $darwin_arches
+ ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
++ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+ darwin_file=
+ darwin_files=
+ for darwin_file in $darwin_filelist; do
+@@ -5190,7 +3815,7 @@
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+ done
+
+- func_extract_archives_result=$my_oldobjs
++ func_extract_archives_result="$my_oldobjs"
+ }
+
+
+@@ -5205,7 +3830,7 @@
+ #
+ # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+ # variable will take. If 'yes', then the emitted script
+-# will assume that the directory where it is stored is
++# will assume that the directory in which it is stored is
+ # the $objdir directory. This is a cygwin/mingw-specific
+ # behavior.
+ func_emit_wrapper ()
+@@ -5216,7 +3841,7 @@
+ #! $SHELL
+
+ # $output - temporary wrapper script for $objdir/$outputname
+-# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ #
+ # The $output program cannot be directly executed until all the libtool
+ # libraries that it depends on are installed.
+@@ -5273,9 +3898,9 @@
+
+ # Very basic option parsing. These options are (a) specific to
+ # the libtool wrapper, (b) are identical between the wrapper
+-# /script/ and the wrapper /executable/ that is used only on
++# /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 that match
++# (application programs are unlikely to have options which match
+ # this pattern).
+ #
+ # There are only two supported options: --lt-debug and
+@@ -5308,7 +3933,7 @@
+
+ # Print the debug banner immediately:
+ if test -n \"\$lt_option_debug\"; then
+- echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
++ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+ fi
+ }
+
+@@ -5319,7 +3944,7 @@
+ lt_dump_args_N=1;
+ for lt_arg
+ do
+- \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+ done
+ }
+@@ -5333,7 +3958,7 @@
+ *-*-mingw | *-*-os2* | *-cegcc*)
+ $ECHO "\
+ if test -n \"\$lt_option_debug\"; then
+- \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+ func_lt_dump_args \${1+\"\$@\"} 1>&2
+ fi
+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+@@ -5343,7 +3968,7 @@
+ *)
+ $ECHO "\
+ if test -n \"\$lt_option_debug\"; then
+- \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+ func_lt_dump_args \${1+\"\$@\"} 1>&2
+ fi
+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+@@ -5418,13 +4043,13 @@
+ test -n \"\$absdir\" && thisdir=\"\$absdir\"
+ "
+
+- if test yes = "$fast_install"; then
++ if test "$fast_install" = yes; then
+ $ECHO "\
+ program=lt-'$outputname'$exeext
+ progdir=\"\$thisdir/$objdir\"
+
+ if test ! -f \"\$progdir/\$program\" ||
+- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
++ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+ test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+ file=\"\$\$-\$program\"
+@@ -5441,7 +4066,7 @@
+ if test -n \"\$relink_command\"; then
+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+ else
+- \$ECHO \"\$relink_command_output\" >&2
++ $ECHO \"\$relink_command_output\" >&2
+ $RM \"\$progdir/\$file\"
+ exit 1
+ fi
+@@ -5476,7 +4101,7 @@
+ fi
+
+ # Export our shlibpath_var if we have one.
+- if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ $ECHO "\
+ # Add our own library path to $shlibpath_var
+ $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+@@ -5496,7 +4121,7 @@
+ fi
+ else
+ # The program doesn't exist.
+- \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
++ \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+ \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+ exit 1
+@@ -5515,7 +4140,7 @@
+ cat <<EOF
+
+ /* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+- Generated by $PROGRAM (GNU $PACKAGE) $VERSION
++ Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+
+ The $output program cannot be directly executed until all the libtool
+ libraries that it depends on are installed.
+@@ -5550,45 +4175,47 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+
+-#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+-
+ /* declarations of non-ANSI functions */
+-#if defined __MINGW32__
++#if defined(__MINGW32__)
+ # ifdef __STRICT_ANSI__
+ int _putenv (const char *);
+ # endif
+-#elif defined __CYGWIN__
++#elif defined(__CYGWIN__)
+ # ifdef __STRICT_ANSI__
+ char *realpath (const char *, char *);
+ int putenv (char *);
+ int setenv (const char *, const char *, int);
+ # endif
+-/* #elif defined other_platform || defined ... */
++/* #elif defined (other platforms) ... */
+ #endif
+
+ /* portability defines, excluding path handling macros */
+-#if defined _MSC_VER
++#if defined(_MSC_VER)
+ # define setmode _setmode
+ # define stat _stat
+ # define chmod _chmod
+ # define getcwd _getcwd
+ # define putenv _putenv
+ # define S_IXUSR _S_IEXEC
+-#elif defined __MINGW32__
++# ifndef _INTPTR_T_DEFINED
++# define _INTPTR_T_DEFINED
++# define intptr_t int
++# endif
++#elif defined(__MINGW32__)
+ # define setmode _setmode
+ # define stat _stat
+ # define chmod _chmod
+ # define getcwd _getcwd
+ # define putenv _putenv
+-#elif defined __CYGWIN__
++#elif defined(__CYGWIN__)
+ # define HAVE_SETENV
+ # define FOPEN_WB "wb"
+-/* #elif defined other platforms ... */
++/* #elif defined (other platforms) ... */
+ #endif
+
+-#if defined PATH_MAX
++#if defined(PATH_MAX)
+ # define LT_PATHMAX PATH_MAX
+-#elif defined MAXPATHLEN
++#elif defined(MAXPATHLEN)
+ # define LT_PATHMAX MAXPATHLEN
+ #else
+ # define LT_PATHMAX 1024
+@@ -5607,8 +4234,8 @@
+ # define PATH_SEPARATOR ':'
+ #endif
+
+-#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+- defined __OS2__
++#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
++ defined (__OS2__)
+ # define HAVE_DOS_BASED_FILE_SYSTEM
+ # define FOPEN_WB "wb"
+ # ifndef DIR_SEPARATOR_2
+@@ -5641,10 +4268,10 @@
+
+ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
+ #define XFREE(stale) do { \
+- if (stale) { free (stale); stale = 0; } \
++ if (stale) { free ((void *) stale); stale = 0; } \
+ } while (0)
+
+-#if defined LT_DEBUGWRAPPER
++#if defined(LT_DEBUGWRAPPER)
+ static int lt_debug = 1;
+ #else
+ static int lt_debug = 0;
+@@ -5673,16 +4300,11 @@
+ EOF
+
+ cat <<EOF
+-#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+-# define externally_visible volatile
+-#else
+-# define externally_visible __attribute__((externally_visible)) volatile
+-#endif
+-externally_visible const char * MAGIC_EXE = "$magic_exe";
++volatile const char * MAGIC_EXE = "$magic_exe";
+ const char * LIB_PATH_VARNAME = "$shlibpath_var";
+ EOF
+
+- if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ func_to_host_path "$temp_rpath"
+ cat <<EOF
+ const char * LIB_PATH_VALUE = "$func_to_host_path_result";
+@@ -5706,7 +4328,7 @@
+ EOF
+ fi
+
+- if test yes = "$fast_install"; then
++ if test "$fast_install" = yes; then
+ cat <<EOF
+ const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+ EOF
+@@ -5735,12 +4357,12 @@
+ char *actual_cwrapper_name;
+ char *target_name;
+ char *lt_argv_zero;
+- int rval = 127;
++ intptr_t rval = 127;
+
+ int i;
+
+ program_name = (char *) xstrdup (base_name (argv[0]));
+- newargz = XMALLOC (char *, (size_t) argc + 1);
++ newargz = XMALLOC (char *, argc + 1);
+
+ /* very simple arg parsing; don't want to rely on getopt
+ * also, copy all non cwrapper options to newargz, except
+@@ -5749,10 +4371,10 @@
+ newargc=0;
+ for (i = 1; i < argc; i++)
+ {
+- if (STREQ (argv[i], dumpscript_opt))
++ if (strcmp (argv[i], dumpscript_opt) == 0)
+ {
+ EOF
+- case $host in
++ case "$host" in
+ *mingw* | *cygwin* )
+ # make stdout use "unix" line endings
+ echo " setmode(1,_O_BINARY);"
+@@ -5763,12 +4385,12 @@
+ lt_dump_script (stdout);
+ return 0;
+ }
+- if (STREQ (argv[i], debug_opt))
++ if (strcmp (argv[i], debug_opt) == 0)
+ {
+ lt_debug = 1;
+ continue;
+ }
+- if (STREQ (argv[i], ltwrapper_option_prefix))
++ 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
+@@ -5791,7 +4413,7 @@
+ EOF
+ cat <<EOF
+ /* The GNU banner must be the first non-error debug message */
+- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
++ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+ EOF
+ cat <<"EOF"
+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+@@ -5902,7 +4524,7 @@
+ cat <<"EOF"
+ /* execv doesn't actually work on mingw as expected on unix */
+ newargz = prepare_spawn (newargz);
+- rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
++ rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+ if (rval == -1)
+ {
+ /* failed to start process */
+@@ -5947,7 +4569,7 @@
+ {
+ const char *base;
+
+-#if defined HAVE_DOS_BASED_FILE_SYSTEM
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ /* Skip over the disk name in MSDOS pathnames. */
+ if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+ name += 2;
+@@ -6006,7 +4628,7 @@
+ const char *p_next;
+ /* static buffer for getcwd */
+ char tmp[LT_PATHMAX + 1];
+- size_t tmp_len;
++ int tmp_len;
+ char *concat_name;
+
+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+@@ -6016,7 +4638,7 @@
+ return NULL;
+
+ /* Absolute path? */
+-#if defined HAVE_DOS_BASED_FILE_SYSTEM
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+ {
+ concat_name = xstrdup (wrapper);
+@@ -6034,7 +4656,7 @@
+ return concat_name;
+ XFREE (concat_name);
+ }
+-#if defined HAVE_DOS_BASED_FILE_SYSTEM
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ }
+ #endif
+
+@@ -6057,7 +4679,7 @@
+ for (q = p; *q; q++)
+ if (IS_PATH_SEPARATOR (*q))
+ break;
+- p_len = (size_t) (q - p);
++ p_len = q - p;
+ p_next = (*q == '\0' ? q : q + 1);
+ if (p_len == 0)
+ {
+@@ -6176,7 +4798,7 @@
+ if (patlen <= len)
+ {
+ str += len - patlen;
+- if (STREQ (str, pat))
++ if (strcmp (str, pat) == 0)
+ *str = '\0';
+ }
+ return str;
+@@ -6241,7 +4863,7 @@
+ char *str = xstrdup (value);
+ setenv (name, str, 1);
+ #else
+- size_t len = strlen (name) + 1 + strlen (value) + 1;
++ int len = strlen (name) + 1 + strlen (value) + 1;
+ char *str = XMALLOC (char, len);
+ sprintf (str, "%s=%s", name, value);
+ if (putenv (str) != EXIT_SUCCESS)
+@@ -6258,8 +4880,8 @@
+ char *new_value;
+ if (orig_value && *orig_value)
+ {
+- size_t orig_value_len = strlen (orig_value);
+- size_t add_len = strlen (add);
++ int orig_value_len = strlen (orig_value);
++ int add_len = strlen (add);
+ new_value = XMALLOC (char, add_len + orig_value_len + 1);
+ if (to_end)
+ {
+@@ -6290,10 +4912,10 @@
+ {
+ char *new_value = lt_extend_str (getenv (name), value, 0);
+ /* some systems can't cope with a ':'-terminated path #' */
+- size_t len = strlen (new_value);
+- while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
++ int len = strlen (new_value);
++ while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+ {
+- new_value[--len] = '\0';
++ new_value[len-1] = '\0';
+ }
+ lt_setenv (name, new_value);
+ XFREE (new_value);
+@@ -6460,47 +5082,27 @@
+ # True if ARG is an import lib, as indicated by $file_magic_cmd
+ func_win32_import_lib_p ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+ *import*) : ;;
+ *) false ;;
+ esac
+ }
+
+-# func_suncc_cstd_abi
+-# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+-# Several compiler flags select an ABI that is incompatible with the
+-# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+-func_suncc_cstd_abi ()
+-{
+- $debug_cmd
+-
+- case " $compile_command " in
+- *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+- suncc_use_cstd_abi=no
+- ;;
+- *)
+- suncc_use_cstd_abi=yes
+- ;;
+- esac
+-}
+-
+ # func_mode_link arg...
+ func_mode_link ()
+ {
+- $debug_cmd
+-
++ $opt_debug
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ # It is impossible to link a dll without this setting, and
+ # we shouldn't force the makefile maintainer to figure out
+- # what system we are compiling for in order to pass an extra
++ # which system we are compiling for in order to pass an extra
+ # flag for every libtool invocation.
+ # allow_undefined=no
+
+ # FIXME: Unfortunately, there are problems with the above when trying
+- # to make a dll that has undefined symbols, in which case not
++ # to make a dll which has undefined symbols, in which case not
+ # even a static library is built. For now, we need to specify
+ # -no-undefined on the libtool link line when we can be certain
+ # that all symbols are satisfied, otherwise we get a static library.
+@@ -6544,11 +5146,10 @@
+ module=no
+ no_install=no
+ objs=
+- os2dllname=
+ non_pic_objects=
+ precious_files_regex=
+ prefer_static_libs=no
+- preload=false
++ preload=no
+ prev=
+ prevarg=
+ release=
+@@ -6560,7 +5161,7 @@
+ vinfo=
+ vinfo_number=no
+ weak_libs=
+- single_module=$wl-single_module
++ single_module="${wl}-single_module"
+ func_infer_tag $base_compile
+
+ # We need to know -static, to get the right output filenames.
+@@ -6568,15 +5169,15 @@
+ do
+ case $arg in
+ -shared)
+- test yes != "$build_libtool_libs" \
+- && func_fatal_configuration "cannot build a shared library"
++ test "$build_libtool_libs" != yes && \
++ func_fatal_configuration "can not build a shared library"
+ build_old_libs=no
+ break
+ ;;
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+ -all-static)
+- if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
++ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ func_warning "complete static linking is impossible in this configuration"
+ fi
+ if test -n "$link_static_flag"; then
+@@ -6609,7 +5210,7 @@
+
+ # Go through the arguments, transforming them on the way.
+ while test "$#" -gt 0; do
+- arg=$1
++ arg="$1"
+ shift
+ func_quote_for_eval "$arg"
+ qarg=$func_quote_for_eval_unquoted_result
+@@ -6626,21 +5227,21 @@
+
+ case $prev in
+ bindir)
+- bindir=$arg
++ bindir="$arg"
+ prev=
+ continue
+ ;;
+ dlfiles|dlprefiles)
+- $preload || {
++ if test "$preload" = no; then
+ # Add the symbol object into the linking commands.
+ func_append compile_command " @SYMFILE@"
+ func_append finalize_command " @SYMFILE@"
+- preload=:
+- }
++ preload=yes
++ fi
+ case $arg in
+ *.la | *.lo) ;; # We handle these cases below.
+ force)
+- if test no = "$dlself"; then
++ if test "$dlself" = no; then
+ dlself=needless
+ export_dynamic=yes
+ fi
+@@ -6648,9 +5249,9 @@
+ continue
+ ;;
+ self)
+- if test dlprefiles = "$prev"; then
++ if test "$prev" = dlprefiles; then
+ dlself=yes
+- elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
++ elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+ dlself=yes
+ else
+ dlself=needless
+@@ -6660,7 +5261,7 @@
+ continue
+ ;;
+ *)
+- if test dlfiles = "$prev"; then
++ if test "$prev" = dlfiles; then
+ func_append dlfiles " $arg"
+ else
+ func_append dlprefiles " $arg"
+@@ -6671,14 +5272,14 @@
+ esac
+ ;;
+ expsyms)
+- export_symbols=$arg
++ export_symbols="$arg"
+ test -f "$arg" \
+- || func_fatal_error "symbol file '$arg' does not exist"
++ || func_fatal_error "symbol file \`$arg' does not exist"
+ prev=
+ continue
+ ;;
+ expsyms_regex)
+- export_symbols_regex=$arg
++ export_symbols_regex="$arg"
+ prev=
+ continue
+ ;;
+@@ -6696,13 +5297,7 @@
+ continue
+ ;;
+ inst_prefix)
+- inst_prefix_dir=$arg
+- prev=
+- continue
+- ;;
+- mllvm)
+- # Clang does not use LLVM to link, so we can simply discard any
+- # '-mllvm $arg' options when doing the link step.
++ inst_prefix_dir="$arg"
+ prev=
+ continue
+ ;;
+@@ -6726,21 +5321,21 @@
+
+ if test -z "$pic_object" ||
+ test -z "$non_pic_object" ||
+- test none = "$pic_object" &&
+- test none = "$non_pic_object"; then
+- func_fatal_error "cannot find name of object for '$arg'"
++ test "$pic_object" = none &&
++ test "$non_pic_object" = none; then
++ func_fatal_error "cannot find name of object for \`$arg'"
+ fi
+
+ # Extract subdirectory from the argument.
+ func_dirname "$arg" "/" ""
+- xdir=$func_dirname_result
++ xdir="$func_dirname_result"
+
+- if test none != "$pic_object"; then
++ if test "$pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+- pic_object=$xdir$pic_object
++ pic_object="$xdir$pic_object"
+
+- if test dlfiles = "$prev"; then
+- if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
++ if test "$prev" = dlfiles; then
++ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ func_append dlfiles " $pic_object"
+ prev=
+ continue
+@@ -6751,7 +5346,7 @@
+ fi
+
+ # CHECK ME: I think I busted this. -Ossama
+- if test dlprefiles = "$prev"; then
++ if test "$prev" = dlprefiles; then
+ # Preload the old-style object.
+ func_append dlprefiles " $pic_object"
+ prev=
+@@ -6759,23 +5354,23 @@
+
+ # A PIC object.
+ func_append libobjs " $pic_object"
+- arg=$pic_object
++ arg="$pic_object"
+ fi
+
+ # Non-PIC object.
+- if test none != "$non_pic_object"; then
++ if test "$non_pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+- non_pic_object=$xdir$non_pic_object
++ non_pic_object="$xdir$non_pic_object"
+
+ # A standard non-PIC object
+ func_append non_pic_objects " $non_pic_object"
+- if test -z "$pic_object" || test none = "$pic_object"; then
+- arg=$non_pic_object
++ if test -z "$pic_object" || test "$pic_object" = none ; then
++ arg="$non_pic_object"
+ fi
+ else
+ # If the PIC object exists, use it instead.
+ # $xdir was prepended to $pic_object above.
+- non_pic_object=$pic_object
++ non_pic_object="$pic_object"
+ func_append non_pic_objects " $non_pic_object"
+ fi
+ else
+@@ -6783,7 +5378,7 @@
+ if $opt_dry_run; then
+ # Extract subdirectory from the argument.
+ func_dirname "$arg" "/" ""
+- xdir=$func_dirname_result
++ xdir="$func_dirname_result"
+
+ func_lo2o "$arg"
+ pic_object=$xdir$objdir/$func_lo2o_result
+@@ -6791,29 +5386,24 @@
+ func_append libobjs " $pic_object"
+ func_append non_pic_objects " $non_pic_object"
+ else
+- func_fatal_error "'$arg' is not a valid libtool object"
++ func_fatal_error "\`$arg' is not a valid libtool object"
+ fi
+ fi
+ done
+ else
+- func_fatal_error "link input file '$arg' does not exist"
++ func_fatal_error "link input file \`$arg' does not exist"
+ fi
+ arg=$save_arg
+ prev=
+ continue
+ ;;
+- os2dllname)
+- os2dllname=$arg
+- prev=
+- continue
+- ;;
+ precious_regex)
+- precious_files_regex=$arg
++ precious_files_regex="$arg"
+ prev=
+ continue
+ ;;
+ release)
+- release=-$arg
++ release="-$arg"
+ prev=
+ continue
+ ;;
+@@ -6825,7 +5415,7 @@
+ func_fatal_error "only absolute run-paths are allowed"
+ ;;
+ esac
+- if test rpath = "$prev"; then
++ if test "$prev" = rpath; then
+ case "$rpath " in
+ *" $arg "*) ;;
+ *) func_append rpath " $arg" ;;
+@@ -6840,7 +5430,7 @@
+ continue
+ ;;
+ shrext)
+- shrext_cmds=$arg
++ shrext_cmds="$arg"
+ prev=
+ continue
+ ;;
+@@ -6880,7 +5470,7 @@
+ esac
+ fi # test -n "$prev"
+
+- prevarg=$arg
++ prevarg="$arg"
+
+ case $arg in
+ -all-static)
+@@ -6894,7 +5484,7 @@
+
+ -allow-undefined)
+ # FIXME: remove this flag sometime in the future.
+- func_fatal_error "'-allow-undefined' must not be used because it is the default"
++ func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+ ;;
+
+ -avoid-version)
+@@ -6926,7 +5516,7 @@
+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ func_fatal_error "more than one -exported-symbols argument is not allowed"
+ fi
+- if test X-export-symbols = "X$arg"; then
++ if test "X$arg" = "X-export-symbols"; then
+ prev=expsyms
+ else
+ prev=expsyms_regex
+@@ -6960,9 +5550,9 @@
+ func_stripname "-L" '' "$arg"
+ if test -z "$func_stripname_result"; then
+ if test "$#" -gt 0; then
+- func_fatal_error "require no space between '-L' and '$1'"
++ func_fatal_error "require no space between \`-L' and \`$1'"
+ else
+- func_fatal_error "need path for '-L' option"
++ func_fatal_error "need path for \`-L' option"
+ fi
+ fi
+ func_resolve_sysroot "$func_stripname_result"
+@@ -6973,8 +5563,8 @@
+ *)
+ absdir=`cd "$dir" && pwd`
+ test -z "$absdir" && \
+- func_fatal_error "cannot determine absolute directory name of '$dir'"
+- dir=$absdir
++ func_fatal_error "cannot determine absolute directory name of \`$dir'"
++ dir="$absdir"
+ ;;
+ esac
+ case "$deplibs " in
+@@ -7009,7 +5599,7 @@
+ ;;
+
+ -l*)
+- if test X-lc = "X$arg" || test X-lm = "X$arg"; then
++ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ # These systems don't actually have a C or math library (as such)
+@@ -7017,11 +5607,11 @@
+ ;;
+ *-*-os2*)
+ # These systems don't actually have a C library (as such)
+- test X-lc = "X$arg" && continue
++ test "X$arg" = "X-lc" && continue
+ ;;
+- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc due to us having libc/libc_r.
+- test X-lc = "X$arg" && continue
++ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C and math libraries are in the System framework
+@@ -7030,16 +5620,16 @@
+ ;;
+ *-*-sco3.2v5* | *-*-sco5v6*)
+ # Causes problems with __ctype
+- test X-lc = "X$arg" && continue
++ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+ # Compiler inserts libc in the correct place for threads to work
+- test X-lc = "X$arg" && continue
++ test "X$arg" = "X-lc" && continue
+ ;;
+ esac
+- elif test X-lc_r = "X$arg"; then
++ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -7049,11 +5639,6 @@
+ continue
+ ;;
+
+- -mllvm)
+- prev=mllvm
+- continue
+- ;;
+-
+ -module)
+ module=yes
+ continue
+@@ -7083,7 +5668,7 @@
+ ;;
+
+ -multi_module)
+- single_module=$wl-multi_module
++ single_module="${wl}-multi_module"
+ continue
+ ;;
+
+@@ -7097,8 +5682,8 @@
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+ # The PATH hackery in wrapper scripts is required on Windows
+ # and Darwin in order for the loader to find any dlls it needs.
+- func_warning "'-no-install' is ignored for $host"
+- func_warning "assuming '-no-fast-install' instead"
++ func_warning "\`-no-install' is ignored for $host"
++ func_warning "assuming \`-no-fast-install' instead"
+ fast_install=no
+ ;;
+ *) no_install=yes ;;
+@@ -7116,11 +5701,6 @@
+ continue
+ ;;
+
+- -os2dllname)
+- prev=os2dllname
+- continue
+- ;;
+-
+ -o) prev=output ;;
+
+ -precious-files-regex)
+@@ -7208,14 +5788,14 @@
+ func_stripname '-Wc,' '' "$arg"
+ args=$func_stripname_result
+ arg=
+- save_ifs=$IFS; IFS=,
++ save_ifs="$IFS"; IFS=','
+ for flag in $args; do
+- IFS=$save_ifs
++ IFS="$save_ifs"
+ func_quote_for_eval "$flag"
+ func_append arg " $func_quote_for_eval_result"
+ func_append compiler_flags " $func_quote_for_eval_result"
+ done
+- IFS=$save_ifs
++ IFS="$save_ifs"
+ func_stripname ' ' '' "$arg"
+ arg=$func_stripname_result
+ ;;
+@@ -7224,15 +5804,15 @@
+ func_stripname '-Wl,' '' "$arg"
+ args=$func_stripname_result
+ arg=
+- save_ifs=$IFS; IFS=,
++ save_ifs="$IFS"; IFS=','
+ for flag in $args; do
+- IFS=$save_ifs
++ IFS="$save_ifs"
+ func_quote_for_eval "$flag"
+ func_append arg " $wl$func_quote_for_eval_result"
+ func_append compiler_flags " $wl$func_quote_for_eval_result"
+ func_append linker_flags " $func_quote_for_eval_result"
+ done
+- IFS=$save_ifs
++ IFS="$save_ifs"
+ func_stripname ' ' '' "$arg"
+ arg=$func_stripname_result
+ ;;
+@@ -7255,7 +5835,7 @@
+ # -msg_* for osf cc
+ -msg_*)
+ func_quote_for_eval "$arg"
+- arg=$func_quote_for_eval_result
++ arg="$func_quote_for_eval_result"
+ ;;
+
+ # Flags to be passed through unchanged, with rationale:
+@@ -7267,46 +5847,25 @@
+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+ # -F/path path to uninstalled frameworks, gcc on darwin
+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
+- # -fstack-protector* stack protector flags for GCC
+ # @file GCC response files
+ # -tp=* Portland pgcc target processor selection
+ # --sysroot=* for sysroot support
+- # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+- # -stdlib=* select c++ std lib with clang
++ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+ func_quote_for_eval "$arg"
+- arg=$func_quote_for_eval_result
++ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ func_append compiler_flags " $arg"
+ continue
+ ;;
+
+- -Z*)
+- if test os2 = "`expr $host : '.*\(os2\)'`"; then
+- # OS/2 uses -Zxxx to specify OS/2-specific options
+- compiler_flags="$compiler_flags $arg"
+- func_append compile_command " $arg"
+- func_append finalize_command " $arg"
+- case $arg in
+- -Zlinker | -Zstack)
+- prev=xcompiler
+- ;;
+- esac
+- continue
+- else
+- # Otherwise treat like 'Some other compiler flag' below
+- func_quote_for_eval "$arg"
+- arg=$func_quote_for_eval_result
+- fi
+- ;;
+-
+ # Some other compiler flag.
+ -* | +*)
+ func_quote_for_eval "$arg"
+- arg=$func_quote_for_eval_result
++ arg="$func_quote_for_eval_result"
+ ;;
+
+ *.$objext)
+@@ -7327,21 +5886,21 @@
+
+ if test -z "$pic_object" ||
+ test -z "$non_pic_object" ||
+- test none = "$pic_object" &&
+- test none = "$non_pic_object"; then
+- func_fatal_error "cannot find name of object for '$arg'"
++ test "$pic_object" = none &&
++ test "$non_pic_object" = none; then
++ func_fatal_error "cannot find name of object for \`$arg'"
+ fi
+
+ # Extract subdirectory from the argument.
+ func_dirname "$arg" "/" ""
+- xdir=$func_dirname_result
++ xdir="$func_dirname_result"
+
+- test none = "$pic_object" || {
++ if test "$pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+- pic_object=$xdir$pic_object
++ pic_object="$xdir$pic_object"
+
+- if test dlfiles = "$prev"; then
+- if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
++ if test "$prev" = dlfiles; then
++ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ func_append dlfiles " $pic_object"
+ prev=
+ continue
+@@ -7352,7 +5911,7 @@
+ fi
+
+ # CHECK ME: I think I busted this. -Ossama
+- if test dlprefiles = "$prev"; then
++ if test "$prev" = dlprefiles; then
+ # Preload the old-style object.
+ func_append dlprefiles " $pic_object"
+ prev=
+@@ -7360,23 +5919,23 @@
+
+ # A PIC object.
+ func_append libobjs " $pic_object"
+- arg=$pic_object
+- }
++ arg="$pic_object"
++ fi
+
+ # Non-PIC object.
+- if test none != "$non_pic_object"; then
++ if test "$non_pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+- non_pic_object=$xdir$non_pic_object
++ non_pic_object="$xdir$non_pic_object"
+
+ # A standard non-PIC object
+ func_append non_pic_objects " $non_pic_object"
+- if test -z "$pic_object" || test none = "$pic_object"; then
+- arg=$non_pic_object
++ if test -z "$pic_object" || test "$pic_object" = none ; then
++ arg="$non_pic_object"
+ fi
+ else
+ # If the PIC object exists, use it instead.
+ # $xdir was prepended to $pic_object above.
+- non_pic_object=$pic_object
++ non_pic_object="$pic_object"
+ func_append non_pic_objects " $non_pic_object"
+ fi
+ else
+@@ -7384,7 +5943,7 @@
+ if $opt_dry_run; then
+ # Extract subdirectory from the argument.
+ func_dirname "$arg" "/" ""
+- xdir=$func_dirname_result
++ xdir="$func_dirname_result"
+
+ func_lo2o "$arg"
+ pic_object=$xdir$objdir/$func_lo2o_result
+@@ -7392,7 +5951,7 @@
+ func_append libobjs " $pic_object"
+ func_append non_pic_objects " $non_pic_object"
+ else
+- func_fatal_error "'$arg' is not a valid libtool object"
++ func_fatal_error "\`$arg' is not a valid libtool object"
+ fi
+ fi
+ ;;
+@@ -7408,11 +5967,11 @@
+ # A libtool-controlled library.
+
+ func_resolve_sysroot "$arg"
+- if test dlfiles = "$prev"; then
++ if test "$prev" = dlfiles; then
+ # This library was specified with -dlopen.
+ func_append dlfiles " $func_resolve_sysroot_result"
+ prev=
+- elif test dlprefiles = "$prev"; then
++ elif test "$prev" = dlprefiles; then
+ # The library was specified with -dlpreopen.
+ func_append dlprefiles " $func_resolve_sysroot_result"
+ prev=
+@@ -7427,7 +5986,7 @@
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ func_quote_for_eval "$arg"
+- arg=$func_quote_for_eval_result
++ arg="$func_quote_for_eval_result"
+ ;;
+ esac # arg
+
+@@ -7439,9 +5998,9 @@
+ done # argument parsing loop
+
+ test -n "$prev" && \
+- func_fatal_help "the '$prevarg' option requires an argument"
++ func_fatal_help "the \`$prevarg' option requires an argument"
+
+- if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
++ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+ eval arg=\"$export_dynamic_flag_spec\"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+@@ -7450,23 +6009,20 @@
+ oldlibs=
+ # calculate the name of the file, without its directory
+ func_basename "$output"
+- outputname=$func_basename_result
+- libobjs_save=$libobjs
++ outputname="$func_basename_result"
++ libobjs_save="$libobjs"
+
+ if test -n "$shlibpath_var"; then
+ # get the directories listed in $shlibpath_var
+- eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
++ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+ else
+ shlib_search_path=
+ fi
+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+- # Definition is injected by LT_CONFIG during libtool generation.
+- func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+-
+ func_dirname "$output" "/" ""
+- output_objdir=$func_dirname_result$objdir
++ output_objdir="$func_dirname_result$objdir"
+ func_to_tool_file "$output_objdir/"
+ tool_output_objdir=$func_to_tool_file_result
+ # Create the object directory.
+@@ -7489,7 +6045,7 @@
+ # Find all interdependent deplibs by searching for libraries
+ # that are linked more than once (e.g. -la -lb -la)
+ for deplib in $deplibs; do
+- if $opt_preserve_dup_deps; then
++ if $opt_preserve_dup_deps ; then
+ case "$libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+@@ -7497,7 +6053,7 @@
+ func_append libs " $deplib"
+ done
+
+- if test lib = "$linkmode"; then
++ if test "$linkmode" = lib; then
+ libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+ # Compute libraries that are listed more than once in $predeps
+@@ -7529,7 +6085,7 @@
+ case $file in
+ *.la) ;;
+ *)
+- func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
++ func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+ ;;
+ esac
+ done
+@@ -7537,7 +6093,7 @@
+ prog)
+ compile_deplibs=
+ finalize_deplibs=
+- alldeplibs=false
++ alldeplibs=no
+ newdlfiles=
+ newdlprefiles=
+ passes="conv scan dlopen dlpreopen link"
+@@ -7549,29 +6105,29 @@
+ for pass in $passes; do
+ # The preopen pass in lib mode reverses $deplibs; put it back here
+ # so that -L comes before libs that need it for instance...
+- if test lib,link = "$linkmode,$pass"; then
++ if test "$linkmode,$pass" = "lib,link"; then
+ ## FIXME: Find the place where the list is rebuilt in the wrong
+ ## order, and fix it there properly
+ tmp_deplibs=
+ for deplib in $deplibs; do
+ tmp_deplibs="$deplib $tmp_deplibs"
+ done
+- deplibs=$tmp_deplibs
++ deplibs="$tmp_deplibs"
+ fi
+
+- if test lib,link = "$linkmode,$pass" ||
+- test prog,scan = "$linkmode,$pass"; then
+- libs=$deplibs
++ if test "$linkmode,$pass" = "lib,link" ||
++ test "$linkmode,$pass" = "prog,scan"; then
++ libs="$deplibs"
+ deplibs=
+ fi
+- if test prog = "$linkmode"; then
++ if test "$linkmode" = prog; then
+ case $pass in
+- dlopen) libs=$dlfiles ;;
+- dlpreopen) libs=$dlprefiles ;;
++ dlopen) libs="$dlfiles" ;;
++ dlpreopen) libs="$dlprefiles" ;;
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ esac
+ fi
+- if test lib,dlpreopen = "$linkmode,$pass"; then
++ if test "$linkmode,$pass" = "lib,dlpreopen"; then
+ # Collect and forward deplibs of preopened libtool libs
+ for lib in $dlprefiles; do
+ # Ignore non-libtool-libs
+@@ -7592,26 +6148,26 @@
+ esac
+ done
+ done
+- libs=$dlprefiles
++ libs="$dlprefiles"
+ fi
+- if test dlopen = "$pass"; then
++ if test "$pass" = dlopen; then
+ # Collect dlpreopened libraries
+- save_deplibs=$deplibs
++ save_deplibs="$deplibs"
+ deplibs=
+ fi
+
+ for deplib in $libs; do
+ lib=
+- found=false
++ found=no
+ case $deplib in
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+- if test prog,link = "$linkmode,$pass"; then
++ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ func_append compiler_flags " $deplib"
+- if test lib = "$linkmode"; then
++ if test "$linkmode" = lib ; then
+ case "$new_inherited_linker_flags " in
+ *" $deplib "*) ;;
+ * ) func_append new_inherited_linker_flags " $deplib" ;;
+@@ -7621,13 +6177,13 @@
+ continue
+ ;;
+ -l*)
+- if test lib != "$linkmode" && test prog != "$linkmode"; then
+- func_warning "'-l' is ignored for archives/objects"
++ if test "$linkmode" != lib && test "$linkmode" != prog; then
++ func_warning "\`-l' is ignored for archives/objects"
+ continue
+ fi
+ func_stripname '-l' '' "$deplib"
+ name=$func_stripname_result
+- if test lib = "$linkmode"; then
++ if test "$linkmode" = lib; then
+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+ else
+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+@@ -7635,22 +6191,31 @@
+ for searchdir in $searchdirs; do
+ for search_ext in .la $std_shrext .so .a; do
+ # Search the libtool library
+- lib=$searchdir/lib$name$search_ext
++ lib="$searchdir/lib${name}${search_ext}"
+ if test -f "$lib"; then
+- if test .la = "$search_ext"; then
+- found=:
++ if test "$search_ext" = ".la"; then
++ found=yes
+ else
+- found=false
++ found=no
+ fi
+ break 2
+ fi
+ done
+ done
+- if $found; then
+- # deplib is a libtool library
++ if test "$found" != yes; then
++ # deplib doesn't seem to be a libtool library
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ deplibs="$deplib $deplibs"
++ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
++ fi
++ continue
++ else # deplib is a libtool library
+ # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+ # We need to do some special things here, and not later.
+- if test yes = "$allow_libtool_libs_with_static_runtimes"; then
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $deplib "*)
+ if func_lalib_p "$lib"; then
+@@ -7658,19 +6223,19 @@
+ old_library=
+ func_source "$lib"
+ for l in $old_library $library_names; do
+- ll=$l
++ ll="$l"
+ done
+- if test "X$ll" = "X$old_library"; then # only static version available
+- found=false
++ if test "X$ll" = "X$old_library" ; then # only static version available
++ found=no
+ func_dirname "$lib" "" "."
+- ladir=$func_dirname_result
++ ladir="$func_dirname_result"
+ lib=$ladir/$old_library
+- if test prog,link = "$linkmode,$pass"; then
++ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+- test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
++ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
+ fi
+@@ -7679,25 +6244,15 @@
+ *) ;;
+ esac
+ fi
+- else
+- # deplib doesn't seem to be a libtool library
+- if test prog,link = "$linkmode,$pass"; then
+- compile_deplibs="$deplib $compile_deplibs"
+- finalize_deplibs="$deplib $finalize_deplibs"
+- else
+- deplibs="$deplib $deplibs"
+- test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+- fi
+- continue
+ fi
+ ;; # -l
+ *.ltframework)
+- if test prog,link = "$linkmode,$pass"; then
++ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+- if test lib = "$linkmode"; then
++ if test "$linkmode" = lib ; then
+ case "$new_inherited_linker_flags " in
+ *" $deplib "*) ;;
+ * ) func_append new_inherited_linker_flags " $deplib" ;;
+@@ -7710,18 +6265,18 @@
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+- test conv = "$pass" && continue
++ test "$pass" = conv && continue
+ newdependency_libs="$deplib $newdependency_libs"
+ func_stripname '-L' '' "$deplib"
+ func_resolve_sysroot "$func_stripname_result"
+ func_append newlib_search_path " $func_resolve_sysroot_result"
+ ;;
+ prog)
+- if test conv = "$pass"; then
++ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ continue
+ fi
+- if test scan = "$pass"; then
++ if test "$pass" = scan; then
+ deplibs="$deplib $deplibs"
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+@@ -7732,13 +6287,13 @@
+ func_append newlib_search_path " $func_resolve_sysroot_result"
+ ;;
+ *)
+- func_warning "'-L' is ignored for archives/objects"
++ func_warning "\`-L' is ignored for archives/objects"
+ ;;
+ esac # linkmode
+ continue
+ ;; # -L
+ -R*)
+- if test link = "$pass"; then
++ if test "$pass" = link; then
+ func_stripname '-R' '' "$deplib"
+ func_resolve_sysroot "$func_stripname_result"
+ dir=$func_resolve_sysroot_result
+@@ -7756,7 +6311,7 @@
+ lib=$func_resolve_sysroot_result
+ ;;
+ *.$libext)
+- if test conv = "$pass"; then
++ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ continue
+ fi
+@@ -7767,26 +6322,21 @@
+ case " $dlpreconveniencelibs " in
+ *" $deplib "*) ;;
+ *)
+- valid_a_lib=false
++ valid_a_lib=no
+ case $deplibs_check_method in
+ match_pattern*)
+ set dummy $deplibs_check_method; shift
+ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+ | $EGREP "$match_pattern_regex" > /dev/null; then
+- valid_a_lib=:
++ valid_a_lib=yes
+ fi
+ ;;
+ pass_all)
+- valid_a_lib=:
++ valid_a_lib=yes
+ ;;
+ esac
+- if $valid_a_lib; then
+- echo
+- $ECHO "*** Warning: Linking the shared library $output against the"
+- $ECHO "*** static library $deplib is not portable!"
+- deplibs="$deplib $deplibs"
+- else
++ if test "$valid_a_lib" != yes; then
+ echo
+ $ECHO "*** Warning: Trying to link with static lib archive $deplib."
+ echo "*** I have the capability to make that library automatically link in when"
+@@ -7794,13 +6344,18 @@
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because the file extensions .$libext of this argument makes me believe"
+ echo "*** that it is just a static archive that I should not use here."
++ else
++ echo
++ $ECHO "*** Warning: Linking the shared library $output against the"
++ $ECHO "*** static library $deplib is not portable!"
++ deplibs="$deplib $deplibs"
+ fi
+ ;;
+ esac
+ continue
+ ;;
+ prog)
+- if test link != "$pass"; then
++ if test "$pass" != link; then
+ deplibs="$deplib $deplibs"
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+@@ -7811,10 +6366,10 @@
+ esac # linkmode
+ ;; # *.$libext
+ *.lo | *.$objext)
+- if test conv = "$pass"; then
++ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+- elif test prog = "$linkmode"; then
+- if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
++ elif test "$linkmode" = prog; then
++ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ # If there is no dlopen support or we're linking statically,
+ # we need to preload.
+ func_append newdlprefiles " $deplib"
+@@ -7827,20 +6382,22 @@
+ continue
+ ;;
+ %DEPLIBS%)
+- alldeplibs=:
++ alldeplibs=yes
+ continue
+ ;;
+ esac # case $deplib
+
+- $found || test -f "$lib" \
+- || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
++ if test "$found" = yes || test -f "$lib"; then :
++ else
++ func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
++ fi
+
+ # Check to see that this really is a libtool archive.
+ func_lalib_unsafe_p "$lib" \
+- || func_fatal_error "'$lib' is not a valid libtool archive"
++ || func_fatal_error "\`$lib' is not a valid libtool archive"
+
+ func_dirname "$lib" "" "."
+- ladir=$func_dirname_result
++ ladir="$func_dirname_result"
+
+ dlname=
+ dlopen=
+@@ -7870,30 +6427,30 @@
+ done
+ fi
+ dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+- if test lib,link = "$linkmode,$pass" ||
+- test prog,scan = "$linkmode,$pass" ||
+- { test prog != "$linkmode" && test lib != "$linkmode"; }; then
++ if test "$linkmode,$pass" = "lib,link" ||
++ test "$linkmode,$pass" = "prog,scan" ||
++ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ test -n "$dlopen" && func_append dlfiles " $dlopen"
+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+ fi
+
+- if test conv = "$pass"; then
++ if test "$pass" = conv; then
+ # Only check for convenience libraries
+ deplibs="$lib $deplibs"
+ if test -z "$libdir"; then
+ if test -z "$old_library"; then
+- func_fatal_error "cannot find name of link library for '$lib'"
++ func_fatal_error "cannot find name of link library for \`$lib'"
+ fi
+ # It is a libtool convenience library, so add in its objects.
+ func_append convenience " $ladir/$objdir/$old_library"
+ func_append old_convenience " $ladir/$objdir/$old_library"
+- elif test prog != "$linkmode" && test lib != "$linkmode"; then
+- func_fatal_error "'$lib' is not a convenience library"
++ elif test "$linkmode" != prog && test "$linkmode" != lib; then
++ func_fatal_error "\`$lib' is not a convenience library"
+ fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+- if $opt_preserve_dup_deps; then
++ if $opt_preserve_dup_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+@@ -7907,26 +6464,26 @@
+ # Get the name of the library we link against.
+ linklib=
+ if test -n "$old_library" &&
+- { test yes = "$prefer_static_libs" ||
+- test built,no = "$prefer_static_libs,$installed"; }; then
++ { test "$prefer_static_libs" = yes ||
++ test "$prefer_static_libs,$installed" = "built,no"; }; then
+ linklib=$old_library
+ else
+ for l in $old_library $library_names; do
+- linklib=$l
++ linklib="$l"
+ done
+ fi
+ if test -z "$linklib"; then
+- func_fatal_error "cannot find name of link library for '$lib'"
++ func_fatal_error "cannot find name of link library for \`$lib'"
+ fi
+
+ # This library was specified with -dlopen.
+- if test dlopen = "$pass"; then
+- test -z "$libdir" \
+- && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
++ if test "$pass" = dlopen; then
++ if test -z "$libdir"; then
++ func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
++ fi
+ if test -z "$dlname" ||
+- test yes != "$dlopen_support" ||
+- test no = "$build_libtool_libs"
+- then
++ test "$dlopen_support" != yes ||
++ test "$build_libtool_libs" = no; then
+ # If there is no dlname, no dlopen support or we're linking
+ # statically, we need to preload. We also need to preload any
+ # dependent libraries so libltdl's deplib preloader doesn't
+@@ -7940,40 +6497,40 @@
+
+ # We need an absolute path.
+ case $ladir in
+- [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
++ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ *)
+ abs_ladir=`cd "$ladir" && pwd`
+ if test -z "$abs_ladir"; then
+- func_warning "cannot determine absolute directory name of '$ladir'"
++ func_warning "cannot determine absolute directory name of \`$ladir'"
+ func_warning "passing it literally to the linker, although it might fail"
+- abs_ladir=$ladir
++ abs_ladir="$ladir"
+ fi
+ ;;
+ esac
+ func_basename "$lib"
+- laname=$func_basename_result
++ laname="$func_basename_result"
+
+ # Find the relevant object directory and library name.
+- if test yes = "$installed"; then
++ if test "X$installed" = Xyes; then
+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+- func_warning "library '$lib' was moved."
+- dir=$ladir
+- absdir=$abs_ladir
+- libdir=$abs_ladir
++ func_warning "library \`$lib' was moved."
++ dir="$ladir"
++ absdir="$abs_ladir"
++ libdir="$abs_ladir"
+ else
+- dir=$lt_sysroot$libdir
+- absdir=$lt_sysroot$libdir
++ dir="$lt_sysroot$libdir"
++ absdir="$lt_sysroot$libdir"
+ fi
+- test yes = "$hardcode_automatic" && avoidtemprpath=yes
++ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+- dir=$ladir
+- absdir=$abs_ladir
++ dir="$ladir"
++ absdir="$abs_ladir"
+ # Remove this search path later
+ func_append notinst_path " $abs_ladir"
+ else
+- dir=$ladir/$objdir
+- absdir=$abs_ladir/$objdir
++ dir="$ladir/$objdir"
++ absdir="$abs_ladir/$objdir"
+ # Remove this search path later
+ func_append notinst_path " $abs_ladir"
+ fi
+@@ -7982,11 +6539,11 @@
+ name=$func_stripname_result
+
+ # This library was specified with -dlpreopen.
+- if test dlpreopen = "$pass"; then
+- if test -z "$libdir" && test prog = "$linkmode"; then
+- func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
++ if test "$pass" = dlpreopen; then
++ if test -z "$libdir" && test "$linkmode" = prog; then
++ func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+ fi
+- case $host in
++ case "$host" in
+ # special handling for platforms with PE-DLLs.
+ *cygwin* | *mingw* | *cegcc* )
+ # Linker will automatically link against shared library if both
+@@ -8030,9 +6587,9 @@
+
+ if test -z "$libdir"; then
+ # Link the convenience library
+- if test lib = "$linkmode"; then
++ if test "$linkmode" = lib; then
+ deplibs="$dir/$old_library $deplibs"
+- elif test prog,link = "$linkmode,$pass"; then
++ elif test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$dir/$old_library $compile_deplibs"
+ finalize_deplibs="$dir/$old_library $finalize_deplibs"
+ else
+@@ -8042,14 +6599,14 @@
+ fi
+
+
+- if test prog = "$linkmode" && test link != "$pass"; then
++ if test "$linkmode" = prog && test "$pass" != link; then
+ func_append newlib_search_path " $ladir"
+ deplibs="$lib $deplibs"
+
+- linkalldeplibs=false
+- if test no != "$link_all_deplibs" || test -z "$library_names" ||
+- test no = "$build_libtool_libs"; then
+- linkalldeplibs=:
++ linkalldeplibs=no
++ if test "$link_all_deplibs" != no || test -z "$library_names" ||
++ test "$build_libtool_libs" = no; then
++ linkalldeplibs=yes
+ fi
+
+ tmp_libs=
+@@ -8061,14 +6618,14 @@
+ ;;
+ esac
+ # Need to link against all dependency_libs?
+- if $linkalldeplibs; then
++ if test "$linkalldeplibs" = yes; then
+ deplibs="$deplib $deplibs"
+ else
+ # Need to hardcode shared library paths
+ # or/and link against static libraries
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+- if $opt_preserve_dup_deps; then
++ if $opt_preserve_dup_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+@@ -8078,15 +6635,15 @@
+ continue
+ fi # $linkmode = prog...
+
+- if test prog,link = "$linkmode,$pass"; then
++ if test "$linkmode,$pass" = "prog,link"; then
+ if test -n "$library_names" &&
+- { { test no = "$prefer_static_libs" ||
+- test built,yes = "$prefer_static_libs,$installed"; } ||
++ { { test "$prefer_static_libs" = no ||
++ test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ test -z "$old_library"; }; then
+ # We need to hardcode the library path
+- if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
++ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ # Make sure the rpath contains only unique directories.
+- case $temp_rpath: in
++ case "$temp_rpath:" in
+ *"$absdir:"*) ;;
+ *) func_append temp_rpath "$absdir:" ;;
+ esac
+@@ -8115,9 +6672,9 @@
+ esac
+ fi # $linkmode,$pass = prog,link...
+
+- if $alldeplibs &&
+- { test pass_all = "$deplibs_check_method" ||
+- { test yes = "$build_libtool_libs" &&
++ if test "$alldeplibs" = yes &&
++ { test "$deplibs_check_method" = pass_all ||
++ { test "$build_libtool_libs" = yes &&
+ test -n "$library_names"; }; }; then
+ # We only need to search for static libraries
+ continue
+@@ -8126,19 +6683,19 @@
+
+ link_static=no # Whether the deplib will be linked statically
+ use_static_libs=$prefer_static_libs
+- if test built = "$use_static_libs" && test yes = "$installed"; then
++ if test "$use_static_libs" = built && test "$installed" = yes; then
+ use_static_libs=no
+ fi
+ if test -n "$library_names" &&
+- { test no = "$use_static_libs" || test -z "$old_library"; }; then
++ { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ case $host in
+- *cygwin* | *mingw* | *cegcc* | *os2*)
++ *cygwin* | *mingw* | *cegcc*)
+ # No point in relinking DLLs because paths are not encoded
+ func_append notinst_deplibs " $lib"
+ need_relink=no
+ ;;
+ *)
+- if test no = "$installed"; then
++ if test "$installed" = no; then
+ func_append notinst_deplibs " $lib"
+ need_relink=yes
+ fi
+@@ -8148,24 +6705,24 @@
+
+ # Warn about portability, can't link against -module's on some
+ # systems (darwin). Don't bleat about dlopened modules though!
+- dlopenmodule=
++ dlopenmodule=""
+ for dlpremoduletest in $dlprefiles; do
+ if test "X$dlpremoduletest" = "X$lib"; then
+- dlopenmodule=$dlpremoduletest
++ dlopenmodule="$dlpremoduletest"
+ break
+ fi
+ done
+- if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
++ if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+ echo
+- if test prog = "$linkmode"; then
++ if test "$linkmode" = prog; then
+ $ECHO "*** Warning: Linking the executable $output against the loadable module"
+ else
+ $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+ fi
+ $ECHO "*** $linklib is not portable!"
+ fi
+- if test lib = "$linkmode" &&
+- test yes = "$hardcode_into_libs"; then
++ if test "$linkmode" = lib &&
++ test "$hardcode_into_libs" = yes; then
+ # Hardcode the library path.
+ # Skip directories that are in the system default run-time
+ # search path.
+@@ -8193,43 +6750,43 @@
+ # figure out the soname
+ set dummy $library_names
+ shift
+- realname=$1
++ realname="$1"
+ shift
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ # use dlname if we got it. it's perfectly good, no?
+ if test -n "$dlname"; then
+- soname=$dlname
++ soname="$dlname"
+ elif test -n "$soname_spec"; then
+ # bleh windows
+ case $host in
+- *cygwin* | mingw* | *cegcc* | *os2*)
++ *cygwin* | mingw* | *cegcc*)
+ func_arith $current - $age
+ major=$func_arith_result
+- versuffix=-$major
++ versuffix="-$major"
+ ;;
+ esac
+ eval soname=\"$soname_spec\"
+ else
+- soname=$realname
++ soname="$realname"
+ fi
+
+ # Make a new name for the extract_expsyms_cmds to use
+- soroot=$soname
++ soroot="$soname"
+ func_basename "$soroot"
+- soname=$func_basename_result
++ soname="$func_basename_result"
+ func_stripname 'lib' '.dll' "$soname"
+ newlib=libimp-$func_stripname_result.a
+
+ # If the library has no export list, then create one now
+ if test -f "$output_objdir/$soname-def"; then :
+ else
+- func_verbose "extracting exported symbol list from '$soname'"
++ func_verbose "extracting exported symbol list from \`$soname'"
+ func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+ fi
+
+ # Create $newlib
+ if test -f "$output_objdir/$newlib"; then :; else
+- func_verbose "generating import library for '$soname'"
++ func_verbose "generating import library for \`$soname'"
+ func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+ fi
+ # make sure the library variables are pointing to the new library
+@@ -8237,58 +6794,58 @@
+ linklib=$newlib
+ fi # test -n "$old_archive_from_expsyms_cmds"
+
+- if test prog = "$linkmode" || test relink != "$opt_mode"; then
++ if test "$linkmode" = prog || test "$opt_mode" != relink; then
+ add_shlibpath=
+ add_dir=
+ add=
+ lib_linked=yes
+ case $hardcode_action in
+ immediate | unsupported)
+- if test no = "$hardcode_direct"; then
+- add=$dir/$linklib
++ if test "$hardcode_direct" = no; then
++ add="$dir/$linklib"
+ case $host in
+- *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+- *-*-sysv4*uw2*) add_dir=-L$dir ;;
++ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
++ *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+- *-*-unixware7*) add_dir=-L$dir ;;
++ *-*-unixware7*) add_dir="-L$dir" ;;
+ *-*-darwin* )
+- # if the lib is a (non-dlopened) module then we cannot
++ # if the lib is a (non-dlopened) module then we can not
+ # link against it, someone is ignoring the earlier warnings
+ if /usr/bin/file -L $add 2> /dev/null |
+- $GREP ": [^:]* bundle" >/dev/null; then
++ $GREP ": [^:]* bundle" >/dev/null ; then
+ if test "X$dlopenmodule" != "X$lib"; then
+ $ECHO "*** Warning: lib $linklib is a module, not a shared library"
+- if test -z "$old_library"; then
++ if test -z "$old_library" ; then
+ echo
+ echo "*** And there doesn't seem to be a static archive available"
+ echo "*** The link will probably fail, sorry"
+ else
+- add=$dir/$old_library
++ add="$dir/$old_library"
+ fi
+ elif test -n "$old_library"; then
+- add=$dir/$old_library
++ add="$dir/$old_library"
+ fi
+ fi
+ esac
+- elif test no = "$hardcode_minus_L"; then
++ elif test "$hardcode_minus_L" = no; then
+ case $host in
+- *-*-sunos*) add_shlibpath=$dir ;;
++ *-*-sunos*) add_shlibpath="$dir" ;;
+ esac
+- add_dir=-L$dir
+- add=-l$name
+- elif test no = "$hardcode_shlibpath_var"; then
+- add_shlibpath=$dir
+- add=-l$name
++ add_dir="-L$dir"
++ add="-l$name"
++ elif test "$hardcode_shlibpath_var" = no; then
++ add_shlibpath="$dir"
++ add="-l$name"
+ else
+ lib_linked=no
+ fi
+ ;;
+ relink)
+- if test yes = "$hardcode_direct" &&
+- test no = "$hardcode_direct_absolute"; then
+- add=$dir/$linklib
+- elif test yes = "$hardcode_minus_L"; then
+- add_dir=-L$absdir
++ if test "$hardcode_direct" = yes &&
++ test "$hardcode_direct_absolute" = no; then
++ add="$dir/$linklib"
++ elif test "$hardcode_minus_L" = yes; then
++ add_dir="-L$absdir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+ case $libdir in
+@@ -8297,10 +6854,10 @@
+ ;;
+ esac
+ fi
+- add=-l$name
+- elif test yes = "$hardcode_shlibpath_var"; then
+- add_shlibpath=$dir
+- add=-l$name
++ add="-l$name"
++ elif test "$hardcode_shlibpath_var" = yes; then
++ add_shlibpath="$dir"
++ add="-l$name"
+ else
+ lib_linked=no
+ fi
+@@ -8308,7 +6865,7 @@
+ *) lib_linked=no ;;
+ esac
+
+- if test yes != "$lib_linked"; then
++ if test "$lib_linked" != yes; then
+ func_fatal_configuration "unsupported hardcode properties"
+ fi
+
+@@ -8318,15 +6875,15 @@
+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
+ esac
+ fi
+- if test prog = "$linkmode"; then
++ if test "$linkmode" = prog; then
+ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+ test -n "$add" && compile_deplibs="$add $compile_deplibs"
+ else
+ test -n "$add_dir" && deplibs="$add_dir $deplibs"
+ test -n "$add" && deplibs="$add $deplibs"
+- if test yes != "$hardcode_direct" &&
+- test yes != "$hardcode_minus_L" &&
+- test yes = "$hardcode_shlibpath_var"; then
++ if test "$hardcode_direct" != yes &&
++ test "$hardcode_minus_L" != yes &&
++ test "$hardcode_shlibpath_var" = yes; then
+ case :$finalize_shlibpath: in
+ *":$libdir:"*) ;;
+ *) func_append finalize_shlibpath "$libdir:" ;;
+@@ -8335,33 +6892,33 @@
+ fi
+ fi
+
+- if test prog = "$linkmode" || test relink = "$opt_mode"; then
++ if test "$linkmode" = prog || test "$opt_mode" = relink; then
+ add_shlibpath=
+ add_dir=
+ add=
+ # Finalize command for both is simple: just hardcode it.
+- if test yes = "$hardcode_direct" &&
+- test no = "$hardcode_direct_absolute"; then
+- add=$libdir/$linklib
+- elif test yes = "$hardcode_minus_L"; then
+- add_dir=-L$libdir
+- add=-l$name
+- elif test yes = "$hardcode_shlibpath_var"; then
++ if test "$hardcode_direct" = yes &&
++ test "$hardcode_direct_absolute" = no; then
++ add="$libdir/$linklib"
++ elif test "$hardcode_minus_L" = yes; then
++ add_dir="-L$libdir"
++ add="-l$name"
++ elif test "$hardcode_shlibpath_var" = yes; then
+ case :$finalize_shlibpath: in
+ *":$libdir:"*) ;;
+ *) func_append finalize_shlibpath "$libdir:" ;;
+ esac
+- add=-l$name
+- elif test yes = "$hardcode_automatic"; then
++ add="-l$name"
++ elif test "$hardcode_automatic" = yes; then
+ if test -n "$inst_prefix_dir" &&
+- test -f "$inst_prefix_dir$libdir/$linklib"; then
+- add=$inst_prefix_dir$libdir/$linklib
++ test -f "$inst_prefix_dir$libdir/$linklib" ; then
++ add="$inst_prefix_dir$libdir/$linklib"
+ else
+- add=$libdir/$linklib
++ add="$libdir/$linklib"
+ fi
+ else
+ # We cannot seem to hardcode it, guess we'll fake it.
+- add_dir=-L$libdir
++ add_dir="-L$libdir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+ case $libdir in
+@@ -8370,10 +6927,10 @@
+ ;;
+ esac
+ fi
+- add=-l$name
++ add="-l$name"
+ fi
+
+- if test prog = "$linkmode"; then
++ if test "$linkmode" = prog; then
+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ else
+@@ -8381,43 +6938,43 @@
+ test -n "$add" && deplibs="$add $deplibs"
+ fi
+ fi
+- elif test prog = "$linkmode"; then
++ elif test "$linkmode" = prog; then
+ # Here we assume that one of hardcode_direct or hardcode_minus_L
+ # is not unsupported. This is valid on all known static and
+ # shared platforms.
+- if test unsupported != "$hardcode_direct"; then
+- test -n "$old_library" && linklib=$old_library
++ if test "$hardcode_direct" != unsupported; then
++ test -n "$old_library" && linklib="$old_library"
+ compile_deplibs="$dir/$linklib $compile_deplibs"
+ finalize_deplibs="$dir/$linklib $finalize_deplibs"
+ else
+ compile_deplibs="-l$name -L$dir $compile_deplibs"
+ finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+ fi
+- elif test yes = "$build_libtool_libs"; then
++ elif test "$build_libtool_libs" = yes; then
+ # Not a shared library
+- if test pass_all != "$deplibs_check_method"; then
++ if test "$deplibs_check_method" != pass_all; then
+ # We're trying link a shared library against a static one
+ # but the system doesn't support it.
+
+ # Just print a warning and add the library to dependency_libs so
+ # that the program can be linked against the static library.
+ echo
+- $ECHO "*** Warning: This system cannot link to static lib archive $lib."
++ $ECHO "*** Warning: This system can not link to static lib archive $lib."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have."
+- if test yes = "$module"; then
++ if test "$module" = yes; then
+ echo "*** But as you try to build a module library, libtool will still create "
+ echo "*** a static module, that should work as long as the dlopening application"
+ echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ if test -z "$global_symbol_pipe"; then
+ echo
+ echo "*** However, this would only work if libtool was able to extract symbol"
+- echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
++ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** not find such a program. So, this module is probably useless."
+- echo "*** 'nm' from GNU binutils and a full rebuild may help."
++ echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+- if test no = "$build_old_libs"; then
++ if test "$build_old_libs" = no; then
+ build_libtool_libs=module
+ build_old_libs=yes
+ else
+@@ -8430,11 +6987,11 @@
+ fi
+ fi # link shared/static library?
+
+- if test lib = "$linkmode"; then
++ if test "$linkmode" = lib; then
+ if test -n "$dependency_libs" &&
+- { test yes != "$hardcode_into_libs" ||
+- test yes = "$build_old_libs" ||
+- test yes = "$link_static"; }; then
++ { test "$hardcode_into_libs" != yes ||
++ test "$build_old_libs" = yes ||
++ test "$link_static" = yes; }; then
+ # Extract -R from dependency_libs
+ temp_deplibs=
+ for libdir in $dependency_libs; do
+@@ -8448,12 +7005,12 @@
+ *) func_append temp_deplibs " $libdir";;
+ esac
+ done
+- dependency_libs=$temp_deplibs
++ dependency_libs="$temp_deplibs"
+ fi
+
+ func_append newlib_search_path " $absdir"
+ # Link against this library
+- test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
++ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+ # ... and its dependency_libs
+ tmp_libs=
+ for deplib in $dependency_libs; do
+@@ -8463,7 +7020,7 @@
+ func_resolve_sysroot "$func_stripname_result";;
+ *) func_resolve_sysroot "$deplib" ;;
+ esac
+- if $opt_preserve_dup_deps; then
++ if $opt_preserve_dup_deps ; then
+ case "$tmp_libs " in
+ *" $func_resolve_sysroot_result "*)
+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+@@ -8472,12 +7029,12 @@
+ func_append tmp_libs " $func_resolve_sysroot_result"
+ done
+
+- if test no != "$link_all_deplibs"; then
++ if test "$link_all_deplibs" != no; then
+ # Add the search paths of all dependency libraries
+ for deplib in $dependency_libs; do
+ path=
+ case $deplib in
+- -L*) path=$deplib ;;
++ -L*) path="$deplib" ;;
+ *.la)
+ func_resolve_sysroot "$deplib"
+ deplib=$func_resolve_sysroot_result
+@@ -8485,12 +7042,12 @@
+ dir=$func_dirname_result
+ # We need an absolute path.
+ case $dir in
+- [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
++ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ *)
+ absdir=`cd "$dir" && pwd`
+ if test -z "$absdir"; then
+- func_warning "cannot determine absolute directory name of '$dir'"
+- absdir=$dir
++ func_warning "cannot determine absolute directory name of \`$dir'"
++ absdir="$dir"
+ fi
+ ;;
+ esac
+@@ -8498,35 +7055,35 @@
+ case $host in
+ *-*-darwin*)
+ depdepl=
+- eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+- if test -n "$deplibrary_names"; then
+- for tmp in $deplibrary_names; do
++ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++ if test -n "$deplibrary_names" ; then
++ for tmp in $deplibrary_names ; do
+ depdepl=$tmp
+ done
+- if test -f "$absdir/$objdir/$depdepl"; then
+- depdepl=$absdir/$objdir/$depdepl
+- darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
++ if test -f "$absdir/$objdir/$depdepl" ; then
++ depdepl="$absdir/$objdir/$depdepl"
++ darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ if test -z "$darwin_install_name"; then
+- darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
++ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ fi
+- func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+- func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
++ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
++ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+ path=
+ fi
+ fi
+ ;;
+ *)
+- path=-L$absdir/$objdir
++ path="-L$absdir/$objdir"
+ ;;
+ esac
+ else
+- eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ test -z "$libdir" && \
+- func_fatal_error "'$deplib' is not a valid libtool archive"
++ func_fatal_error "\`$deplib' is not a valid libtool archive"
+ test "$absdir" != "$libdir" && \
+- func_warning "'$deplib' seems to be moved"
++ func_warning "\`$deplib' seems to be moved"
+
+- path=-L$absdir
++ path="-L$absdir"
+ fi
+ ;;
+ esac
+@@ -8538,23 +7095,23 @@
+ fi # link_all_deplibs != no
+ fi # linkmode = lib
+ done # for deplib in $libs
+- if test link = "$pass"; then
+- if test prog = "$linkmode"; then
++ if test "$pass" = link; then
++ if test "$linkmode" = "prog"; then
+ compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+ finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+ else
+ compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ fi
+ fi
+- dependency_libs=$newdependency_libs
+- if test dlpreopen = "$pass"; then
++ dependency_libs="$newdependency_libs"
++ if test "$pass" = dlpreopen; then
+ # Link the dlpreopened libraries before other libraries
+ for deplib in $save_deplibs; do
+ deplibs="$deplib $deplibs"
+ done
+ fi
+- if test dlopen != "$pass"; then
+- test conv = "$pass" || {
++ if test "$pass" != dlopen; then
++ if test "$pass" != conv; then
+ # Make sure lib_search_path contains only unique directories.
+ lib_search_path=
+ for dir in $newlib_search_path; do
+@@ -8564,12 +7121,12 @@
+ esac
+ done
+ newlib_search_path=
+- }
++ fi
+
+- if test prog,link = "$linkmode,$pass"; then
+- vars="compile_deplibs finalize_deplibs"
++ if test "$linkmode,$pass" != "prog,link"; then
++ vars="deplibs"
+ else
+- vars=deplibs
++ vars="compile_deplibs finalize_deplibs"
+ fi
+ for var in $vars dependency_libs; do
+ # Add libraries to $var in reverse order
+@@ -8627,93 +7184,62 @@
+ eval $var=\"$tmp_libs\"
+ done # for var
+ fi
+-
+- # Add Sun CC postdeps if required:
+- test CXX = "$tagname" && {
+- case $host_os in
+- linux*)
+- case `$CC -V 2>&1 | sed 5q` in
+- *Sun\ C*) # Sun C++ 5.9
+- func_suncc_cstd_abi
+-
+- if test no != "$suncc_use_cstd_abi"; then
+- func_append postdeps ' -library=Cstd -library=Crun'
+- fi
+- ;;
+- esac
+- ;;
+-
+- solaris*)
+- func_cc_basename "$CC"
+- case $func_cc_basename_result in
+- CC* | sunCC*)
+- func_suncc_cstd_abi
+-
+- if test no != "$suncc_use_cstd_abi"; then
+- func_append postdeps ' -library=Cstd -library=Crun'
+- fi
+- ;;
+- esac
+- ;;
+- esac
+- }
+-
+ # Last step: remove runtime libs from dependency_libs
+ # (they stay in deplibs)
+ tmp_libs=
+- for i in $dependency_libs; do
++ for i in $dependency_libs ; do
+ case " $predeps $postdeps $compiler_lib_search_path " in
+ *" $i "*)
+- i=
++ i=""
+ ;;
+ esac
+- if test -n "$i"; then
++ if test -n "$i" ; then
+ func_append tmp_libs " $i"
+ fi
+ done
+ dependency_libs=$tmp_libs
+ done # for pass
+- if test prog = "$linkmode"; then
+- dlfiles=$newdlfiles
++ if test "$linkmode" = prog; then
++ dlfiles="$newdlfiles"
+ fi
+- if test prog = "$linkmode" || test lib = "$linkmode"; then
+- dlprefiles=$newdlprefiles
++ if test "$linkmode" = prog || test "$linkmode" = lib; then
++ dlprefiles="$newdlprefiles"
+ fi
+
+ case $linkmode in
+ oldlib)
+- if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+- func_warning "'-dlopen' is ignored for archives"
++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++ func_warning "\`-dlopen' is ignored for archives"
+ fi
+
+ case " $deplibs" in
+ *\ -l* | *\ -L*)
+- func_warning "'-l' and '-L' are ignored for archives" ;;
++ func_warning "\`-l' and \`-L' are ignored for archives" ;;
+ esac
+
+ test -n "$rpath" && \
+- func_warning "'-rpath' is ignored for archives"
++ func_warning "\`-rpath' is ignored for archives"
+
+ test -n "$xrpath" && \
+- func_warning "'-R' is ignored for archives"
++ func_warning "\`-R' is ignored for archives"
+
+ test -n "$vinfo" && \
+- func_warning "'-version-info/-version-number' is ignored for archives"
++ func_warning "\`-version-info/-version-number' is ignored for archives"
+
+ test -n "$release" && \
+- func_warning "'-release' is ignored for archives"
++ func_warning "\`-release' is ignored for archives"
+
+ test -n "$export_symbols$export_symbols_regex" && \
+- func_warning "'-export-symbols' is ignored for archives"
++ func_warning "\`-export-symbols' is ignored for archives"
+
+ # Now set the variables for building old libraries.
+ build_libtool_libs=no
+- oldlibs=$output
++ oldlibs="$output"
+ func_append objs "$old_deplibs"
+ ;;
+
+ lib)
+- # Make sure we only generate libraries of the form 'libNAME.la'.
++ # Make sure we only generate libraries of the form `libNAME.la'.
+ case $outputname in
+ lib*)
+ func_stripname 'lib' '.la' "$outputname"
+@@ -8722,10 +7248,10 @@
+ eval libname=\"$libname_spec\"
+ ;;
+ *)
+- test no = "$module" \
+- && func_fatal_help "libtool library '$output' must begin with 'lib'"
++ test "$module" = no && \
++ func_fatal_help "libtool library \`$output' must begin with \`lib'"
+
+- if test no != "$need_lib_prefix"; then
++ if test "$need_lib_prefix" != no; then
+ # Add the "lib" prefix for modules if required
+ func_stripname '' '.la' "$outputname"
+ name=$func_stripname_result
+@@ -8739,8 +7265,8 @@
+ esac
+
+ if test -n "$objs"; then
+- if test pass_all != "$deplibs_check_method"; then
+- func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
++ if test "$deplibs_check_method" != pass_all; then
++ func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+ else
+ echo
+ $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+@@ -8749,21 +7275,21 @@
+ fi
+ fi
+
+- test no = "$dlself" \
+- || func_warning "'-dlopen self' is ignored for libtool libraries"
++ test "$dlself" != no && \
++ func_warning "\`-dlopen self' is ignored for libtool libraries"
+
+ set dummy $rpath
+ shift
+- test 1 -lt "$#" \
+- && func_warning "ignoring multiple '-rpath's for a libtool library"
++ test "$#" -gt 1 && \
++ func_warning "ignoring multiple \`-rpath's for a libtool library"
+
+- install_libdir=$1
++ install_libdir="$1"
+
+ oldlibs=
+ if test -z "$rpath"; then
+- if test yes = "$build_libtool_libs"; then
++ if test "$build_libtool_libs" = yes; then
+ # Building a libtool convenience library.
+- # Some compilers have problems with a '.al' extension so
++ # Some compilers have problems with a `.al' extension so
+ # convenience libraries should have the same extension an
+ # archive normally would.
+ oldlibs="$output_objdir/$libname.$libext $oldlibs"
+@@ -8772,20 +7298,20 @@
+ fi
+
+ test -n "$vinfo" && \
+- func_warning "'-version-info/-version-number' is ignored for convenience libraries"
++ func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+
+ test -n "$release" && \
+- func_warning "'-release' is ignored for convenience libraries"
++ func_warning "\`-release' is ignored for convenience libraries"
+ else
+
+ # Parse the version information argument.
+- save_ifs=$IFS; IFS=:
++ save_ifs="$IFS"; IFS=':'
+ set dummy $vinfo 0 0 0
+ shift
+- IFS=$save_ifs
++ IFS="$save_ifs"
+
+ test -n "$7" && \
+- func_fatal_help "too many parameters to '-version-info'"
++ func_fatal_help "too many parameters to \`-version-info'"
+
+ # convert absolute version numbers to libtool ages
+ # this retains compatibility with .la files and attempts
+@@ -8793,42 +7319,42 @@
+
+ case $vinfo_number in
+ yes)
+- number_major=$1
+- number_minor=$2
+- number_revision=$3
++ number_major="$1"
++ number_minor="$2"
++ number_revision="$3"
+ #
+ # There are really only two kinds -- those that
+ # use the current revision as the major version
+ # and those that subtract age and use age as
+ # a minor version. But, then there is irix
+- # that has an extra 1 added just for fun
++ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+ # correct linux to gnu/linux during the next big refactor
+- darwin|freebsd-elf|linux|osf|windows|none)
++ darwin|linux|osf|windows|none)
+ func_arith $number_major + $number_minor
+ current=$func_arith_result
+- age=$number_minor
+- revision=$number_revision
++ age="$number_minor"
++ revision="$number_revision"
+ ;;
+- freebsd-aout|qnx|sunos)
+- current=$number_major
+- revision=$number_minor
+- age=0
++ freebsd-aout|freebsd-elf|qnx|sunos)
++ current="$number_major"
++ revision="$number_minor"
++ age="0"
+ ;;
+ irix|nonstopux)
+ func_arith $number_major + $number_minor
+ current=$func_arith_result
+- age=$number_minor
+- revision=$number_minor
++ age="$number_minor"
++ revision="$number_minor"
+ lt_irix_increment=no
+ ;;
+ esac
+ ;;
+ no)
+- current=$1
+- revision=$2
+- age=$3
++ current="$1"
++ revision="$2"
++ age="$3"
+ ;;
+ esac
+
+@@ -8836,30 +7362,30 @@
+ case $current in
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- func_error "CURRENT '$current' must be a nonnegative integer"
+- func_fatal_error "'$vinfo' is not valid version information"
++ func_error "CURRENT \`$current' must be a nonnegative integer"
++ func_fatal_error "\`$vinfo' is not valid version information"
+ ;;
+ esac
+
+ case $revision in
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- func_error "REVISION '$revision' must be a nonnegative integer"
+- func_fatal_error "'$vinfo' is not valid version information"
++ func_error "REVISION \`$revision' must be a nonnegative integer"
++ func_fatal_error "\`$vinfo' is not valid version information"
+ ;;
+ esac
+
+ case $age in
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- func_error "AGE '$age' must be a nonnegative integer"
+- func_fatal_error "'$vinfo' is not valid version information"
++ func_error "AGE \`$age' must be a nonnegative integer"
++ func_fatal_error "\`$vinfo' is not valid version information"
+ ;;
+ esac
+
+ if test "$age" -gt "$current"; then
+- func_error "AGE '$age' is greater than the current interface number '$current'"
+- func_fatal_error "'$vinfo' is not valid version information"
++ func_error "AGE \`$age' is greater than the current interface number \`$current'"
++ func_fatal_error "\`$vinfo' is not valid version information"
+ fi
+
+ # Calculate the version variables.
+@@ -8874,36 +7400,26 @@
+ # verstring for coding it into the library header
+ func_arith $current - $age
+ major=.$func_arith_result
+- versuffix=$major.$age.$revision
++ versuffix="$major.$age.$revision"
+ # Darwin ld doesn't like 0 for these options...
+ func_arith $current + 1
+ minor_current=$func_arith_result
+- xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
++ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+- # On Darwin other compilers
+- case $CC in
+- nagfor*)
+- verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+- ;;
+- *)
+- verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+- ;;
+- esac
+ ;;
+
+ freebsd-aout)
+- major=.$current
+- versuffix=.$current.$revision
++ major=".$current"
++ versuffix=".$current.$revision";
+ ;;
+
+ freebsd-elf)
+- func_arith $current - $age
+- major=.$func_arith_result
+- versuffix=$major.$age.$revision
++ major=".$current"
++ versuffix=".$current"
+ ;;
+
+ irix | nonstopux)
+- if test no = "$lt_irix_increment"; then
++ if test "X$lt_irix_increment" = "Xno"; then
+ func_arith $current - $age
+ else
+ func_arith $current - $age + 1
+@@ -8914,74 +7430,69 @@
+ nonstopux) verstring_prefix=nonstopux ;;
+ *) verstring_prefix=sgi ;;
+ esac
+- verstring=$verstring_prefix$major.$revision
++ verstring="$verstring_prefix$major.$revision"
+
+ # Add in all the interfaces that we are compatible with.
+ loop=$revision
+- while test 0 -ne "$loop"; do
++ while test "$loop" -ne 0; do
+ func_arith $revision - $loop
+ iface=$func_arith_result
+ func_arith $loop - 1
+ loop=$func_arith_result
+- verstring=$verstring_prefix$major.$iface:$verstring
++ verstring="$verstring_prefix$major.$iface:$verstring"
+ done
+
+- # Before this point, $major must not contain '.'.
++ # Before this point, $major must not contain `.'.
+ major=.$major
+- versuffix=$major.$revision
++ versuffix="$major.$revision"
+ ;;
+
+ linux) # correct to gnu/linux during the next big refactor
+ func_arith $current - $age
+ major=.$func_arith_result
+- versuffix=$major.$age.$revision
++ versuffix="$major.$age.$revision"
+ ;;
+
+ osf)
+ func_arith $current - $age
+ major=.$func_arith_result
+- versuffix=.$current.$age.$revision
+- verstring=$current.$age.$revision
++ versuffix=".$current.$age.$revision"
++ verstring="$current.$age.$revision"
+
+ # Add in all the interfaces that we are compatible with.
+ loop=$age
+- while test 0 -ne "$loop"; do
++ while test "$loop" -ne 0; do
+ func_arith $current - $loop
+ iface=$func_arith_result
+ func_arith $loop - 1
+ loop=$func_arith_result
+- verstring=$verstring:$iface.0
++ verstring="$verstring:${iface}.0"
+ done
+
+ # Make executables depend on our current version.
+- func_append verstring ":$current.0"
++ func_append verstring ":${current}.0"
+ ;;
+
+ qnx)
+- major=.$current
+- versuffix=.$current
+- ;;
+-
+- sco)
+- major=.$current
+- versuffix=.$current
++ major=".$current"
++ versuffix=".$current"
+ ;;
+
+ sunos)
+- major=.$current
+- versuffix=.$current.$revision
++ major=".$current"
++ versuffix=".$current.$revision"
+ ;;
+
+ windows)
+ # Use '-' rather than '.', since we only want one
+- # extension on DOS 8.3 file systems.
++ # extension on DOS 8.3 filesystems.
+ func_arith $current - $age
+ major=$func_arith_result
+- versuffix=-$major
++ versuffix="-$major"
+ ;;
+
+ *)
+- func_fatal_configuration "unknown library version type '$version_type'"
++ func_fatal_configuration "unknown library version type \`$version_type'"
+ ;;
+ esac
+
+@@ -8995,45 +7506,42 @@
+ verstring=
+ ;;
+ *)
+- verstring=0.0
++ verstring="0.0"
+ ;;
+ esac
+- if test no = "$need_version"; then
++ if test "$need_version" = no; then
+ versuffix=
+ else
+- versuffix=.0.0
++ versuffix=".0.0"
+ fi
+ fi
+
+ # Remove version info from name if versioning should be avoided
+- if test yes,no = "$avoid_version,$need_version"; then
++ if test "$avoid_version" = yes && test "$need_version" = no; then
+ major=
+ versuffix=
+- verstring=
++ verstring=""
+ fi
+
+ # Check to see if the archive will have undefined symbols.
+- if test yes = "$allow_undefined"; then
+- if test unsupported = "$allow_undefined_flag"; then
+- if test yes = "$build_old_libs"; then
+- func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+- build_libtool_libs=no
+- else
+- func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+- fi
++ if test "$allow_undefined" = yes; then
++ if test "$allow_undefined_flag" = unsupported; then
++ func_warning "undefined symbols not allowed in $host shared libraries"
++ build_libtool_libs=no
++ build_old_libs=yes
+ fi
+ else
+ # Don't allow undefined symbols.
+- allow_undefined_flag=$no_undefined_flag
++ allow_undefined_flag="$no_undefined_flag"
+ fi
+
+ fi
+
+- func_generate_dlsyms "$libname" "$libname" :
++ func_generate_dlsyms "$libname" "$libname" "yes"
+ func_append libobjs " $symfileobj"
+- test " " = "$libobjs" && libobjs=
++ test "X$libobjs" = "X " && libobjs=
+
+- if test relink != "$opt_mode"; then
++ if test "$opt_mode" != relink; then
+ # Remove our outputs, but don't remove object files since they
+ # may have been created when compiling PIC objects.
+ removelist=
+@@ -9042,8 +7550,8 @@
+ case $p in
+ *.$objext | *.gcno)
+ ;;
+- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+- if test -n "$precious_files_regex"; then
++ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
++ if test "X$precious_files_regex" != "X"; then
+ if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+ then
+ continue
+@@ -9059,11 +7567,11 @@
+ fi
+
+ # Now set the variables for building old libraries.
+- if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
++ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+ func_append oldlibs " $output_objdir/$libname.$libext"
+
+ # Transform .lo files to .o files.
+- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
++ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+ fi
+
+ # Eliminate all temporary directories.
+@@ -9084,13 +7592,13 @@
+ *) func_append finalize_rpath " $libdir" ;;
+ esac
+ done
+- if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
++ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ dependency_libs="$temp_xrpath $dependency_libs"
+ fi
+ fi
+
+ # Make sure dlfiles contains only unique files that won't be dlpreopened
+- old_dlfiles=$dlfiles
++ old_dlfiles="$dlfiles"
+ dlfiles=
+ for lib in $old_dlfiles; do
+ case " $dlprefiles $dlfiles " in
+@@ -9100,7 +7608,7 @@
+ done
+
+ # Make sure dlprefiles contains only unique files
+- old_dlprefiles=$dlprefiles
++ old_dlprefiles="$dlprefiles"
+ dlprefiles=
+ for lib in $old_dlprefiles; do
+ case "$dlprefiles " in
+@@ -9109,7 +7617,7 @@
+ esac
+ done
+
+- if test yes = "$build_libtool_libs"; then
++ if test "$build_libtool_libs" = yes; then
+ if test -n "$rpath"; then
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+@@ -9133,7 +7641,7 @@
+ ;;
+ *)
+ # Add libc to deplibs on all other systems if necessary.
+- if test yes = "$build_libtool_need_lc"; then
++ if test "$build_libtool_need_lc" = "yes"; then
+ func_append deplibs " -lc"
+ fi
+ ;;
+@@ -9149,9 +7657,9 @@
+ # I'm not sure if I'm treating the release correctly. I think
+ # release should show up in the -l (ie -lgmp5) so we don't want to
+ # add it in twice. Is that correct?
+- release=
+- versuffix=
+- major=
++ release=""
++ versuffix=""
++ major=""
+ newdeplibs=
+ droppeddeps=no
+ case $deplibs_check_method in
+@@ -9180,20 +7688,20 @@
+ -l*)
+ func_stripname -l '' "$i"
+ name=$func_stripname_result
+- if test yes = "$allow_libtool_libs_with_static_runtimes"; then
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+ func_append newdeplibs " $i"
+- i=
++ i=""
+ ;;
+ esac
+ fi
+- if test -n "$i"; then
++ if test -n "$i" ; then
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+ set dummy $deplib_matches; shift
+ deplib_match=$1
+- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
++ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ func_append newdeplibs " $i"
+ else
+ droppeddeps=yes
+@@ -9223,20 +7731,20 @@
+ $opt_dry_run || $RM conftest
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+ ldd_output=`ldd conftest`
+- if test yes = "$allow_libtool_libs_with_static_runtimes"; then
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+ func_append newdeplibs " $i"
+- i=
++ i=""
+ ;;
+ esac
+ fi
+- if test -n "$i"; then
++ if test -n "$i" ; then
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+ set dummy $deplib_matches; shift
+ deplib_match=$1
+- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
++ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ func_append newdeplibs " $i"
+ else
+ droppeddeps=yes
+@@ -9273,24 +7781,24 @@
+ -l*)
+ func_stripname -l '' "$a_deplib"
+ name=$func_stripname_result
+- if test yes = "$allow_libtool_libs_with_static_runtimes"; then
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $a_deplib "*)
+ func_append newdeplibs " $a_deplib"
+- a_deplib=
++ a_deplib=""
+ ;;
+ esac
+ fi
+- if test -n "$a_deplib"; then
++ if test -n "$a_deplib" ; then
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ if test -n "$file_magic_glob"; then
+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+ else
+ libnameglob=$libname
+ fi
+- test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
++ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+- if test yes = "$want_nocaseglob"; then
++ if test "$want_nocaseglob" = yes; then
+ shopt -s nocaseglob
+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+ $nocaseglob
+@@ -9308,25 +7816,25 @@
+ # We might still enter an endless loop, since a link
+ # loop can be closed while we follow links,
+ # but so what?
+- potlib=$potent_lib
++ potlib="$potent_lib"
+ while test -h "$potlib" 2>/dev/null; do
+- potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
++ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ case $potliblink in
+- [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+- *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
++ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
++ *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+ esac
+ done
+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+ $SED -e 10q |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ func_append newdeplibs " $a_deplib"
+- a_deplib=
++ a_deplib=""
+ break 2
+ fi
+ done
+ done
+ fi
+- if test -n "$a_deplib"; then
++ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+ echo
+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+@@ -9334,7 +7842,7 @@
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because I did check the linker path looking for a file starting"
+- if test -z "$potlib"; then
++ if test -z "$potlib" ; then
+ $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+ else
+ $ECHO "*** with $libname and none of the candidates passed a file format test"
+@@ -9357,30 +7865,30 @@
+ -l*)
+ func_stripname -l '' "$a_deplib"
+ name=$func_stripname_result
+- if test yes = "$allow_libtool_libs_with_static_runtimes"; then
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $a_deplib "*)
+ func_append newdeplibs " $a_deplib"
+- a_deplib=
++ a_deplib=""
+ ;;
+ esac
+ fi
+- if test -n "$a_deplib"; then
++ if test -n "$a_deplib" ; then
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ for potent_lib in $potential_libs; do
+- potlib=$potent_lib # see symlink-check above in file_magic test
++ potlib="$potent_lib" # see symlink-check above in file_magic test
+ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+ $EGREP "$match_pattern_regex" > /dev/null; then
+ func_append newdeplibs " $a_deplib"
+- a_deplib=
++ a_deplib=""
+ break 2
+ fi
+ done
+ done
+ fi
+- if test -n "$a_deplib"; then
++ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+ echo
+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+@@ -9388,7 +7896,7 @@
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because I did check the linker path looking for a file starting"
+- if test -z "$potlib"; then
++ if test -z "$potlib" ; then
+ $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+ else
+ $ECHO "*** with $libname and none of the candidates passed a file format test"
+@@ -9404,18 +7912,18 @@
+ done # Gone through all deplibs.
+ ;;
+ none | unknown | *)
+- newdeplibs=
++ newdeplibs=""
+ tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+- if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+- for i in $predeps $postdeps; do
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++ for i in $predeps $postdeps ; do
+ # can't use Xsed below, because $i might contain '/'
+- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
++ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+ done
+ fi
+ case $tmp_deplibs in
+ *[!\ \ ]*)
+ echo
+- if test none = "$deplibs_check_method"; then
++ if test "X$deplibs_check_method" = "Xnone"; then
+ echo "*** Warning: inter-library dependencies are not supported in this platform."
+ else
+ echo "*** Warning: inter-library dependencies are not known to be supported."
+@@ -9439,8 +7947,8 @@
+ ;;
+ esac
+
+- if test yes = "$droppeddeps"; then
+- if test yes = "$module"; then
++ if test "$droppeddeps" = yes; then
++ if test "$module" = yes; then
+ echo
+ echo "*** Warning: libtool could not satisfy all declared inter-library"
+ $ECHO "*** dependencies of module $libname. Therefore, libtool will create"
+@@ -9449,12 +7957,12 @@
+ if test -z "$global_symbol_pipe"; then
+ echo
+ echo "*** However, this would only work if libtool was able to extract symbol"
+- echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
++ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** not find such a program. So, this module is probably useless."
+- echo "*** 'nm' from GNU binutils and a full rebuild may help."
++ echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+- if test no = "$build_old_libs"; then
+- oldlibs=$output_objdir/$libname.$libext
++ if test "$build_old_libs" = no; then
++ oldlibs="$output_objdir/$libname.$libext"
+ build_libtool_libs=module
+ build_old_libs=yes
+ else
+@@ -9465,14 +7973,14 @@
+ echo "*** automatically added whenever a program is linked with this library"
+ echo "*** or is declared to -dlopen it."
+
+- if test no = "$allow_undefined"; then
++ if test "$allow_undefined" = no; then
+ echo
+ echo "*** Since this library must not contain undefined symbols,"
+ echo "*** because either the platform does not support them or"
+ echo "*** it was explicitly requested with -no-undefined,"
+ echo "*** libtool will only create a static version of it."
+- if test no = "$build_old_libs"; then
+- oldlibs=$output_objdir/$libname.$libext
++ if test "$build_old_libs" = no; then
++ oldlibs="$output_objdir/$libname.$libext"
+ build_libtool_libs=module
+ build_old_libs=yes
+ else
+@@ -9518,7 +8026,7 @@
+ *) func_append new_libs " $deplib" ;;
+ esac
+ done
+- deplibs=$new_libs
++ deplibs="$new_libs"
+
+ # All the library-specific variables (install_libdir is set above).
+ library_names=
+@@ -9526,25 +8034,25 @@
+ dlname=
+
+ # Test again, we may have decided not to build it any more
+- if test yes = "$build_libtool_libs"; then
+- # Remove $wl instances when linking with ld.
++ if test "$build_libtool_libs" = yes; then
++ # Remove ${wl} instances when linking with ld.
+ # FIXME: should test the right _cmds variable.
+ case $archive_cmds in
+ *\$LD\ *) wl= ;;
+ esac
+- if test yes = "$hardcode_into_libs"; then
++ if test "$hardcode_into_libs" = yes; then
+ # Hardcode the library paths
+ hardcode_libdirs=
+ dep_rpath=
+- rpath=$finalize_rpath
+- test relink = "$opt_mode" || rpath=$compile_rpath$rpath
++ rpath="$finalize_rpath"
++ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+ for libdir in $rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ func_replace_sysroot "$libdir"
+ libdir=$func_replace_sysroot_result
+ if test -z "$hardcode_libdirs"; then
+- hardcode_libdirs=$libdir
++ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+@@ -9569,7 +8077,7 @@
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+- libdir=$hardcode_libdirs
++ libdir="$hardcode_libdirs"
+ eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+ fi
+ if test -n "$runpath_var" && test -n "$perm_rpath"; then
+@@ -9583,8 +8091,8 @@
+ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+ fi
+
+- shlibpath=$finalize_shlibpath
+- test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
++ shlibpath="$finalize_shlibpath"
++ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ if test -n "$shlibpath"; then
+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+ fi
+@@ -9594,19 +8102,19 @@
+ eval library_names=\"$library_names_spec\"
+ set dummy $library_names
+ shift
+- realname=$1
++ realname="$1"
+ shift
+
+ if test -n "$soname_spec"; then
+ eval soname=\"$soname_spec\"
+ else
+- soname=$realname
++ soname="$realname"
+ fi
+ if test -z "$dlname"; then
+ dlname=$soname
+ fi
+
+- lib=$output_objdir/$realname
++ lib="$output_objdir/$realname"
+ linknames=
+ for link
+ do
+@@ -9620,7 +8128,7 @@
+ delfiles=
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+- export_symbols=$output_objdir/$libname.uexp
++ export_symbols="$output_objdir/$libname.uexp"
+ func_append delfiles " $export_symbols"
+ fi
+
+@@ -9629,31 +8137,31 @@
+ cygwin* | mingw* | cegcc*)
+ if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+ # exporting using user supplied symfile
+- func_dll_def_p "$export_symbols" || {
++ if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+ # and it's NOT already a .def file. Must figure out
+ # which of the given symbols are data symbols and tag
+ # them as such. So, trigger use of export_symbols_cmds.
+ # export_symbols gets reassigned inside the "prepare
+ # the list of exported symbols" if statement, so the
+ # include_expsyms logic still works.
+- orig_export_symbols=$export_symbols
++ orig_export_symbols="$export_symbols"
+ export_symbols=
+ always_export_symbols=yes
+- }
++ fi
+ fi
+ ;;
+ esac
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+- if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+- func_verbose "generating symbol list for '$libname.la'"
+- export_symbols=$output_objdir/$libname.exp
++ if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
++ func_verbose "generating symbol list for \`$libname.la'"
++ export_symbols="$output_objdir/$libname.exp"
+ $opt_dry_run || $RM $export_symbols
+ cmds=$export_symbols_cmds
+- save_ifs=$IFS; IFS='~'
++ save_ifs="$IFS"; IFS='~'
+ for cmd1 in $cmds; do
+- IFS=$save_ifs
++ IFS="$save_ifs"
+ # Take the normal branch if the nm_file_list_spec branch
+ # doesn't work or if tool conversion is not needed.
+ case $nm_file_list_spec~$to_tool_file_cmd in
+@@ -9667,7 +8175,7 @@
+ try_normal_branch=no
+ ;;
+ esac
+- if test yes = "$try_normal_branch" \
++ if test "$try_normal_branch" = yes \
+ && { test "$len" -lt "$max_cmd_len" \
+ || test "$max_cmd_len" -le -1; }
+ then
+@@ -9678,7 +8186,7 @@
+ output_la=$func_basename_result
+ save_libobjs=$libobjs
+ save_output=$output
+- output=$output_objdir/$output_la.nm
++ output=${output_objdir}/${output_la}.nm
+ func_to_tool_file "$output"
+ libobjs=$nm_file_list_spec$func_to_tool_file_result
+ func_append delfiles " $output"
+@@ -9701,8 +8209,8 @@
+ break
+ fi
+ done
+- IFS=$save_ifs
+- if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
++ IFS="$save_ifs"
++ if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+ func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+ fi
+@@ -9710,16 +8218,16 @@
+ fi
+
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+- tmp_export_symbols=$export_symbols
+- test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
++ tmp_export_symbols="$export_symbols"
++ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+ fi
+
+- if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
++ if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+ # The given exports_symbols file has to be filtered, so filter it.
+- func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
++ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ # FIXME: $output_objdir/$libname.filter potentially contains lots of
+- # 's' commands, which not all seds can handle. GNU sed should be fine
++ # 's' commands which not all seds can handle. GNU sed should be fine
+ # though. Also, the filter scales superlinearly with the number of
+ # global variables. join(1) would be nice here, but unfortunately
+ # isn't a blessed tool.
+@@ -9738,11 +8246,11 @@
+ ;;
+ esac
+ done
+- deplibs=$tmp_deplibs
++ deplibs="$tmp_deplibs"
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec" &&
+- test yes = "$compiler_needs_object" &&
++ test "$compiler_needs_object" = yes &&
+ test -z "$libobjs"; then
+ # extract the archives, so we have objects to list.
+ # TODO: could optimize this to just extract one archive.
+@@ -9753,7 +8261,7 @@
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ test "X$libobjs" = "X " && libobjs=
+ else
+- gentop=$output_objdir/${outputname}x
++ gentop="$output_objdir/${outputname}x"
+ func_append generated " $gentop"
+
+ func_extract_archives $gentop $convenience
+@@ -9762,18 +8270,18 @@
+ fi
+ fi
+
+- if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
++ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ eval flag=\"$thread_safe_flag_spec\"
+ func_append linker_flags " $flag"
+ fi
+
+ # Make a backup of the uninstalled library when relinking
+- if test relink = "$opt_mode"; then
++ if test "$opt_mode" = relink; then
+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+ fi
+
+ # Do each of the archive commands.
+- if test yes = "$module" && test -n "$module_cmds"; then
++ if test "$module" = yes && test -n "$module_cmds" ; then
+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+ eval test_cmds=\"$module_expsym_cmds\"
+ cmds=$module_expsym_cmds
+@@ -9791,7 +8299,7 @@
+ fi
+ fi
+
+- if test : != "$skipped_export" &&
++ if test "X$skipped_export" != "X:" &&
+ func_len " $test_cmds" &&
+ len=$func_len_result &&
+ test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+@@ -9824,8 +8332,8 @@
+ last_robj=
+ k=1
+
+- if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+- output=$output_objdir/$output_la.lnkscript
++ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
++ output=${output_objdir}/${output_la}.lnkscript
+ func_verbose "creating GNU ld script: $output"
+ echo 'INPUT (' > $output
+ for obj in $save_libobjs
+@@ -9837,14 +8345,14 @@
+ func_append delfiles " $output"
+ func_to_tool_file "$output"
+ output=$func_to_tool_file_result
+- elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+- output=$output_objdir/$output_la.lnk
++ elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
++ output=${output_objdir}/${output_la}.lnk
+ func_verbose "creating linker input file list: $output"
+ : > $output
+ set x $save_libobjs
+ shift
+ firstobj=
+- if test yes = "$compiler_needs_object"; then
++ if test "$compiler_needs_object" = yes; then
+ firstobj="$1 "
+ shift
+ fi
+@@ -9859,7 +8367,7 @@
+ else
+ if test -n "$save_libobjs"; then
+ func_verbose "creating reloadable object files..."
+- output=$output_objdir/$output_la-$k.$objext
++ output=$output_objdir/$output_la-${k}.$objext
+ eval test_cmds=\"$reload_cmds\"
+ func_len " $test_cmds"
+ len0=$func_len_result
+@@ -9871,13 +8379,13 @@
+ func_len " $obj"
+ func_arith $len + $func_len_result
+ len=$func_arith_result
+- if test -z "$objlist" ||
++ if test "X$objlist" = X ||
+ test "$len" -lt "$max_cmd_len"; then
+ func_append objlist " $obj"
+ else
+ # The command $test_cmds is almost too long, add a
+ # command to the queue.
+- if test 1 -eq "$k"; then
++ if test "$k" -eq 1 ; then
+ # The first file doesn't have a previous command to add.
+ reload_objs=$objlist
+ eval concat_cmds=\"$reload_cmds\"
+@@ -9887,10 +8395,10 @@
+ reload_objs="$objlist $last_robj"
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+ fi
+- last_robj=$output_objdir/$output_la-$k.$objext
++ last_robj=$output_objdir/$output_la-${k}.$objext
+ func_arith $k + 1
+ k=$func_arith_result
+- output=$output_objdir/$output_la-$k.$objext
++ output=$output_objdir/$output_la-${k}.$objext
+ objlist=" $obj"
+ func_len " $last_robj"
+ func_arith $len0 + $func_len_result
+@@ -9902,9 +8410,9 @@
+ # files will link in the last one created.
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ reload_objs="$objlist $last_robj"
+- eval concat_cmds=\"\$concat_cmds$reload_cmds\"
++ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+ if test -n "$last_robj"; then
+- eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
++ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+ fi
+ func_append delfiles " $output"
+
+@@ -9912,9 +8420,9 @@
+ output=
+ fi
+
+- ${skipped_export-false} && {
+- func_verbose "generating symbol list for '$libname.la'"
+- export_symbols=$output_objdir/$libname.exp
++ if ${skipped_export-false}; then
++ func_verbose "generating symbol list for \`$libname.la'"
++ export_symbols="$output_objdir/$libname.exp"
+ $opt_dry_run || $RM $export_symbols
+ libobjs=$output
+ # Append the command to create the export file.
+@@ -9923,16 +8431,16 @@
+ if test -n "$last_robj"; then
+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+ fi
+- }
++ fi
+
+ test -n "$save_libobjs" &&
+ func_verbose "creating a temporary reloadable object file: $output"
+
+ # Loop through the commands generated above and execute them.
+- save_ifs=$IFS; IFS='~'
++ save_ifs="$IFS"; IFS='~'
+ for cmd in $concat_cmds; do
+- IFS=$save_ifs
+- $opt_quiet || {
++ IFS="$save_ifs"
++ $opt_silent || {
+ func_quote_for_expand "$cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+@@ -9940,7 +8448,7 @@
+ lt_exit=$?
+
+ # Restore the uninstalled library and exit
+- if test relink = "$opt_mode"; then
++ if test "$opt_mode" = relink; then
+ ( cd "$output_objdir" && \
+ $RM "${realname}T" && \
+ $MV "${realname}U" "$realname" )
+@@ -9949,7 +8457,7 @@
+ exit $lt_exit
+ }
+ done
+- IFS=$save_ifs
++ IFS="$save_ifs"
+
+ if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+@@ -9957,18 +8465,18 @@
+ fi
+ fi
+
+- ${skipped_export-false} && {
++ if ${skipped_export-false}; then
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+- tmp_export_symbols=$export_symbols
+- test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
++ tmp_export_symbols="$export_symbols"
++ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+ fi
+
+ if test -n "$orig_export_symbols"; then
+ # The given exports_symbols file has to be filtered, so filter it.
+- func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
++ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ # FIXME: $output_objdir/$libname.filter potentially contains lots of
+- # 's' commands, which not all seds can handle. GNU sed should be fine
++ # 's' commands which not all seds can handle. GNU sed should be fine
+ # though. Also, the filter scales superlinearly with the number of
+ # global variables. join(1) would be nice here, but unfortunately
+ # isn't a blessed tool.
+@@ -9977,7 +8485,7 @@
+ export_symbols=$output_objdir/$libname.def
+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+ fi
+- }
++ fi
+
+ libobjs=$output
+ # Restore the value of output.
+@@ -9991,7 +8499,7 @@
+ # value of $libobjs for piecewise linking.
+
+ # Do each of the archive commands.
+- if test yes = "$module" && test -n "$module_cmds"; then
++ if test "$module" = yes && test -n "$module_cmds" ; then
+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+ cmds=$module_expsym_cmds
+ else
+@@ -10013,7 +8521,7 @@
+
+ # Add any objects from preloaded convenience libraries
+ if test -n "$dlprefiles"; then
+- gentop=$output_objdir/${outputname}x
++ gentop="$output_objdir/${outputname}x"
+ func_append generated " $gentop"
+
+ func_extract_archives $gentop $dlprefiles
+@@ -10021,12 +8529,11 @@
+ test "X$libobjs" = "X " && libobjs=
+ fi
+
+- save_ifs=$IFS; IFS='~'
++ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+- IFS=$sp$nl
++ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+- IFS=$save_ifs
+- $opt_quiet || {
++ $opt_silent || {
+ func_quote_for_expand "$cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+@@ -10034,7 +8541,7 @@
+ lt_exit=$?
+
+ # Restore the uninstalled library and exit
+- if test relink = "$opt_mode"; then
++ if test "$opt_mode" = relink; then
+ ( cd "$output_objdir" && \
+ $RM "${realname}T" && \
+ $MV "${realname}U" "$realname" )
+@@ -10043,10 +8550,10 @@
+ exit $lt_exit
+ }
+ done
+- IFS=$save_ifs
++ IFS="$save_ifs"
+
+ # Restore the uninstalled library and exit
+- if test relink = "$opt_mode"; then
++ if test "$opt_mode" = relink; then
+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+ if test -n "$convenience"; then
+@@ -10066,39 +8573,39 @@
+ done
+
+ # If -module or -export-dynamic was specified, set the dlname.
+- if test yes = "$module" || test yes = "$export_dynamic"; then
++ if test "$module" = yes || test "$export_dynamic" = yes; then
+ # On all known operating systems, these are identical.
+- dlname=$soname
++ dlname="$soname"
+ fi
+ fi
+ ;;
+
+ obj)
+- if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+- func_warning "'-dlopen' is ignored for objects"
++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++ func_warning "\`-dlopen' is ignored for objects"
+ fi
+
+ case " $deplibs" in
+ *\ -l* | *\ -L*)
+- func_warning "'-l' and '-L' are ignored for objects" ;;
++ func_warning "\`-l' and \`-L' are ignored for objects" ;;
+ esac
+
+ test -n "$rpath" && \
+- func_warning "'-rpath' is ignored for objects"
++ func_warning "\`-rpath' is ignored for objects"
+
+ test -n "$xrpath" && \
+- func_warning "'-R' is ignored for objects"
++ func_warning "\`-R' is ignored for objects"
+
+ test -n "$vinfo" && \
+- func_warning "'-version-info' is ignored for objects"
++ func_warning "\`-version-info' is ignored for objects"
+
+ test -n "$release" && \
+- func_warning "'-release' is ignored for objects"
++ func_warning "\`-release' is ignored for objects"
+
+ case $output in
+ *.lo)
+ test -n "$objs$old_deplibs" && \
+- func_fatal_error "cannot build library object '$output' from non-libtool objects"
++ func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+
+ libobj=$output
+ func_lo2o "$libobj"
+@@ -10106,7 +8613,7 @@
+ ;;
+ *)
+ libobj=
+- obj=$output
++ obj="$output"
+ ;;
+ esac
+
+@@ -10119,19 +8626,17 @@
+ # the extraction.
+ reload_conv_objs=
+ gentop=
+- # if reload_cmds runs $LD directly, get rid of -Wl from
+- # whole_archive_flag_spec and hope we can get by with turning comma
+- # into space.
+- case $reload_cmds in
+- *\$LD[\ \$]*) wl= ;;
+- esac
++ # reload_cmds runs $LD directly, so let us get rid of
++ # -Wl from whole_archive_flag_spec and hope we can get by with
++ # turning comma into space..
++ wl=
++
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+- test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+- reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
++ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ else
+- gentop=$output_objdir/${obj}x
++ gentop="$output_objdir/${obj}x"
+ func_append generated " $gentop"
+
+ func_extract_archives $gentop $convenience
+@@ -10140,12 +8645,12 @@
+ fi
+
+ # If we're not building shared, we need to use non_pic_objs
+- test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
++ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
+ # Create the old-style object.
+- reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
++ reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+- output=$obj
++ output="$obj"
+ func_execute_cmds "$reload_cmds" 'exit $?'
+
+ # Exit if we aren't doing a library object file.
+@@ -10157,7 +8662,7 @@
+ exit $EXIT_SUCCESS
+ fi
+
+- test yes = "$build_libtool_libs" || {
++ if test "$build_libtool_libs" != yes; then
+ if test -n "$gentop"; then
+ func_show_eval '${RM}r "$gentop"'
+ fi
+@@ -10167,12 +8672,12 @@
+ # $show "echo timestamp > $libobj"
+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+ exit $EXIT_SUCCESS
+- }
++ fi
+
+- if test -n "$pic_flag" || test default != "$pic_mode"; then
++ if test -n "$pic_flag" || test "$pic_mode" != default; then
+ # Only do commands if we really have different PIC objects.
+ reload_objs="$libobjs $reload_conv_objs"
+- output=$libobj
++ output="$libobj"
+ func_execute_cmds "$reload_cmds" 'exit $?'
+ fi
+
+@@ -10189,14 +8694,16 @@
+ output=$func_stripname_result.exe;;
+ esac
+ test -n "$vinfo" && \
+- func_warning "'-version-info' is ignored for programs"
++ func_warning "\`-version-info' is ignored for programs"
+
+ test -n "$release" && \
+- func_warning "'-release' is ignored for programs"
++ func_warning "\`-release' is ignored for programs"
+
+- $preload \
+- && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+- && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
++ test "$preload" = yes \
++ && test "$dlopen_support" = unknown \
++ && test "$dlopen_self" = unknown \
++ && test "$dlopen_self_static" = unknown && \
++ func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+@@ -10210,11 +8717,11 @@
+ *-*-darwin*)
+ # Don't allow lazy linking, it breaks C++ global constructors
+ # But is supposedly fixed on 10.4 or later (yay!).
+- if test CXX = "$tagname"; then
++ if test "$tagname" = CXX ; then
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+ 10.[0123])
+- func_append compile_command " $wl-bind_at_load"
+- func_append finalize_command " $wl-bind_at_load"
++ func_append compile_command " ${wl}-bind_at_load"
++ func_append finalize_command " ${wl}-bind_at_load"
+ ;;
+ esac
+ fi
+@@ -10250,7 +8757,7 @@
+ *) func_append new_libs " $deplib" ;;
+ esac
+ done
+- compile_deplibs=$new_libs
++ compile_deplibs="$new_libs"
+
+
+ func_append compile_command " $compile_deplibs"
+@@ -10274,7 +8781,7 @@
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+- hardcode_libdirs=$libdir
++ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+@@ -10297,7 +8804,7 @@
+ fi
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+- testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
++ testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$libdir:"*) ;;
+ ::) dllsearchpath=$libdir;;
+@@ -10314,10 +8821,10 @@
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+- libdir=$hardcode_libdirs
++ libdir="$hardcode_libdirs"
+ eval rpath=\" $hardcode_libdir_flag_spec\"
+ fi
+- compile_rpath=$rpath
++ compile_rpath="$rpath"
+
+ rpath=
+ hardcode_libdirs=
+@@ -10325,7 +8832,7 @@
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+- hardcode_libdirs=$libdir
++ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+@@ -10350,43 +8857,45 @@
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+- libdir=$hardcode_libdirs
++ libdir="$hardcode_libdirs"
+ eval rpath=\" $hardcode_libdir_flag_spec\"
+ fi
+- finalize_rpath=$rpath
++ finalize_rpath="$rpath"
+
+- if test -n "$libobjs" && test yes = "$build_old_libs"; then
++ if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ # Transform all the library objects into standard objects.
+ compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ fi
+
+- func_generate_dlsyms "$outputname" "@PROGRAM@" false
++ func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+
+ # template prelinking step
+ if test -n "$prelink_cmds"; then
+ func_execute_cmds "$prelink_cmds" 'exit $?'
+ fi
+
+- wrappers_required=:
++ wrappers_required=yes
+ case $host in
+ *cegcc* | *mingw32ce*)
+ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+- wrappers_required=false
++ wrappers_required=no
+ ;;
+ *cygwin* | *mingw* )
+- test yes = "$build_libtool_libs" || wrappers_required=false
++ if test "$build_libtool_libs" != yes; then
++ wrappers_required=no
++ fi
+ ;;
+ *)
+- if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+- wrappers_required=false
++ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
++ wrappers_required=no
+ fi
+ ;;
+ esac
+- $wrappers_required || {
++ if test "$wrappers_required" = no; then
+ # Replace the output file specification.
+ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+- link_command=$compile_command$compile_rpath
++ link_command="$compile_command$compile_rpath"
+
+ # We have no uninstalled library dependencies, so finalize right now.
+ exit_status=0
+@@ -10399,12 +8908,12 @@
+ fi
+
+ # Delete the generated files.
+- if test -f "$output_objdir/${outputname}S.$objext"; then
+- func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
++ if test -f "$output_objdir/${outputname}S.${objext}"; then
++ func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+ fi
+
+ exit $exit_status
+- }
++ fi
+
+ if test -n "$compile_shlibpath$finalize_shlibpath"; then
+ compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+@@ -10434,9 +8943,9 @@
+ fi
+ fi
+
+- if test yes = "$no_install"; then
++ if test "$no_install" = yes; then
+ # We don't need to create a wrapper script.
+- link_command=$compile_var$compile_command$compile_rpath
++ link_command="$compile_var$compile_command$compile_rpath"
+ # Replace the output file specification.
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+ # Delete the old output file.
+@@ -10453,28 +8962,27 @@
+ exit $EXIT_SUCCESS
+ fi
+
+- case $hardcode_action,$fast_install in
+- relink,*)
+- # Fast installation is not supported
+- link_command=$compile_var$compile_command$compile_rpath
+- relink_command=$finalize_var$finalize_command$finalize_rpath
+-
+- func_warning "this platform does not like uninstalled shared libraries"
+- func_warning "'$output' will be relinked during installation"
+- ;;
+- *,yes)
+- link_command=$finalize_var$compile_command$finalize_rpath
+- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+- ;;
+- *,no)
+- link_command=$compile_var$compile_command$compile_rpath
+- relink_command=$finalize_var$finalize_command$finalize_rpath
+- ;;
+- *,needless)
+- link_command=$finalize_var$compile_command$finalize_rpath
+- relink_command=
+- ;;
+- esac
++ if test "$hardcode_action" = relink; then
++ # Fast installation is not supported
++ link_command="$compile_var$compile_command$compile_rpath"
++ relink_command="$finalize_var$finalize_command$finalize_rpath"
++
++ func_warning "this platform does not like uninstalled shared libraries"
++ func_warning "\`$output' will be relinked during installation"
++ else
++ if test "$fast_install" != no; then
++ link_command="$finalize_var$compile_command$finalize_rpath"
++ if test "$fast_install" = yes; then
++ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
++ else
++ # fast_install is set to needless
++ relink_command=
++ fi
++ else
++ link_command="$compile_var$compile_command$compile_rpath"
++ relink_command="$finalize_var$finalize_command$finalize_rpath"
++ fi
++ fi
+
+ # Replace the output file specification.
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+@@ -10531,8 +9039,8 @@
+ func_dirname_and_basename "$output" "" "."
+ output_name=$func_basename_result
+ output_path=$func_dirname_result
+- cwrappersource=$output_path/$objdir/lt-$output_name.c
+- cwrapper=$output_path/$output_name.exe
++ cwrappersource="$output_path/$objdir/lt-$output_name.c"
++ cwrapper="$output_path/$output_name.exe"
+ $RM $cwrappersource $cwrapper
+ trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+@@ -10553,7 +9061,7 @@
+ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+ $opt_dry_run || {
+ # note: this script will not be executed, so do not chmod.
+- if test "x$build" = "x$host"; then
++ if test "x$build" = "x$host" ; then
+ $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+ else
+ func_emit_wrapper no > $func_ltwrapper_scriptname_result
+@@ -10576,27 +9084,25 @@
+ # See if we need to build an old-fashioned archive.
+ for oldlib in $oldlibs; do
+
+- case $build_libtool_libs in
+- convenience)
+- oldobjs="$libobjs_save $symfileobj"
+- addlibs=$convenience
+- build_libtool_libs=no
+- ;;
+- module)
+- oldobjs=$libobjs_save
+- addlibs=$old_convenience
++ if test "$build_libtool_libs" = convenience; then
++ oldobjs="$libobjs_save $symfileobj"
++ addlibs="$convenience"
++ build_libtool_libs=no
++ else
++ if test "$build_libtool_libs" = module; then
++ oldobjs="$libobjs_save"
+ build_libtool_libs=no
+- ;;
+- *)
++ else
+ oldobjs="$old_deplibs $non_pic_objects"
+- $preload && test -f "$symfileobj" \
+- && func_append oldobjs " $symfileobj"
+- addlibs=$old_convenience
+- ;;
+- esac
++ if test "$preload" = yes && test -f "$symfileobj"; then
++ func_append oldobjs " $symfileobj"
++ fi
++ fi
++ addlibs="$old_convenience"
++ fi
+
+ if test -n "$addlibs"; then
+- gentop=$output_objdir/${outputname}x
++ gentop="$output_objdir/${outputname}x"
+ func_append generated " $gentop"
+
+ func_extract_archives $gentop $addlibs
+@@ -10604,13 +9110,13 @@
+ fi
+
+ # Do each command in the archive commands.
+- if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
++ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ cmds=$old_archive_from_new_cmds
+ else
+
+ # Add any objects from preloaded convenience libraries
+ if test -n "$dlprefiles"; then
+- gentop=$output_objdir/${outputname}x
++ gentop="$output_objdir/${outputname}x"
+ func_append generated " $gentop"
+
+ func_extract_archives $gentop $dlprefiles
+@@ -10631,7 +9137,7 @@
+ :
+ else
+ echo "copying selected object files to avoid basename conflicts..."
+- gentop=$output_objdir/${outputname}x
++ gentop="$output_objdir/${outputname}x"
+ func_append generated " $gentop"
+ func_mkdir_p "$gentop"
+ save_oldobjs=$oldobjs
+@@ -10640,7 +9146,7 @@
+ for obj in $save_oldobjs
+ do
+ func_basename "$obj"
+- objbase=$func_basename_result
++ objbase="$func_basename_result"
+ case " $oldobjs " in
+ " ") oldobjs=$obj ;;
+ *[\ /]"$objbase "*)
+@@ -10709,18 +9215,18 @@
+ else
+ # the above command should be used before it gets too long
+ oldobjs=$objlist
+- if test "$obj" = "$last_oldobj"; then
++ if test "$obj" = "$last_oldobj" ; then
+ RANLIB=$save_RANLIB
+ fi
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+- eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
++ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ objlist=
+ len=$len0
+ fi
+ done
+ RANLIB=$save_RANLIB
+ oldobjs=$objlist
+- if test -z "$oldobjs"; then
++ if test "X$oldobjs" = "X" ; then
+ eval cmds=\"\$concat_cmds\"
+ else
+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+@@ -10737,7 +9243,7 @@
+ case $output in
+ *.la)
+ old_library=
+- test yes = "$build_old_libs" && old_library=$libname.$libext
++ test "$build_old_libs" = yes && old_library="$libname.$libext"
+ func_verbose "creating $output"
+
+ # Preserve any variables that may affect compiler behavior
+@@ -10752,31 +9258,31 @@
+ fi
+ done
+ # Quote the link command for shipping.
+- relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
++ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+- if test yes = "$hardcode_automatic"; then
++ if test "$hardcode_automatic" = yes ; then
+ relink_command=
+ fi
+
+ # Only create the output if not a dry run.
+ $opt_dry_run || {
+ for installed in no yes; do
+- if test yes = "$installed"; then
++ if test "$installed" = yes; then
+ if test -z "$install_libdir"; then
+ break
+ fi
+- output=$output_objdir/${outputname}i
++ output="$output_objdir/$outputname"i
+ # Replace all uninstalled libtool libraries with the installed ones
+ newdependency_libs=
+ for deplib in $dependency_libs; do
+ case $deplib in
+ *.la)
+ func_basename "$deplib"
+- name=$func_basename_result
++ name="$func_basename_result"
+ func_resolve_sysroot "$deplib"
+- eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+ test -z "$libdir" && \
+- func_fatal_error "'$deplib' is not a valid libtool archive"
++ func_fatal_error "\`$deplib' is not a valid libtool archive"
+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+ ;;
+ -L*)
+@@ -10792,23 +9298,23 @@
+ *) func_append newdependency_libs " $deplib" ;;
+ esac
+ done
+- dependency_libs=$newdependency_libs
++ dependency_libs="$newdependency_libs"
+ newdlfiles=
+
+ for lib in $dlfiles; do
+ case $lib in
+ *.la)
+ func_basename "$lib"
+- name=$func_basename_result
+- eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++ name="$func_basename_result"
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ test -z "$libdir" && \
+- func_fatal_error "'$lib' is not a valid libtool archive"
++ func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+ ;;
+ *) func_append newdlfiles " $lib" ;;
+ esac
+ done
+- dlfiles=$newdlfiles
++ dlfiles="$newdlfiles"
+ newdlprefiles=
+ for lib in $dlprefiles; do
+ case $lib in
+@@ -10818,34 +9324,34 @@
+ # didn't already link the preopened objects directly into
+ # the library:
+ func_basename "$lib"
+- name=$func_basename_result
+- eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++ name="$func_basename_result"
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ test -z "$libdir" && \
+- func_fatal_error "'$lib' is not a valid libtool archive"
++ func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+ ;;
+ esac
+ done
+- dlprefiles=$newdlprefiles
++ dlprefiles="$newdlprefiles"
+ else
+ newdlfiles=
+ for lib in $dlfiles; do
+ case $lib in
+- [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ *) abs=`pwd`"/$lib" ;;
+ esac
+ func_append newdlfiles " $abs"
+ done
+- dlfiles=$newdlfiles
++ dlfiles="$newdlfiles"
+ newdlprefiles=
+ for lib in $dlprefiles; do
+ case $lib in
+- [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ *) abs=`pwd`"/$lib" ;;
+ esac
+ func_append newdlprefiles " $abs"
+ done
+- dlprefiles=$newdlprefiles
++ dlprefiles="$newdlprefiles"
+ fi
+ $RM $output
+ # place dlname in correct position for cygwin
+@@ -10861,9 +9367,10 @@
+ case $host,$output,$installed,$module,$dlname in
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+ # If a -bindir argument was supplied, place the dll there.
+- if test -n "$bindir"; then
++ if test "x$bindir" != x ;
++ then
+ func_relative_path "$install_libdir" "$bindir"
+- tdlname=$func_relative_path_result/$dlname
++ tdlname=$func_relative_path_result$dlname
+ else
+ # Otherwise fall back on heuristic.
+ tdlname=../bin/$dlname
+@@ -10872,7 +9379,7 @@
+ esac
+ $ECHO > $output "\
+ # $outputname - a libtool library file
+-# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ #
+ # Please DO NOT delete this file!
+ # It is necessary for linking the library.
+@@ -10886,7 +9393,7 @@
+ # The name of the static archive.
+ old_library='$old_library'
+
+-# Linker flags that cannot go in dependency_libs.
++# Linker flags that can not go in dependency_libs.
+ inherited_linker_flags='$new_inherited_linker_flags'
+
+ # Libraries that this one depends upon.
+@@ -10912,7 +9419,7 @@
+
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+- if test no,yes = "$installed,$need_relink"; then
++ if test "$installed" = no && test "$need_relink" = yes; then
+ $ECHO >> $output "\
+ relink_command=\"$relink_command\""
+ fi
+@@ -10927,29 +9434,27 @@
+ exit $EXIT_SUCCESS
+ }
+
+-if test link = "$opt_mode" || test relink = "$opt_mode"; then
+- func_mode_link ${1+"$@"}
+-fi
++{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
++ func_mode_link ${1+"$@"}
+
+
+ # func_mode_uninstall arg...
+ func_mode_uninstall ()
+ {
+- $debug_cmd
+-
+- RM=$nonopt
++ $opt_debug
++ RM="$nonopt"
+ files=
+- rmforce=false
++ rmforce=
+ exit_status=0
+
+ # This variable tells wrapper scripts just to set variables rather
+ # than running their programs.
+- libtool_install_magic=$magic
++ libtool_install_magic="$magic"
+
+ for arg
+ do
+ case $arg in
+- -f) func_append RM " $arg"; rmforce=: ;;
++ -f) func_append RM " $arg"; rmforce=yes ;;
+ -*) func_append RM " $arg" ;;
+ *) func_append files " $arg" ;;
+ esac
+@@ -10962,18 +9467,18 @@
+
+ for file in $files; do
+ func_dirname "$file" "" "."
+- dir=$func_dirname_result
+- if test . = "$dir"; then
+- odir=$objdir
++ dir="$func_dirname_result"
++ if test "X$dir" = X.; then
++ odir="$objdir"
+ else
+- odir=$dir/$objdir
++ odir="$dir/$objdir"
+ fi
+ func_basename "$file"
+- name=$func_basename_result
+- test uninstall = "$opt_mode" && odir=$dir
++ name="$func_basename_result"
++ test "$opt_mode" = uninstall && odir="$dir"
+
+ # Remember odir for removal later, being careful to avoid duplicates
+- if test clean = "$opt_mode"; then
++ if test "$opt_mode" = clean; then
+ case " $rmdirs " in
+ *" $odir "*) ;;
+ *) func_append rmdirs " $odir" ;;
+@@ -10988,11 +9493,11 @@
+ elif test -d "$file"; then
+ exit_status=1
+ continue
+- elif $rmforce; then
++ elif test "$rmforce" = yes; then
+ continue
+ fi
+
+- rmfiles=$file
++ rmfiles="$file"
+
+ case $name in
+ *.la)
+@@ -11006,7 +9511,7 @@
+ done
+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+
+- case $opt_mode in
++ case "$opt_mode" in
+ clean)
+ case " $library_names " in
+ *" $dlname "*) ;;
+@@ -11017,12 +9522,12 @@
+ uninstall)
+ if test -n "$library_names"; then
+ # Do each command in the postuninstall commands.
+- func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
++ func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ fi
+
+ if test -n "$old_library"; then
+ # Do each command in the old_postuninstall commands.
+- func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
++ func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ fi
+ # FIXME: should reinstall the best remaining shared library.
+ ;;
+@@ -11038,19 +9543,21 @@
+ func_source $dir/$name
+
+ # Add PIC object to the list of files to remove.
+- if test -n "$pic_object" && test none != "$pic_object"; then
++ if test -n "$pic_object" &&
++ test "$pic_object" != none; then
+ func_append rmfiles " $dir/$pic_object"
+ fi
+
+ # Add non-PIC object to the list of files to remove.
+- if test -n "$non_pic_object" && test none != "$non_pic_object"; then
++ if test -n "$non_pic_object" &&
++ test "$non_pic_object" != none; then
+ func_append rmfiles " $dir/$non_pic_object"
+ fi
+ fi
+ ;;
+
+ *)
+- if test clean = "$opt_mode"; then
++ if test "$opt_mode" = clean ; then
+ noexename=$name
+ case $file in
+ *.exe)
+@@ -11077,12 +9584,12 @@
+
+ # note $name still contains .exe if it was in $file originally
+ # as does the version of $file that was added into $rmfiles
+- func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+- if test yes = "$fast_install" && test -n "$relink_command"; then
++ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
++ if test "$fast_install" = yes && test -n "$relink_command"; then
+ func_append rmfiles " $odir/lt-$name"
+ fi
+- if test "X$noexename" != "X$name"; then
+- func_append rmfiles " $odir/lt-$noexename.c"
++ if test "X$noexename" != "X$name" ; then
++ func_append rmfiles " $odir/lt-${noexename}.c"
+ fi
+ fi
+ fi
+@@ -11091,7 +9598,7 @@
+ func_show_eval "$RM $rmfiles" 'exit_status=1'
+ done
+
+- # Try to remove the $objdir's in the directories where we deleted files
++ # Try to remove the ${objdir}s in the directories where we deleted files
+ for dir in $rmdirs; do
+ if test -d "$dir"; then
+ func_show_eval "rmdir $dir >/dev/null 2>&1"
+@@ -11101,17 +9608,16 @@
+ exit $exit_status
+ }
+
+-if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+- func_mode_uninstall ${1+"$@"}
+-fi
++{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
++ func_mode_uninstall ${1+"$@"}
+
+ test -z "$opt_mode" && {
+- help=$generic_help
++ help="$generic_help"
+ func_fatal_help "you must specify a MODE"
+ }
+
+ test -z "$exec_cmd" && \
+- func_fatal_help "invalid operation mode '$opt_mode'"
++ func_fatal_help "invalid operation mode \`$opt_mode'"
+
+ if test -n "$exec_cmd"; then
+ eval exec "$exec_cmd"
+@@ -11122,7 +9628,7 @@
+
+
+ # The TAGs below are defined such that we never get into a situation
+-# where we disable both kinds of libraries. Given conflicting
++# in which we disable both kinds of libraries. Given conflicting
+ # choices, we go for a static library, that is the most portable,
+ # since we can't tell whether shared libraries were disabled because
+ # the user asked for that or because the platform doesn't support
+@@ -11145,3 +9651,5 @@
+ # mode:shell-script
+ # sh-indentation:2
+ # End:
++# vi:sw=2
++
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/lt~obsolete.m4 psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/lt~obsolete.m4
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/lt~obsolete.m4 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/lt~obsolete.m4 2020-07-16 10:48:35.467673000 +0200
+@@ -1,7 +1,6 @@
+ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+ #
+-# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+-# Foundation, Inc.
++# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+ # Written by Scott James Remnant, 2004.
+ #
+ # This file is free software; the Free Software Foundation gives
+@@ -12,7 +11,7 @@
+
+ # These exist entirely to fool aclocal when bootstrapping libtool.
+ #
+-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
++# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+ # which have later been changed to m4_define as they aren't part of the
+ # exported API, or moved to Autoconf or Automake where they belong.
+ #
+@@ -26,7 +25,7 @@
+ # included after everything else. This provides aclocal with the
+ # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+ # because those macros already exist, or will be overwritten later.
+-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
++# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+ #
+ # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+ # Yes, that means every name once taken will need to remain here until
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/ltoptions.m4 psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/ltoptions.m4
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/ltoptions.m4 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/ltoptions.m4 2020-07-16 10:48:35.465838445 +0200
+@@ -1,14 +1,14 @@
+ # Helper functions for option handling. -*- Autoconf -*-
+ #
+-# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+-# Foundation, Inc.
++# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
+ # Written by Gary V. Vaughan, 2004
+ #
+ # 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.
+
+-# serial 8 ltoptions.m4
++# serial 7 ltoptions.m4
+
+ # This is to help aclocal find these macros, as it can't see m4_define.
+ AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+@@ -29,7 +29,7 @@
+ [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+ m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+ _LT_MANGLE_DEFUN([$1], [$2]),
+- [m4_warning([Unknown $1 option '$2'])])[]dnl
++ [m4_warning([Unknown $1 option `$2'])])[]dnl
+ ])
+
+
+@@ -75,15 +75,13 @@
+ dnl
+ dnl If no reference was made to various pairs of opposing options, then
+ dnl we run the default mode handler for the pair. For example, if neither
+- dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
++ dnl `shared' nor `disable-shared' was passed, we enable building of shared
+ dnl archives by default:
+ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+- [_LT_ENABLE_FAST_INSTALL])
+- _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+- [_LT_WITH_AIX_SONAME([aix])])
++ [_LT_ENABLE_FAST_INSTALL])
+ ])
+ ])# _LT_SET_OPTIONS
+
+@@ -114,7 +112,7 @@
+ [_LT_SET_OPTION([LT_INIT], [dlopen])
+ AC_DIAGNOSE([obsolete],
+ [$0: Remove this warning and the call to _LT_SET_OPTION when you
+-put the 'dlopen' option into LT_INIT's first parameter.])
++put the `dlopen' option into LT_INIT's first parameter.])
+ ])
+
+ dnl aclocal-1.4 backwards compatibility:
+@@ -150,7 +148,7 @@
+ _LT_SET_OPTION([LT_INIT], [win32-dll])
+ AC_DIAGNOSE([obsolete],
+ [$0: Remove this warning and the call to _LT_SET_OPTION when you
+-put the 'win32-dll' option into LT_INIT's first parameter.])
++put the `win32-dll' option into LT_INIT's first parameter.])
+ ])
+
+ dnl aclocal-1.4 backwards compatibility:
+@@ -159,9 +157,9 @@
+
+ # _LT_ENABLE_SHARED([DEFAULT])
+ # ----------------------------
+-# implement the --enable-shared flag, and supports the 'shared' and
+-# 'disable-shared' LT_INIT options.
+-# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
++# implement the --enable-shared flag, and supports the `shared' and
++# `disable-shared' LT_INIT options.
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+ m4_define([_LT_ENABLE_SHARED],
+ [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+ AC_ARG_ENABLE([shared],
+@@ -174,14 +172,14 @@
+ *)
+ enable_shared=no
+ # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_shared=yes
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ ;;
+ esac],
+ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+@@ -213,9 +211,9 @@
+
+ # _LT_ENABLE_STATIC([DEFAULT])
+ # ----------------------------
+-# implement the --enable-static flag, and support the 'static' and
+-# 'disable-static' LT_INIT options.
+-# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
++# implement the --enable-static flag, and support the `static' and
++# `disable-static' LT_INIT options.
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+ m4_define([_LT_ENABLE_STATIC],
+ [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+ AC_ARG_ENABLE([static],
+@@ -228,14 +226,14 @@
+ *)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ ;;
+ esac],
+ [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+@@ -267,9 +265,9 @@
+
+ # _LT_ENABLE_FAST_INSTALL([DEFAULT])
+ # ----------------------------------
+-# implement the --enable-fast-install flag, and support the 'fast-install'
+-# and 'disable-fast-install' LT_INIT options.
+-# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
++# implement the --enable-fast-install flag, and support the `fast-install'
++# and `disable-fast-install' LT_INIT options.
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+ m4_define([_LT_ENABLE_FAST_INSTALL],
+ [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+ AC_ARG_ENABLE([fast-install],
+@@ -282,14 +280,14 @@
+ *)
+ enable_fast_install=no
+ # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_fast_install=yes
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ ;;
+ esac],
+ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+@@ -306,14 +304,14 @@
+ [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+ AC_DIAGNOSE([obsolete],
+ [$0: Remove this warning and the call to _LT_SET_OPTION when you put
+-the 'fast-install' option into LT_INIT's first parameter.])
++the `fast-install' option into LT_INIT's first parameter.])
+ ])
+
+ AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+ [_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+ AC_DIAGNOSE([obsolete],
+ [$0: Remove this warning and the call to _LT_SET_OPTION when you put
+-the 'disable-fast-install' option into LT_INIT's first parameter.])
++the `disable-fast-install' option into LT_INIT's first parameter.])
+ ])
+
+ dnl aclocal-1.4 backwards compatibility:
+@@ -321,64 +319,11 @@
+ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+-# _LT_WITH_AIX_SONAME([DEFAULT])
+-# ----------------------------------
+-# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+-# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+-# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
+-m4_define([_LT_WITH_AIX_SONAME],
+-[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+-shared_archive_member_spec=
+-case $host,$enable_shared in
+-power*-*-aix[[5-9]]*,yes)
+- AC_MSG_CHECKING([which variant of shared library versioning to provide])
+- AC_ARG_WITH([aix-soname],
+- [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+- [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+- [case $withval in
+- aix|svr4|both)
+- ;;
+- *)
+- AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+- ;;
+- esac
+- lt_cv_with_aix_soname=$with_aix_soname],
+- [AC_CACHE_VAL([lt_cv_with_aix_soname],
+- [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+- with_aix_soname=$lt_cv_with_aix_soname])
+- AC_MSG_RESULT([$with_aix_soname])
+- if test aix != "$with_aix_soname"; then
+- # For the AIX way of multilib, we name the shared archive member
+- # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+- # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+- # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+- # the AIX toolchain works better with OBJECT_MODE set (default 32).
+- if test 64 = "${OBJECT_MODE-32}"; then
+- shared_archive_member_spec=shr_64
+- else
+- shared_archive_member_spec=shr
+- fi
+- fi
+- ;;
+-*)
+- with_aix_soname=aix
+- ;;
+-esac
+-
+-_LT_DECL([], [shared_archive_member_spec], [0],
+- [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+-])# _LT_WITH_AIX_SONAME
+-
+-LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+-LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+-LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+-
+-
+ # _LT_WITH_PIC([MODE])
+ # --------------------
+-# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
++# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+ # LT_INIT options.
+-# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'.
++# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+ m4_define([_LT_WITH_PIC],
+ [AC_ARG_WITH([pic],
+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+@@ -389,17 +334,19 @@
+ *)
+ pic_mode=default
+ # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for lt_pkg in $withval; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ if test "X$lt_pkg" = "X$lt_p"; then
+ pic_mode=yes
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ ;;
+ esac],
+- [pic_mode=m4_default([$1], [default])])
++ [pic_mode=default])
++
++test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+ _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+ ])# _LT_WITH_PIC
+@@ -412,7 +359,7 @@
+ [_LT_SET_OPTION([LT_INIT], [pic-only])
+ AC_DIAGNOSE([obsolete],
+ [$0: Remove this warning and the call to _LT_SET_OPTION when you
+-put the 'pic-only' option into LT_INIT's first parameter.])
++put the `pic-only' option into LT_INIT's first parameter.])
+ ])
+
+ dnl aclocal-1.4 backwards compatibility:
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/ltsugar.m4 psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/ltsugar.m4
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/ltsugar.m4 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/ltsugar.m4 2020-07-16 10:48:35.466517000 +0200
+@@ -1,7 +1,6 @@
+ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
+ #
+-# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+-# Foundation, Inc.
++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+ # Written by Gary V. Vaughan, 2004
+ #
+ # This file is free software; the Free Software Foundation gives
+@@ -34,7 +33,7 @@
+ # ------------
+ # Manipulate m4 lists.
+ # These macros are necessary as long as will still need to support
+-# Autoconf-2.59, which quotes differently.
++# Autoconf-2.59 which quotes differently.
+ m4_define([lt_car], [[$1]])
+ m4_define([lt_cdr],
+ [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+@@ -45,7 +44,7 @@
+
+ # lt_append(MACRO-NAME, STRING, [SEPARATOR])
+ # ------------------------------------------
+-# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
++# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+ # Note that neither SEPARATOR nor STRING are expanded; they are appended
+ # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+ # No SEPARATOR is output if MACRO-NAME was previously undefined (different
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/ltversion.m4 psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/ltversion.m4
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/ltversion.m4 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/ltversion.m4 2020-07-16 10:48:35.467101000 +0200
+@@ -1,6 +1,6 @@
+ # ltversion.m4 -- version numbers -*- Autoconf -*-
+ #
+-# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
++# Copyright (C) 2004 Free Software Foundation, Inc.
+ # Written by Scott James Remnant, 2004
+ #
+ # This file is free software; the Free Software Foundation gives
+@@ -9,15 +9,15 @@
+
+ # @configure_input@
+
+-# serial 4179 ltversion.m4
++# serial 3337 ltversion.m4
+ # This file is part of GNU Libtool
+
+-m4_define([LT_PACKAGE_VERSION], [2.4.6])
+-m4_define([LT_PACKAGE_REVISION], [2.4.6])
++m4_define([LT_PACKAGE_VERSION], [2.4.2])
++m4_define([LT_PACKAGE_REVISION], [1.3337])
+
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.4.6'
+-macro_revision='2.4.6'
++[macro_version='2.4.2'
++macro_revision='1.3337'
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/missing psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/missing
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/missing 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/missing 2020-07-16 10:48:35.468550000 +0200
+@@ -160,7 +160,7 @@
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+- echo "the 'autom4te' program to be rebuilt."
++ echo "the 'automa4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+@@ -210,6 +210,6 @@
+ # eval: (add-hook 'before-save-hook 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+-# time-stamp-time-zone: "UTC0"
++# time-stamp-time-zone: "UTC"
+ # time-stamp-end: "; # UTC"
+ # End:
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/test-driver psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/test-driver
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/confdb/test-driver 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/confdb/test-driver 2020-07-16 10:48:35.469760000 +0200
+@@ -106,14 +106,11 @@
+ # Test script is run here.
+ "$@" >$log_file 2>&1
+ estatus=$?
+-
+ if test $enable_hard_errors = no && test $estatus -eq 99; then
+- tweaked_estatus=1
+-else
+- tweaked_estatus=$estatus
++ estatus=1
+ fi
+
+-case $tweaked_estatus:$expect_failure in
++case $estatus:$expect_failure in
+ 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+ 0:*) col=$grn res=PASS recheck=no gcopy=no;;
+ 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
+@@ -122,12 +119,6 @@
+ *:*) col=$red res=FAIL recheck=yes gcopy=yes;;
+ esac
+
+-# Report the test outcome and exit status in the logs, so that one can
+-# know whether the test passed or failed simply by looking at the '.log'
+-# file, without the need of also peaking into the corresponding '.trs'
+-# file (automake bug#11814).
+-echo "$res $test_name (exit status: $estatus)" >>$log_file
+-
+ # Report outcome to console.
+ echo "${col}${res}${std}: $test_name"
+
+@@ -143,6 +134,6 @@
+ # eval: (add-hook 'before-save-hook 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+-# time-stamp-time-zone: "UTC0"
++# time-stamp-time-zone: "UTC"
+ # time-stamp-end: "; # UTC"
+ # End:
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/configure psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/configure
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/configure 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/configure 2020-07-16 10:48:35.484369056 +0200
+@@ -643,7 +643,6 @@
+ MPL_EMBEDDED_MODE_TRUE
+ libmpl_so_version
+ MPLLIBNAME
+-LT_SYS_LIBRARY_PATH
+ OTOOL64
+ OTOOL
+ LIPO
+@@ -765,7 +764,6 @@
+ enable_static
+ with_pic
+ enable_fast_install
+-with_aix_soname
+ with_gnu_ld
+ with_sysroot
+ enable_libtool_lock
+@@ -792,7 +790,6 @@
+ LIBS
+ CPPFLAGS
+ CPP
+-LT_SYS_LIBRARY_PATH
+ MPLLIBNAME
+ GCOV'
+
+@@ -1458,12 +1455,9 @@
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
+ both]
+- --with-aix-soname=aix|svr4|both
+- shared library versioning (aka "SONAME") variant to
+- provide on AIX, [default=aix].
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
+- --with-sysroot[=DIR] Search for dependent libraries within DIR (or the
+- compiler's sysroot if not specified).
++ --with-sysroot=DIR Search for dependent libraries within DIR
++ (or the compiler's sysroot if not specified).
+ --without-valgrind to disable valgrind support (such as because of
+ version issues)
+ --with-valgrind=PATH use valgrind headers installed in PATH (default is
+@@ -1498,8 +1492,6 @@
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+- LT_SYS_LIBRARY_PATH
+- User-defined run-time library search path.
+ MPLLIBNAME can be used to override the name of the MPL library (default:
+ "mpl")
+ GCOV name/path for the gcov utility
+@@ -2589,8 +2581,8 @@
+ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+-# Expand $ac_aux_dir to an absolute path.
+-am_aux_dir=`cd "$ac_aux_dir" && pwd`
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
+
+ if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+@@ -2609,7 +2601,7 @@
+ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+ fi
+
+-if test x"${install_sh+set}" != xset; then
++if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+@@ -2937,8 +2929,8 @@
+ # <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+ mkdir_p='$(MKDIR_P)'
+
+-# We need awk for the "check" target (and possibly the TAP driver). The
+-# system "awk" is bad on some platforms.
++# We need awk for the "check" target. The system "awk" is bad on
++# some platforms.
+ # Always define AMTAR for backward compatibility. Yes, it's still used
+ # in the wild :-( We should find a proper way to deprecate it ...
+ AMTAR='$${TAR-tar}'
+@@ -3666,65 +3658,6 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+-if ${am_cv_prog_cc_c_o+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+- # Make sure it works both with $CC and with simple cc.
+- # Following AC_PROG_CC_C_O, we do the test twice because some
+- # compilers refuse to overwrite an existing .o file with -o,
+- # though they will create one.
+- am_cv_prog_cc_c_o=yes
+- for am_i in 1 2; do
+- if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+- ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } \
+- && test -f conftest2.$ac_objext; then
+- : OK
+- else
+- am_cv_prog_cc_c_o=no
+- break
+- fi
+- done
+- rm -f core conftest*
+- unset am_i
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+-$as_echo "$am_cv_prog_cc_c_o" >&6; }
+-if test "$am_cv_prog_cc_c_o" != yes; then
+- # Losing compiler, so override with the script.
+- # FIXME: It is wrong to rewrite CC.
+- # But if we don't then we get into trouble of one sort or another.
+- # A longer-term fix would be to have automake use am__CC in this case,
+- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+- CC="$am_aux_dir/compile $CC"
+-fi
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+ depcc="$CC" am_compiler_list=
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+@@ -3859,6 +3792,131 @@
+ eval pac_save_CFLAGS_${pac_save_CFLAGS_nesting}=""
+
+
++if test "x$CC" != xcc; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
++$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
++$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
++fi
++set dummy $CC; ac_cc=`$as_echo "$2" |
++ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
++if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++# Make sure it works both with $CC and with simple cc.
++# We do the test twice because some compilers refuse to overwrite an
++# existing .o file with -o, though they will create one.
++ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
++rm -f conftest2.*
++if { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; } &&
++ test -f conftest2.$ac_objext && { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; };
++then
++ eval ac_cv_prog_cc_${ac_cc}_c_o=yes
++ if test "x$CC" != xcc; then
++ # Test first that cc exists at all.
++ if { ac_try='cc -c conftest.$ac_ext >&5'
++ { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; }; then
++ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
++ rm -f conftest2.*
++ if { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; } &&
++ test -f conftest2.$ac_objext && { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; };
++ then
++ # cc works too.
++ :
++ else
++ # cc exists but doesn't like -o.
++ eval ac_cv_prog_cc_${ac_cc}_c_o=no
++ fi
++ fi
++ fi
++else
++ eval ac_cv_prog_cc_${ac_cc}_c_o=no
++fi
++rm -f core conftest*
++
++fi
++if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
++
++fi
++
++# FIXME: we rely on the cache variable name because
++# there is no other way.
++set dummy $CC
++am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
++if test "$am_t" != yes; then
++ # Losing compiler, so override with the script.
++ # FIXME: It is wrong to rewrite CC.
++ # But if we don't then we get into trouble of one sort or another.
++ # A longer-term fix would be to have automake use am__CC in this case,
++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
++ CC="$am_aux_dir/compile $CC"
++fi
++
+
+
+
+@@ -4428,13 +4486,7 @@
+ if ${am_cv_ar_interface+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+- ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+- am_cv_ar_interface=ar
++ am_cv_ar_interface=ar
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ int some_variable = 0;
+@@ -4465,11 +4517,6 @@
+
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+@@ -4511,8 +4558,8 @@
+
+
+
+-macro_version='2.4.6'
+-macro_revision='2.4.6'
++macro_version='2.4.2'
++macro_revision='1.3337'
+
+
+
+@@ -4526,7 +4573,7 @@
+
+
+
+-ltmain=$ac_aux_dir/ltmain.sh
++ltmain="$ac_aux_dir/ltmain.sh"
+
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+@@ -4646,7 +4693,7 @@
+ $ECHO ""
+ }
+
+-case $ECHO in
++case "$ECHO" in
+ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+ $as_echo "printf" >&6; } ;;
+ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+@@ -4839,19 +4886,19 @@
+
+ # Check whether --with-gnu-ld was given.
+ if test "${with_gnu_ld+set}" = set; then :
+- withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ else
+ with_gnu_ld=no
+ fi
+
+ ac_prog=ld
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+ $as_echo_n "checking for ld used by $CC... " >&6; }
+ case $host in
+ *-*-mingw*)
+- # gcc leaves a trailing carriage return, which upsets mingw
++ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+@@ -4865,7 +4912,7 @@
+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+ done
+- test -z "$LD" && LD=$ac_prog
++ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+@@ -4876,7 +4923,7 @@
+ with_gnu_ld=unknown
+ ;;
+ esac
+-elif test yes = "$with_gnu_ld"; then
++elif test "$with_gnu_ld" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+ $as_echo_n "checking for GNU ld... " >&6; }
+ else
+@@ -4887,32 +4934,32 @@
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$LD"; then
+- lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+- lt_cv_path_LD=$ac_dir/$ac_prog
++ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+- test no != "$with_gnu_ld" && break
++ test "$with_gnu_ld" != no && break
+ ;;
+ *)
+- test yes != "$with_gnu_ld" && break
++ test "$with_gnu_ld" != yes && break
+ ;;
+ esac
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ else
+- lt_cv_path_LD=$LD # Let the user override the test with a path.
++ lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ fi
+ fi
+
+-LD=$lt_cv_path_LD
++LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+ $as_echo "$LD" >&6; }
+@@ -4955,38 +5002,33 @@
+ else
+ if test -n "$NM"; then
+ # Let the user override the test.
+- lt_cv_path_NM=$NM
++ lt_cv_path_NM="$NM"
+ else
+- lt_nm_to_check=${ac_tool_prefix}nm
++ lt_nm_to_check="${ac_tool_prefix}nm"
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
+- lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+- tmp_nm=$ac_dir/$lt_tmp_nm
+- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
++ tmp_nm="$ac_dir/$lt_tmp_nm"
++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ # Check to see if the nm accepts a BSD-compat flag.
+- # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
++ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # nm: unknown option "B" ignored
+ # Tru64's nm complains that /dev/null is an invalid object file
+- # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+- case $build_os in
+- mingw*) lt_bad_file=conftest.nm/nofile ;;
+- *) lt_bad_file=/dev/null ;;
+- esac
+- case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+- *$lt_bad_file* | *'Invalid file or object type'*)
++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++ */dev/null* | *'Invalid file or object type'*)
+ lt_cv_path_NM="$tmp_nm -B"
+- break 2
++ break
+ ;;
+ *)
+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+ */dev/null*)
+ lt_cv_path_NM="$tmp_nm -p"
+- break 2
++ break
+ ;;
+ *)
+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+@@ -4997,15 +5039,15 @@
+ esac
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ done
+ : ${lt_cv_path_NM=no}
+ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+ $as_echo "$lt_cv_path_NM" >&6; }
+-if test no != "$lt_cv_path_NM"; then
+- NM=$lt_cv_path_NM
++if test "$lt_cv_path_NM" != "no"; then
++ NM="$lt_cv_path_NM"
+ else
+ # Didn't find any BSD compatible name lister, look for dumpbin.
+ if test -n "$DUMPBIN"; then :
+@@ -5111,9 +5153,9 @@
+ fi
+ fi
+
+- case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
++ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ *COFF*)
+- DUMPBIN="$DUMPBIN -symbols -headers"
++ DUMPBIN="$DUMPBIN -symbols"
+ ;;
+ *)
+ DUMPBIN=:
+@@ -5121,8 +5163,8 @@
+ esac
+ fi
+
+- if test : != "$DUMPBIN"; then
+- NM=$DUMPBIN
++ if test "$DUMPBIN" != ":"; then
++ NM="$DUMPBIN"
+ fi
+ fi
+ test -z "$NM" && NM=nm
+@@ -5173,7 +5215,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ i=0
+- teststring=ABCD
++ teststring="ABCD"
+
+ case $build_os in
+ msdosdjgpp*)
+@@ -5213,7 +5255,7 @@
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+- bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+@@ -5263,23 +5305,22 @@
+ ;;
+ *)
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+- if test -n "$lt_cv_sys_max_cmd_len" && \
+- test undefined != "$lt_cv_sys_max_cmd_len"; then
++ if test -n "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ # Make teststring a little bigger before we do anything with it.
+ # a 1K string should be a reasonable start.
+- for i in 1 2 3 4 5 6 7 8; do
++ for i in 1 2 3 4 5 6 7 8 ; do
+ teststring=$teststring$teststring
+ done
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+- while { test X`env echo "$teststring$teststring" 2>/dev/null` \
++ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+- test 17 != "$i" # 1/2 MB should be enough
++ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+@@ -5297,7 +5338,7 @@
+
+ fi
+
+-if test -n "$lt_cv_sys_max_cmd_len"; then
++if test -n $lt_cv_sys_max_cmd_len ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+ $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+ else
+@@ -5315,6 +5356,30 @@
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
++$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%"$_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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
++$as_echo "$xsi_shell" >&6; }
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
++$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
++lt_shell_append=no
++( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
++ >/dev/null 2>&1 \
++ && lt_shell_append=yes
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
++$as_echo "$lt_shell_append" >&6; }
++
++
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ lt_unset=unset
+ else
+@@ -5437,13 +5502,13 @@
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+- if test yes != "$GCC"; then
++ if test "$GCC" != yes; then
+ reload_cmds=false
+ fi
+ ;;
+ darwin*)
+- if test yes = "$GCC"; then
+- reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
++ if test "$GCC" = yes; then
++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ else
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ fi
+@@ -5571,13 +5636,13 @@
+ # Need to set the preceding variable on all platforms that support
+ # interlibrary dependencies.
+ # 'none' -- dependencies not supported.
+-# 'unknown' -- same as none, but documents that we really don't know.
++# `unknown' -- same as none, but documents that we really don't know.
+ # 'pass_all' -- all dependencies passed with no checks.
+ # 'test_compile' -- check by making test program.
+ # 'file_magic [[regex]]' -- check by looking for files in library path
+-# that responds to the $file_magic_cmd with a given extended regex.
+-# If you have 'file' or equivalent on your system and you're not sure
+-# whether 'pass_all' will *always* work, you probably want this one.
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+ aix[4-9]*)
+@@ -5604,7 +5669,8 @@
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+- if ( file / ) >/dev/null 2>&1; then
++ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
++ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+@@ -5640,6 +5706,10 @@
+ fi
+ ;;
+
++gnu*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
+ haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+@@ -5678,7 +5748,7 @@
+ ;;
+
+ # This must be glibc/ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -5700,8 +5770,8 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-openbsd* | bitrig*)
+- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++openbsd*)
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+@@ -5754,9 +5824,6 @@
+ tpf*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+-os2*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+ esac
+
+ fi
+@@ -5914,8 +5981,8 @@
+
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+- # two different shell functions defined in ltmain.sh;
+- # decide which one to use based on capabilities of $DLLTOOL
++ # 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
+@@ -5927,7 +5994,7 @@
+ ;;
+ *)
+ # fallback: assume linklib IS sharedlib
+- lt_cv_sharedlib_from_linklib_cmd=$ECHO
++ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ ;;
+ esac
+
+@@ -6081,7 +6148,7 @@
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+- if test 0 -eq "$ac_status"; then
++ 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
+@@ -6089,7 +6156,7 @@
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+- if test 0 -ne "$ac_status"; then
++ if test "$ac_status" -ne 0; then
+ lt_cv_ar_at_file=@
+ fi
+ fi
+@@ -6102,7 +6169,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+ $as_echo "$lt_cv_ar_at_file" >&6; }
+
+-if test no = "$lt_cv_ar_at_file"; then
++if test "x$lt_cv_ar_at_file" = xno; then
+ archiver_list_spec=
+ else
+ archiver_list_spec=$lt_cv_ar_at_file
+@@ -6319,7 +6386,7 @@
+
+ if test -n "$RANLIB"; then
+ case $host_os in
+- bitrig* | openbsd*)
++ openbsd*)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+ ;;
+ *)
+@@ -6409,7 +6476,7 @@
+ symcode='[ABCDGISTW]'
+ ;;
+ hpux*)
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ symcode='[ABCDEGRST]'
+ fi
+ ;;
+@@ -6442,44 +6509,14 @@
+ symcode='[ABCDGIRSTW]' ;;
+ esac
+
+-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+- # Gets list of data symbols to import.
+- lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+- # Adjust the below global symbol transforms to fixup imported variables.
+- lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+- lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+- lt_c_name_lib_hook="\
+- -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+- -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+-else
+- # Disable hooks by default.
+- lt_cv_sys_global_symbol_to_import=
+- lt_cdecl_hook=
+- lt_c_name_hook=
+- lt_c_name_lib_hook=
+-fi
+-
+ # Transform an extracted symbol line into a proper C declaration.
+ # Some systems (esp. on ia64) link data and code symbols differently,
+ # so use this general approach.
+-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+-$lt_cdecl_hook\
+-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
++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"\
+-$lt_c_name_hook\
+-" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+-" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+-
+-# Transform an extracted symbol line into symbol name with lib prefix and
+-# symbol address.
+-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+-$lt_c_name_lib_hook\
+-" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+-" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+-" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/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=
+@@ -6497,24 +6534,21 @@
+
+ # Write the raw and C identifiers.
+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+- # Fake it for dumpbin and say T for any non-static function,
+- # D for any global variable and I for any imported variable.
++ # Fake it for dumpbin and say T for any non-static function
++ # and D for any global variable.
+ # Also find C++ and __fastcall symbols from MSVC++,
+ # which start with @ or ?.
+ lt_cv_sys_global_symbol_pipe="$AWK '"\
+ " {last_section=section; section=\$ 3};"\
+ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+-" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+-" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+-" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+ " \$ 0!~/External *\|/{next};"\
+ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+ " {if(hide[section]) next};"\
+-" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+-" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+-" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+-" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
++" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
++" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
++" s[1]~/^[@?]/{print s[1], s[1]; next};"\
++" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+ " ' prfx=^$ac_symprfx"
+ else
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+@@ -6562,11 +6596,11 @@
+ 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 can't be const, because runtime
++#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__
++#elif defined(__osf__)
+ /* This system does not cope well with relocations in const data. */
+ # define LT_DLSYM_CONST
+ #else
+@@ -6592,7 +6626,7 @@
+ {
+ { "@PROGRAM@", (void *) 0 },
+ _LT_EOF
+- $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ cat <<\_LT_EOF >> conftest.$ac_ext
+ {0, (void *) 0}
+ };
+@@ -6612,13 +6646,13 @@
+ mv conftest.$ac_objext conftstm.$ac_objext
+ lt_globsym_save_LIBS=$LIBS
+ lt_globsym_save_CFLAGS=$CFLAGS
+- LIBS=conftstm.$ac_objext
++ LIBS="conftstm.$ac_objext"
+ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } && test -s conftest$ac_exeext; then
++ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+ pipe_works=yes
+ fi
+ LIBS=$lt_globsym_save_LIBS
+@@ -6639,7 +6673,7 @@
+ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+- if test yes = "$pipe_works"; then
++ if test "$pipe_works" = yes; then
+ break
+ else
+ lt_cv_sys_global_symbol_pipe=
+@@ -6692,16 +6726,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+ $as_echo_n "checking for sysroot... " >&6; }
+
+@@ -6714,9 +6738,9 @@
+
+
+ lt_sysroot=
+-case $with_sysroot in #(
++case ${with_sysroot} in #(
+ yes)
+- if test yes = "$GCC"; then
++ if test "$GCC" = yes; then
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+ fi
+ ;; #(
+@@ -6726,8 +6750,8 @@
+ no|'')
+ ;; #(
+ *)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+-$as_echo "$with_sysroot" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
++$as_echo "${with_sysroot}" >&6; }
+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+ ;;
+ esac
+@@ -6739,99 +6763,18 @@
+
+
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+-$as_echo_n "checking for a working dd... " >&6; }
+-if ${ac_cv_path_lt_DD+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- printf 0123456789abcdef0123456789abcdef >conftest.i
+-cat conftest.i conftest.i >conftest2.i
+-: ${lt_DD:=$DD}
+-if test -z "$lt_DD"; then
+- ac_path_lt_DD_found=false
+- # Loop through the user's path and test for each of PROGNAME-LIST
+- 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_prog in dd; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+- as_fn_executable_p "$ac_path_lt_DD" || continue
+-if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+- cmp -s conftest.i conftest.out \
+- && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+-fi
+- $ac_path_lt_DD_found && break 3
+- done
+- done
+- done
+-IFS=$as_save_IFS
+- if test -z "$ac_cv_path_lt_DD"; then
+- :
+- fi
+-else
+- ac_cv_path_lt_DD=$lt_DD
+-fi
+-
+-rm -f conftest.i conftest2.i conftest.out
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+-$as_echo "$ac_cv_path_lt_DD" >&6; }
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+-$as_echo_n "checking how to truncate binary pipes... " >&6; }
+-if ${lt_cv_truncate_bin+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- printf 0123456789abcdef0123456789abcdef >conftest.i
+-cat conftest.i conftest.i >conftest2.i
+-lt_cv_truncate_bin=
+-if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+- cmp -s conftest.i conftest.out \
+- && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+-fi
+-rm -f conftest.i conftest2.i conftest.out
+-test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+-$as_echo "$lt_cv_truncate_bin" >&6; }
+-
+-
+-
+-
+-
+-
+-
+-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+-func_cc_basename ()
+-{
+- for cc_temp in $*""; do
+- case $cc_temp in
+- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+- \-*) ;;
+- *) break;;
+- esac
+- done
+- func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+-}
+-
+ # Check whether --enable-libtool-lock was given.
+ if test "${enable_libtool_lock+set}" = set; then :
+ enableval=$enable_libtool_lock;
+ fi
+
+-test no = "$enable_libtool_lock" || enable_libtool_lock=yes
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+ # Some flags need to be propagated to the compiler or linker for good
+ # libtool support.
+ case $host in
+ ia64-*-hpux*)
+- # Find out what ABI is being produced by ac_compile, and set mode
+- # options accordingly.
++ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+@@ -6840,25 +6783,24 @@
+ test $ac_status = 0; }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *ELF-32*)
+- HPUX_IA64_MODE=32
++ HPUX_IA64_MODE="32"
+ ;;
+ *ELF-64*)
+- HPUX_IA64_MODE=64
++ HPUX_IA64_MODE="64"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ *-*-irix6*)
+- # Find out what ABI is being produced by ac_compile, and set linker
+- # options accordingly.
++ # Find out which ABI we are using.
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- if test yes = "$lt_cv_prog_gnu_ld"; then
++ if test "$lt_cv_prog_gnu_ld" = yes; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -melf32bsmip"
+@@ -6887,50 +6829,9 @@
+ rm -rf conftest*
+ ;;
+
+-mips64*-*linux*)
+- # Find out what ABI is being produced by ac_compile, and set linker
+- # options accordingly.
+- echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+- (eval $ac_compile) 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- emul=elf
+- case `/usr/bin/file conftest.$ac_objext` in
+- *32-bit*)
+- emul="${emul}32"
+- ;;
+- *64-bit*)
+- emul="${emul}64"
+- ;;
+- esac
+- case `/usr/bin/file conftest.$ac_objext` in
+- *MSB*)
+- emul="${emul}btsmip"
+- ;;
+- *LSB*)
+- emul="${emul}ltsmip"
+- ;;
+- esac
+- case `/usr/bin/file conftest.$ac_objext` in
+- *N32*)
+- emul="${emul}n32"
+- ;;
+- esac
+- LD="${LD-ld} -m $emul"
+- fi
+- rm -rf conftest*
+- ;;
+-
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+- # Find out what ABI is being produced by ac_compile, and set linker
+- # options accordingly. Note that the listed cases only cover the
+- # situations where additional linker options are needed (such as when
+- # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+- # vice versa); the common cases where no linker options are needed do
+- # not appear in the list.
++ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+@@ -6944,19 +6845,9 @@
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
+ x86_64-*linux*)
+- case `/usr/bin/file conftest.o` in
+- *x86-64*)
+- LD="${LD-ld} -m elf32_x86_64"
+- ;;
+- *)
+- LD="${LD-ld} -m elf_i386"
+- ;;
+- esac
+- ;;
+- powerpc64le-*linux*)
+- LD="${LD-ld} -m elf32lppclinux"
++ LD="${LD-ld} -m elf_i386"
+ ;;
+- powerpc64-*linux*)
++ ppc64-*linux*|powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+@@ -6975,10 +6866,7 @@
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+- powerpcle-*linux*)
+- LD="${LD-ld} -m elf64lppc"
+- ;;
+- powerpc-*linux*)
++ ppc*-*linux*|powerpc*-*linux*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*|s390*-*tpf*)
+@@ -6996,7 +6884,7 @@
+
+ *-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+- SAVE_CFLAGS=$CFLAGS
++ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+ $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+@@ -7036,14 +6924,13 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+- if test yes != "$lt_cv_cc_needs_belf"; then
++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+- CFLAGS=$SAVE_CFLAGS
++ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+ *-*solaris*)
+- # Find out what ABI is being produced by ac_compile, and set linker
+- # options accordingly.
++ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+@@ -7055,7 +6942,7 @@
+ case $lt_cv_prog_gnu_ld in
+ yes*)
+ case $host in
+- i?86-*-solaris*|x86_64-*-solaris*)
++ i?86-*-solaris*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ sparc*-*-solaris*)
+@@ -7064,7 +6951,7 @@
+ esac
+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+- LD=${LD-ld}_sol2
++ LD="${LD-ld}_sol2"
+ fi
+ ;;
+ *)
+@@ -7080,7 +6967,7 @@
+ ;;
+ esac
+
+-need_locks=$enable_libtool_lock
++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.
+@@ -7191,7 +7078,7 @@
+ 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 yes != "$lt_cv_path_mainfest_tool"; then
++if test "x$lt_cv_path_mainfest_tool" != xyes; then
+ MANIFEST_TOOL=:
+ fi
+
+@@ -7694,7 +7581,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_apple_cc_single_mod=no
+- if test -z "$LT_MULTI_MODULE"; then
++ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+@@ -7712,7 +7599,7 @@
+ cat conftest.err >&5
+ # Otherwise, if the output was created with a 0 exit code from
+ # the compiler, it worked.
+- elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
++ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ lt_cv_apple_cc_single_mod=yes
+ else
+ cat conftest.err >&5
+@@ -7751,7 +7638,7 @@
+ 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_ld_exported_symbols_list" >&5
+@@ -7780,7 +7667,7 @@
+ _lt_result=$?
+ if test -s conftest.err && $GREP force_load conftest.err; then
+ cat conftest.err >&5
+- elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
++ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&5
+@@ -7793,32 +7680,32 @@
+ $as_echo "$lt_cv_ld_force_load" >&6; }
+ case $host_os in
+ rhapsody* | darwin1.[012])
+- _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*) # darwin 5.x on
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+- 10.[012][,.]*)
+- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[012]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+- if test yes = "$lt_cv_apple_cc_single_mod"; then
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+- if test yes = "$lt_cv_ld_exported_symbols_list"; then
+- _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+- if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
++ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
+ else
+ _lt_dsymutil=
+@@ -7826,41 +7713,6 @@
+ ;;
+ esac
+
+-# func_munge_path_list VARIABLE PATH
+-# -----------------------------------
+-# VARIABLE is name of variable containing _space_ separated list of
+-# directories to be munged by the contents of PATH, which is string
+-# having a format:
+-# "DIR[:DIR]:"
+-# string "DIR[ DIR]" will be prepended to VARIABLE
+-# ":DIR[:DIR]"
+-# string "DIR[ DIR]" will be appended to VARIABLE
+-# "DIRP[:DIRP]::[DIRA:]DIRA"
+-# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+-# "DIRA[ DIRA]" will be appended to VARIABLE
+-# "DIR[:DIR]"
+-# VARIABLE will be replaced by "DIR[ DIR]"
+-func_munge_path_list ()
+-{
+- case x$2 in
+- x)
+- ;;
+- *:)
+- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+- ;;
+- x:*)
+- eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+- ;;
+- *::*)
+- eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+- eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+- ;;
+- *)
+- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+- ;;
+- esac
+-}
+-
+ for ac_header in dlfcn.h
+ do :
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+@@ -7897,14 +7749,14 @@
+ *)
+ enable_shared=no
+ # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_shared=yes
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ ;;
+ esac
+ else
+@@ -7928,14 +7780,14 @@
+ *)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ ;;
+ esac
+ else
+@@ -7959,14 +7811,14 @@
+ *)
+ pic_mode=default
+ # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for lt_pkg in $withval; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ if test "X$lt_pkg" = "X$lt_p"; then
+ pic_mode=yes
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ ;;
+ esac
+ else
+@@ -7974,6 +7826,8 @@
+ fi
+
+
++test -z "$pic_mode" && pic_mode=default
++
+
+
+
+@@ -7989,14 +7843,14 @@
+ *)
+ enable_fast_install=no
+ # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_fast_install=yes
+ fi
+ done
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ ;;
+ esac
+ else
+@@ -8010,63 +7864,11 @@
+
+
+
+- shared_archive_member_spec=
+-case $host,$enable_shared in
+-power*-*-aix[5-9]*,yes)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+-$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+-
+-# Check whether --with-aix-soname was given.
+-if test "${with_aix_soname+set}" = set; then :
+- withval=$with_aix_soname; case $withval in
+- aix|svr4|both)
+- ;;
+- *)
+- as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+- ;;
+- esac
+- lt_cv_with_aix_soname=$with_aix_soname
+-else
+- if ${lt_cv_with_aix_soname+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- lt_cv_with_aix_soname=aix
+-fi
+-
+- with_aix_soname=$lt_cv_with_aix_soname
+-fi
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+-$as_echo "$with_aix_soname" >&6; }
+- if test aix != "$with_aix_soname"; then
+- # For the AIX way of multilib, we name the shared archive member
+- # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+- # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+- # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+- # the AIX toolchain works better with OBJECT_MODE set (default 32).
+- if test 64 = "${OBJECT_MODE-32}"; then
+- shared_archive_member_spec=shr_64
+- else
+- shared_archive_member_spec=shr
+- fi
+- fi
+- ;;
+-*)
+- with_aix_soname=aix
+- ;;
+-esac
+-
+-
+-
+-
+-
+-
+-
+
+
+
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS=$ltmain
++LIBTOOL_DEPS="$ltmain"
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -8115,7 +7917,7 @@
+
+
+
+-if test -n "${ZSH_VERSION+set}"; then
++if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+
+@@ -8154,7 +7956,7 @@
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+- if test set != "${COLLECT_NAMES+set}"; then
++ if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+@@ -8165,14 +7967,14 @@
+ ofile=libtool
+ can_build_shared=yes
+
+-# All known linkers require a '.a' archive for static linking (except MSVC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+
+-with_gnu_ld=$lt_cv_prog_gnu_ld
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+-old_CC=$CC
+-old_CFLAGS=$CFLAGS
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
+
+ # Set sane defaults for various variables
+ test -z "$CC" && CC=cc
+@@ -8181,8 +7983,15 @@
+ test -z "$LD" && LD=ld
+ test -z "$ac_objext" && ac_objext=o
+
+-func_cc_basename $compiler
+-cc_basename=$func_cc_basename_result
++for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+ # Only perform the check for file, if the check method requires it
+@@ -8197,22 +8006,22 @@
+ else
+ case $MAGIC_CMD in
+ [\\/*] | ?:[\\/]*)
+- lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ ;;
+ *)
+- lt_save_MAGIC_CMD=$MAGIC_CMD
+- lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++ lt_save_MAGIC_CMD="$MAGIC_CMD"
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+ for ac_dir in $ac_dummy; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+- if test -f "$ac_dir/${ac_tool_prefix}file"; then
+- lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
++ if test -f $ac_dir/${ac_tool_prefix}file; then
++ lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+- MAGIC_CMD=$lt_cv_path_MAGIC_CMD
++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ :
+@@ -8235,13 +8044,13 @@
+ break
+ fi
+ done
+- IFS=$lt_save_ifs
+- MAGIC_CMD=$lt_save_MAGIC_CMD
++ IFS="$lt_save_ifs"
++ MAGIC_CMD="$lt_save_MAGIC_CMD"
+ ;;
+ esac
+ fi
+
+-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+ $as_echo "$MAGIC_CMD" >&6; }
+@@ -8263,22 +8072,22 @@
+ else
+ case $MAGIC_CMD in
+ [\\/*] | ?:[\\/]*)
+- lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ ;;
+ *)
+- lt_save_MAGIC_CMD=$MAGIC_CMD
+- lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++ lt_save_MAGIC_CMD="$MAGIC_CMD"
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+ for ac_dir in $ac_dummy; do
+- IFS=$lt_save_ifs
++ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+- if test -f "$ac_dir/file"; then
+- lt_cv_path_MAGIC_CMD=$ac_dir/"file"
++ if test -f $ac_dir/file; then
++ lt_cv_path_MAGIC_CMD="$ac_dir/file"
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+- MAGIC_CMD=$lt_cv_path_MAGIC_CMD
++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ :
+@@ -8301,13 +8110,13 @@
+ break
+ fi
+ done
+- IFS=$lt_save_ifs
+- MAGIC_CMD=$lt_save_MAGIC_CMD
++ IFS="$lt_save_ifs"
++ MAGIC_CMD="$lt_save_MAGIC_CMD"
+ ;;
+ esac
+ fi
+
+-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+ $as_echo "$MAGIC_CMD" >&6; }
+@@ -8328,7 +8137,7 @@
+
+ # Use C for the default configuration in the libtool script
+
+-lt_save_CC=$CC
++lt_save_CC="$CC"
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -8386,7 +8195,7 @@
+
+ lt_prog_compiler_no_builtin_flag=
+
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ case $cc_basename in
+ nvcc*)
+ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+@@ -8402,7 +8211,7 @@
+ lt_cv_prog_compiler_rtti_exceptions=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+- lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment
++ lt_compiler_flag="-fno-rtti -fno-exceptions"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+@@ -8432,7 +8241,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+ $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+-if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+ else
+ :
+@@ -8450,18 +8259,17 @@
+ lt_prog_compiler_static=
+
+
+- if test yes = "$GCC"; then
++ if test "$GCC" = yes; then
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_static='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ lt_prog_compiler_static='-Bstatic'
+ fi
+- lt_prog_compiler_pic='-fPIC'
+ ;;
+
+ amigaos*)
+@@ -8472,8 +8280,8 @@
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+- # adding the '-m68020' flag to GCC prevents building anything better,
+- # like '-m68040'.
++ # adding the `-m68020' flag to GCC prevents building anything better,
++ # like `-m68040'.
+ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
+@@ -8489,11 +8297,6 @@
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+- case $host_os in
+- os2*)
+- lt_prog_compiler_static='$wl-static'
+- ;;
+- esac
+ ;;
+
+ darwin* | rhapsody*)
+@@ -8564,7 +8367,7 @@
+ case $host_os in
+ aix*)
+ lt_prog_compiler_wl='-Wl,'
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ lt_prog_compiler_static='-Bstatic'
+ else
+@@ -8572,29 +8375,10 @@
+ fi
+ ;;
+
+- darwin* | rhapsody*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- lt_prog_compiler_pic='-fno-common'
+- case $cc_basename in
+- nagfor*)
+- # NAG Fortran compiler
+- lt_prog_compiler_wl='-Wl,-Wl,,'
+- lt_prog_compiler_pic='-PIC'
+- lt_prog_compiler_static='-Bstatic'
+- ;;
+- esac
+- ;;
+-
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+- case $host_os in
+- os2*)
+- lt_prog_compiler_static='$wl-static'
+- ;;
+- esac
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -8610,7 +8394,7 @@
+ ;;
+ esac
+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
+- lt_prog_compiler_static='$wl-a ${wl}archive'
++ lt_prog_compiler_static='${wl}-a ${wl}archive'
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+@@ -8619,9 +8403,9 @@
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+- # old Intel for x86_64, which still supported -KPIC.
++ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+@@ -8646,12 +8430,6 @@
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+- tcc*)
+- # Fabrice Bellard et al's Tiny C Compiler
+- lt_prog_compiler_wl='-Wl,'
+- lt_prog_compiler_pic='-fPIC'
+- lt_prog_compiler_static='-static'
+- ;;
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+@@ -8749,7 +8527,7 @@
+ ;;
+
+ sysv4*MP*)
+- if test -d /usr/nec; then
++ if test -d /usr/nec ;then
+ lt_prog_compiler_pic='-Kconform_pic'
+ lt_prog_compiler_static='-Bstatic'
+ fi
+@@ -8778,7 +8556,7 @@
+ fi
+
+ case $host_os in
+- # For platforms that do not support PIC, -DPIC is meaningless:
++ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic=
+ ;;
+@@ -8810,7 +8588,7 @@
+ lt_cv_prog_compiler_pic_works=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+- lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment
++ lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+@@ -8840,7 +8618,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+ $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+-if test yes = "$lt_cv_prog_compiler_pic_works"; then
++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+ case $lt_prog_compiler_pic in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+@@ -8872,7 +8650,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_static_works=no
+- save_LDFLAGS=$LDFLAGS
++ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+@@ -8891,13 +8669,13 @@
+ fi
+ fi
+ $RM -r conftest*
+- LDFLAGS=$save_LDFLAGS
++ LDFLAGS="$save_LDFLAGS"
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+ $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+-if test yes = "$lt_cv_prog_compiler_static_works"; then
++if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+ :
+ else
+ lt_prog_compiler_static=
+@@ -9017,8 +8795,8 @@
+
+
+
+-hard_links=nottested
+-if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+ $as_echo_n "checking if we can lock with hard links... " >&6; }
+@@ -9030,9 +8808,9 @@
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+ $as_echo "$hard_links" >&6; }
+- if test no = "$hard_links"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+-$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
++ if test "$hard_links" = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ need_locks=warn
+ fi
+ else
+@@ -9075,9 +8853,9 @@
+ # included in the symbol list
+ include_expsyms=
+ # exclude_expsyms can be an extended regexp of symbols to exclude
+- # it will be wrapped by ' (' and ')$', so one must not match beginning or
+- # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+- # as well as any symbol that contains 'd'.
++ # it will be wrapped by ` (' and `)$', so one must not match beginning or
++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++ # as well as any symbol that contains `d'.
+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+@@ -9092,7 +8870,7 @@
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+- if test yes != "$GCC"; then
++ if test "$GCC" != yes; then
+ with_gnu_ld=no
+ fi
+ ;;
+@@ -9100,7 +8878,7 @@
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
+- openbsd* | bitrig*)
++ openbsd*)
+ with_gnu_ld=no
+ ;;
+ esac
+@@ -9110,7 +8888,7 @@
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+@@ -9132,24 +8910,24 @@
+ esac
+ fi
+
+- if test yes = "$lt_use_gnu_ld_interface"; then
++ if test "$lt_use_gnu_ld_interface" = yes; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+- wlarc='$wl'
++ wlarc='${wl}'
+
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+- hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+- export_dynamic_flag_spec='$wl--export-dynamic'
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++ export_dynamic_flag_spec='${wl}--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+- whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
++ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ whole_archive_flag_spec=
+ fi
+ supports_anon_versioning=no
+- case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
++ case `$LD -v 2>&1` in
+ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+@@ -9162,7 +8940,7 @@
+ case $host_os in
+ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+- if test ia64 != "$host_cpu"; then
++ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+
+@@ -9181,7 +8959,7 @@
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds=''
+ ;;
+ m68k)
+@@ -9197,7 +8975,7 @@
+ allow_undefined_flag=unsupported
+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ ld_shlibs=no
+ fi
+@@ -9207,7 +8985,7 @@
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+- export_dynamic_flag_spec='$wl--export-all-symbols'
++ export_dynamic_flag_spec='${wl}--export-all-symbols'
+ allow_undefined_flag=unsupported
+ always_export_symbols=no
+ enable_shared_with_static_runtimes=yes
+@@ -9215,89 +8993,61 @@
+ 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'
+- # If the export-symbols file already is a .def file, use it as
+- # is; otherwise, prepend EXPORTS...
+- archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; 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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ # If the export-symbols file already is a .def file (1st line
++ # is EXPORTS), use it as is; otherwise, prepend...
++ archive_expsym_cmds='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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+ haiku*)
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ link_all_deplibs=yes
+ ;;
+
+- os2*)
+- hardcode_libdir_flag_spec='-L$libdir'
+- hardcode_minus_L=yes
+- allow_undefined_flag=unsupported
+- shrext_cmds=.dll
+- archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- prefix_cmds="$SED"~
+- if test EXPORTS = "`$SED 1q $export_symbols`"; then
+- prefix_cmds="$prefix_cmds -e 1d";
+- fi~
+- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+- enable_shared_with_static_runtimes=yes
+- ;;
+-
+ interix[3-9]*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+- hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+- export_dynamic_flag_spec='$wl-E'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+- archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+- if test linux-dietlibc = "$host_os"; then
++ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
+ esac
+ fi
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+- && test no = "$tmp_diet"
++ && test "$tmp_diet" = no
+ then
+ tmp_addflag=' $pic_flag'
+ tmp_sharedflag='-shared'
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+- whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+ pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group f77 and f90 compilers
+- whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+@@ -9308,47 +9058,42 @@
+ lf95*) # Lahey Fortran 8.1
+ whole_archive_flag_spec=
+ tmp_sharedflag='--shared' ;;
+- nagfor*) # NAGFOR 5.3
+- tmp_sharedflag='-Wl,-shared' ;;
+ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
+ nvcc*) # Cuda Compiler Driver 2.2
+- whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object=yes
+ ;;
+ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+- whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
++ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object=yes
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ esac
+- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+- if test yes = "$supports_anon_versioning"; then
++ 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~
+- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+
+ case $cc_basename in
+- tcc*)
+- export_dynamic_flag_spec='-rdynamic'
+- ;;
+ xlf* | bgf* | bgxlf* | mpixlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+- hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+- if test yes = "$supports_anon_versioning"; then
++ 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 $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ echo "local: *; };" >> $output_objdir/$libname.ver~
++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
+@@ -9362,8 +9107,8 @@
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+ else
+- 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'
++ 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
+ ;;
+
+@@ -9381,8 +9126,8 @@
+
+ _LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- 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'
++ 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
+@@ -9394,7 +9139,7 @@
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+
+-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+ *** reliably create shared libraries on SCO systems. Therefore, libtool
+ *** is disabling shared libraries support. We urge you to upgrade GNU
+ *** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+@@ -9409,9 +9154,9 @@
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+- 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'
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++ 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'
+ else
+ ld_shlibs=no
+ fi
+@@ -9428,15 +9173,15 @@
+
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- 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'
++ 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
+ ;;
+ esac
+
+- if test no = "$ld_shlibs"; then
++ if test "$ld_shlibs" = no; then
+ runpath_var=
+ hardcode_libdir_flag_spec=
+ export_dynamic_flag_spec=
+@@ -9452,7 +9197,7 @@
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L=yes
+- if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct=unsupported
+@@ -9460,57 +9205,34 @@
+ ;;
+
+ aix[4-9]*)
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+- no_entry_flag=
++ no_entry_flag=""
+ else
+ # If we're using GNU nm, then we don't want the "-C" option.
+- # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+- # Without the "-l" option, or with the "-B" option, AIX nm treats
+- # weak defined symbols like other global defined symbols, whereas
+- # GNU nm marks them as "W".
+- # While the 'weak' keyword is ignored in the Export File, we need
+- # it in the Import File for the 'aix-soname' feature, so we have
+- # to replace the "-B" option with "-P" for AIX nm.
++ # -C means demangle to AIX nm, but means don't demangle with GNU nm
++ # Also, AIX nm treats weak defined symbols like other global
++ # defined symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
++ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+- export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
++ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+- # have runtime linking enabled, and use it for executables.
+- # For shared libraries, we enable/disable runtime linking
+- # depending on the kind of the shared library created -
+- # when "with_aix_soname,aix_use_runtimelinking" is:
+- # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+- # "aix,yes" lib.so shared, rtl:yes, for executables
+- # lib.a static archive
+- # "both,no" lib.so.V(shr.o) shared, rtl:yes
+- # lib.a(lib.so.V) shared, rtl:no, for executables
+- # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+- # lib.a(lib.so.V) shared, rtl:no
+- # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+- # lib.a static archive
++ # need to do runtime linking.
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+- if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
+ done
+- if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+- # With aix-soname=svr4, we create the lib.so.V shared archives only,
+- # so we don't have lib.a shared libs to link our executables.
+- # We have to force runtime linking in this case.
+- aix_use_runtimelinking=yes
+- LDFLAGS="$LDFLAGS -Wl,-brtl"
+- fi
+ ;;
+ esac
+
+@@ -9529,21 +9251,13 @@
+ hardcode_direct_absolute=yes
+ hardcode_libdir_separator=':'
+ link_all_deplibs=yes
+- file_list_spec='$wl-f,'
+- case $with_aix_soname,$aix_use_runtimelinking in
+- aix,*) ;; # traditional, no import file
+- svr4,* | *,yes) # use import file
+- # The Import File defines what to hardcode.
+- hardcode_direct=no
+- hardcode_direct_absolute=no
+- ;;
+- esac
++ file_list_spec='${wl}-f,'
+
+- if test yes = "$GCC"; then
++ if test "$GCC" = yes; then
+ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+- collect2name=`$CC -print-prog-name=collect2`
++ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+ then
+@@ -9562,42 +9276,35 @@
+ ;;
+ esac
+ shared_flag='-shared'
+- if test yes = "$aix_use_runtimelinking"; then
+- shared_flag="$shared_flag "'$wl-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
+ fi
+- # Need to ensure runtime linking is disabled for the traditional
+- # shared library, or the linker may eventually find shared libraries
+- # /with/ Import File - we do not want to mix them.
+- shared_flag_aix='-shared'
+- shared_flag_svr4='-shared $wl-G'
+ else
+ # not using gcc
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+- if test yes = "$aix_use_runtimelinking"; then
+- shared_flag='$wl-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag='${wl}-G'
+ else
+- shared_flag='$wl-bM:SRE'
++ shared_flag='${wl}-bM:SRE'
+ fi
+- shared_flag_aix='$wl-bM:SRE'
+- shared_flag_svr4='$wl-G'
+ fi
+ fi
+
+- export_dynamic_flag_spec='$wl-bexpall'
++ export_dynamic_flag_spec='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ always_export_symbols=yes
+- if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
++ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ allow_undefined_flag='-berok'
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- if test set = "${lt_cv_aix_libpath+set}"; then
++ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+ else
+ if ${lt_cv_aix_libpath_+:} false; then :
+@@ -9632,7 +9339,7 @@
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$lt_cv_aix_libpath_"; then
+- lt_cv_aix_libpath_=/usr/lib:/lib
++ lt_cv_aix_libpath_="/usr/lib:/lib"
+ fi
+
+ fi
+@@ -9640,17 +9347,17 @@
+ 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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
++ 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"
+ else
+- if test ia64 = "$host_cpu"; then
+- hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
++ if test "$host_cpu" = ia64; then
++ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ allow_undefined_flag="-z nodefs"
+- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- if test set = "${lt_cv_aix_libpath+set}"; then
++ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+ else
+ if ${lt_cv_aix_libpath_+:} false; then :
+@@ -9685,7 +9392,7 @@
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$lt_cv_aix_libpath_"; then
+- lt_cv_aix_libpath_=/usr/lib:/lib
++ lt_cv_aix_libpath_="/usr/lib:/lib"
+ fi
+
+ fi
+@@ -9693,33 +9400,21 @@
+ aix_libpath=$lt_cv_aix_libpath_
+ fi
+
+- hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
++ hardcode_libdir_flag_spec='${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.
+- no_undefined_flag=' $wl-bernotok'
+- allow_undefined_flag=' $wl-berok'
+- if test yes = "$with_gnu_ld"; then
++ no_undefined_flag=' ${wl}-bernotok'
++ allow_undefined_flag=' ${wl}-berok'
++ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+- whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
++ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ whole_archive_flag_spec='$convenience'
+ fi
+ archive_cmds_need_lc=yes
+- archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+- # -brtl affects multiple linker settings, -berok does not and is overridden later
+- compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+- if test svr4 != "$with_aix_soname"; then
+- # This is similar to how AIX traditionally builds its shared libraries.
+- archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+- fi
+- if test aix != "$with_aix_soname"; then
+- archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+- else
+- # used by -dlpreopen to get the symbols
+- archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+- fi
+- archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
++ # This is similar to how AIX traditionally builds its shared libraries.
++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+@@ -9728,7 +9423,7 @@
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds=''
+ ;;
+ m68k)
+@@ -9758,17 +9453,16 @@
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=.dll
++ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+- archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+- archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+- cp "$export_symbols" "$output_objdir/$soname.def";
+- echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+- else
+- $SED -e '\''s/^/-link -EXPORT:/'\'' < $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='
++ 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
+@@ -9777,18 +9471,18 @@
+ # 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'
++ 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
+@@ -9797,7 +9491,7 @@
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=.dll
++ 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.
+@@ -9816,24 +9510,24 @@
+ hardcode_direct=no
+ hardcode_automatic=yes
+ hardcode_shlibpath_var=unsupported
+- if test yes = "$lt_cv_ld_force_load"; then
+- whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++ if test "$lt_cv_ld_force_load" = "yes"; then
++ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+ else
+ whole_archive_flag_spec=''
+ fi
+ link_all_deplibs=yes
+- allow_undefined_flag=$_lt_dar_allow_undefined
++ allow_undefined_flag="$_lt_dar_allow_undefined"
+ case $cc_basename in
+- ifort*|nagfor*) _lt_dar_can_shared=yes ;;
++ ifort*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+- if test yes = "$_lt_dar_can_shared"; then
++ if test "$_lt_dar_can_shared" = "yes"; then
+ output_verbose_link_cmd=func_echo_all
+- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+- archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+- module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+ else
+ ld_shlibs=no
+@@ -9875,33 +9569,33 @@
+ ;;
+
+ hpux9*)
+- if test yes = "$GCC"; then
+- archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
++ if test "$GCC" = yes; then
++ 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 "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
++ 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
+- hardcode_libdir_flag_spec='$wl+b $wl$libdir'
++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+- export_dynamic_flag_spec='$wl-E'
++ export_dynamic_flag_spec='${wl}-E'
+ ;;
+
+ hpux10*)
+- if test yes,no = "$GCC,$with_gnu_ld"; then
+- archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++ 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
+- if test no = "$with_gnu_ld"; then
+- hardcode_libdir_flag_spec='$wl+b $wl$libdir'
++ if test "$with_gnu_ld" = no; then
++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+ hardcode_direct_absolute=yes
+- export_dynamic_flag_spec='$wl-E'
++ export_dynamic_flag_spec='${wl}-E'
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+@@ -9909,25 +9603,25 @@
+ ;;
+
+ hpux11*)
+- if test yes,no = "$GCC,$with_gnu_ld"; then
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
+- archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+- archive_cmds='$CC -shared $pic_flag $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 $pic_flag $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
+ case $host_cpu in
+ hppa*64*)
+- archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+- archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+
+@@ -9939,7 +9633,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler__b=no
+- save_LDFLAGS=$LDFLAGS
++ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -b"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+@@ -9958,14 +9652,14 @@
+ fi
+ fi
+ $RM -r conftest*
+- LDFLAGS=$save_LDFLAGS
++ LDFLAGS="$save_LDFLAGS"
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+ $as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+-if test yes = "$lt_cv_prog_compiler__b"; then
+- archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++if test x"$lt_cv_prog_compiler__b" = xyes; then
++ archive_cmds='$CC -b ${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
+@@ -9973,8 +9667,8 @@
+ ;;
+ esac
+ fi
+- if test no = "$with_gnu_ld"; then
+- hardcode_libdir_flag_spec='$wl+b $wl$libdir'
++ if test "$with_gnu_ld" = no; then
++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+
+ case $host_cpu in
+@@ -9985,7 +9679,7 @@
+ *)
+ hardcode_direct=yes
+ hardcode_direct_absolute=yes
+- export_dynamic_flag_spec='$wl-E'
++ export_dynamic_flag_spec='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+@@ -9996,8 +9690,8 @@
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+- if test yes = "$GCC"; then
+- 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'
++ if test "$GCC" = yes; then
++ 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.
+@@ -10007,8 +9701,8 @@
+ 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"
++ 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) { return 0; }
+@@ -10020,34 +9714,24 @@
+ 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 yes = "$lt_cv_irix_exported_symbol"; 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'
++ 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'
++ 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'
+ fi
+ archive_cmds_need_lc='no'
+- hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ inherit_rpath=yes
+ link_all_deplibs=yes
+ ;;
+
+- linux*)
+- case $cc_basename in
+- tcc*)
+- # Fabrice Bellard et al's Tiny C Compiler
+- ld_shlibs=yes
+- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- ;;
+- esac
+- ;;
+-
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+@@ -10062,7 +9746,7 @@
+ newsos6)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+- hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_shlibpath_var=no
+ ;;
+@@ -10070,19 +9754,27 @@
+ *nto* | *qnx*)
+ ;;
+
+- openbsd* | bitrig*)
++ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ hardcode_direct_absolute=yes
+- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+- hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+- export_dynamic_flag_spec='$wl-E'
++ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec='${wl}-E'
+ else
+- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec='$wl-rpath,$libdir'
++ case $host_os in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec='-R$libdir'
++ ;;
++ *)
++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ ;;
++ esac
+ fi
+ else
+ ld_shlibs=no
+@@ -10093,53 +9785,33 @@
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+- shrext_cmds=.dll
+- archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+- $ECHO EXPORTS >> $output_objdir/$libname.def~
+- prefix_cmds="$SED"~
+- if test EXPORTS = "`$SED 1q $export_symbols`"; then
+- prefix_cmds="$prefix_cmds -e 1d";
+- fi~
+- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+- emximp -o $lib $output_objdir/$libname.def'
+- old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+- enable_shared_with_static_runtimes=yes
++ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++ old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+- if test yes = "$GCC"; then
+- allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+- archive_cmds='$CC -shared$allow_undefined_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'
++ if test "$GCC" = yes; then
++ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++ archive_cmds='$CC -shared${allow_undefined_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'
+ else
+ allow_undefined_flag=' -expect_unresolved \*'
+- archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ fi
+ archive_cmds_need_lc='no'
+- hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ ;;
+
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+- if test yes = "$GCC"; then
+- allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+- 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'
++ if test "$GCC" = yes; then
++ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++ 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 \*'
+- archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec='-rpath $libdir'
+@@ -10150,24 +9822,24 @@
+
+ solaris*)
+ no_undefined_flag=' -z defs'
+- if test yes = "$GCC"; then
+- wlarc='$wl'
+- archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ wlarc='${wl}'
++ 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 $pic_flag $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"*)
+ wlarc=''
+- archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ ;;
+ *)
+- wlarc='$wl'
+- archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
++ wlarc='${wl}'
++ archive_cmds='$CC -G${allow_undefined_flag} -h $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 -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ ;;
+ esac
+ fi
+@@ -10177,11 +9849,11 @@
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+- # but understands '-z linker_flag'. GCC discards it without '$wl',
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- if test yes = "$GCC"; then
+- whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
++ if test "$GCC" = yes; then
++ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+ fi
+@@ -10191,10 +9863,10 @@
+ ;;
+
+ sunos4*)
+- if test sequent = "$host_vendor"; then
++ if test "x$host_vendor" = xsequent; then
+ # Use $CC to link under sequent, because it throws in some extra .o
+ # files that make .init and .fini sections work.
+- archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+@@ -10243,43 +9915,43 @@
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+- no_undefined_flag='$wl-z,text'
++ no_undefined_flag='${wl}-z,text'
+ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
+ runpath_var='LD_RUN_PATH'
+
+- if test yes = "$GCC"; then
+- archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+- # Note: We CANNOT use -z defs as we might desire, because we do not
++ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+- no_undefined_flag='$wl-z,text'
+- allow_undefined_flag='$wl-z,nodefs'
++ no_undefined_flag='${wl}-z,text'
++ allow_undefined_flag='${wl}-z,nodefs'
+ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
+- hardcode_libdir_flag_spec='$wl-R,$libdir'
++ hardcode_libdir_flag_spec='${wl}-R,$libdir'
+ hardcode_libdir_separator=':'
+ link_all_deplibs=yes
+- export_dynamic_flag_spec='$wl-Bexport'
++ export_dynamic_flag_spec='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+- if test yes = "$GCC"; then
+- archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes; then
++ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+@@ -10294,10 +9966,10 @@
+ ;;
+ esac
+
+- if test sni = "$host_vendor"; then
++ if test x$host_vendor = xsni; then
+ case $host in
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+- export_dynamic_flag_spec='$wl-Blargedynsym'
++ export_dynamic_flag_spec='${wl}-Blargedynsym'
+ ;;
+ esac
+ fi
+@@ -10305,7 +9977,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+ $as_echo "$ld_shlibs" >&6; }
+-test no = "$ld_shlibs" && can_build_shared=no
++test "$ld_shlibs" = no && can_build_shared=no
+
+ with_gnu_ld=$with_gnu_ld
+
+@@ -10331,7 +10003,7 @@
+ # Assume -lc should be added
+ archive_cmds_need_lc=yes
+
+- if test yes,yes = "$GCC,$enable_shared"; then
++ if test "$enable_shared" = yes && test "$GCC" = yes; then
+ case $archive_cmds in
+ *'~'*)
+ # FIXME: we may have to deal with multi-command sequences.
+@@ -10546,14 +10218,14 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+ $as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ case $host_os in
+- darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+- *) lt_awk_arg='/^libraries:/' ;;
++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+ case $host_os in
+- mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+- *) lt_sed_strip_eq='s|=/|/|g' ;;
++ mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
++ *) lt_sed_strip_eq="s,=/,/,g" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+ case $lt_search_path_spec in
+@@ -10569,35 +10241,28 @@
+ ;;
+ esac
+ # Ok, now we have the path, separated by spaces, we can step through it
+- # and add multilib dir if necessary...
++ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+- lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+- # ...but if some path component already ends with the multilib dir we assume
+- # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+- case "$lt_multi_os_dir; $lt_search_path_spec " in
+- "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+- lt_multi_os_dir=
+- ;;
+- esac
++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ for lt_sys_path in $lt_search_path_spec; do
+- if test -d "$lt_sys_path$lt_multi_os_dir"; then
+- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+- elif test -n "$lt_multi_os_dir"; then
++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++ else
+ test -d "$lt_sys_path" && \
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+-BEGIN {RS = " "; FS = "/|\n";} {
+- lt_foo = "";
+- lt_count = 0;
++BEGIN {RS=" "; FS="/|\n";} {
++ lt_foo="";
++ lt_count=0;
+ for (lt_i = NF; lt_i > 0; lt_i--) {
+ if ($lt_i != "" && $lt_i != ".") {
+ if ($lt_i == "..") {
+ lt_count++;
+ } else {
+ if (lt_count == 0) {
+- lt_foo = "/" $lt_i lt_foo;
++ lt_foo="/" $lt_i lt_foo;
+ } else {
+ lt_count--;
+ }
+@@ -10611,7 +10276,7 @@
+ # for these hosts.
+ case $host_os in
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+- $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
++ $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+ esac
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+ else
+@@ -10620,7 +10285,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext_cmds=.so
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -10637,16 +10302,14 @@
+ # flags to be left without arguments
+ need_version=unknown
+
+-
+-
+ case $host_os in
+ aix3*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+ # AIX 3 has no versioning support, so we append a major version to the name.
+- soname_spec='$libname$release$shared_ext$major'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+ aix[4-9]*)
+@@ -10654,91 +10317,41 @@
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+- if test ia64 = "$host_cpu"; then
++ if test "$host_cpu" = ia64; then
+ # AIX 5 supports IA64
+- library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ else
+ # With GCC up to 2.95.x, collect2 would create an import file
+ # for dependence libraries. The import file would start with
+- # the line '#! .'. This would cause the generated library to
+- # depend on '.', always an invalid library. This was fixed in
++ # the line `#! .'. This would cause the generated library to
++ # depend on `.', always an invalid library. This was fixed in
+ # development snapshots of GCC prior to 3.0.
+ case $host_os in
+ aix4 | aix4.[01] | aix4.[01].*)
+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+ echo ' yes '
+- echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ :
+ else
+ can_build_shared=no
+ fi
+ ;;
+ esac
+- # Using Import Files as archive members, it is possible to support
+- # filename-based versioning of shared library archives on AIX. While
+- # this would work for both with and without runtime linking, it will
+- # prevent static linking of such archives. So we do filename-based
+- # shared library versioning with .so extension only, which is used
+- # when both runtime linking and shared linking is enabled.
+- # Unfortunately, runtime linking may impact performance, so we do
+- # not want this to be the default eventually. Also, we use the
+- # versioned .so libs for executables only if there is the -brtl
+- # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+- # To allow for filename-based versioning support, we need to create
+- # libNAME.so.V as an archive file, containing:
+- # *) an Import File, referring to the versioned filename of the
+- # archive as well as the shared archive member, telling the
+- # bitwidth (32 or 64) of that shared object, and providing the
+- # list of exported symbols of that shared object, eventually
+- # decorated with the 'weak' keyword
+- # *) the shared object with the F_LOADONLY flag set, to really avoid
+- # it being seen by the linker.
+- # At run time we better use the real file rather than another symlink,
+- # but for link time we create the symlink libNAME.so -> libNAME.so.V
+-
+- case $with_aix_soname,$aix_use_runtimelinking in
+- # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # soname into executable. Probably we can add versioning support to
+ # collect2, so additional links can be useful in future.
+- aix,yes) # traditional libtool
+- dynamic_linker='AIX unversionable lib.so'
++ if test "$aix_use_runtimelinking" = yes; then
+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+ # instead of lib<name>.a to let people know that these are not
+ # typical AIX shared libraries.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- ;;
+- aix,no) # traditional AIX only
+- dynamic_linker='AIX lib.a(lib.so.V)'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ else
+ # We preserve .a as extension for shared libraries through AIX4.2
+ # and later when we are not doing run time linking.
+- library_names_spec='$libname$release.a $libname.a'
+- soname_spec='$libname$release$shared_ext$major'
+- ;;
+- svr4,*) # full svr4 only
+- dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+- library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+- # We do not specify a path in Import Files, so LIBPATH fires.
+- shlibpath_overrides_runpath=yes
+- ;;
+- *,yes) # both, prefer svr4
+- dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+- library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+- # unpreferred sharedlib libNAME.a needs extra handling
+- postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+- postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+- # We do not specify a path in Import Files, so LIBPATH fires.
+- shlibpath_overrides_runpath=yes
+- ;;
+- *,no) # both, prefer aix
+- dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+- library_names_spec='$libname$release.a $libname.a'
+- soname_spec='$libname$release$shared_ext$major'
+- # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+- postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+- postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+- ;;
+- esac
++ library_names_spec='${libname}${release}.a $libname.a'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ fi
+ shlibpath_var=LIBPATH
+ fi
+ ;;
+@@ -10748,18 +10361,18 @@
+ powerpc)
+ # Since July 2007 AmigaOS4 officially supports .so libraries.
+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ ;;
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
+ ;;
+
+ beos*)
+- library_names_spec='$libname$shared_ext'
++ library_names_spec='${libname}${shared_ext}'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ ;;
+@@ -10767,8 +10380,8 @@
+ bsdi[45]*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+@@ -10780,7 +10393,7 @@
+
+ cygwin* | mingw* | pw32* | cegcc*)
+ version_type=windows
+- shrext_cmds=.dll
++ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+@@ -10789,8 +10402,8 @@
+ # gcc
+ library_names_spec='$libname.dll.a'
+ # 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'\''`~
++ 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~
+@@ -10806,17 +10419,17 @@
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+- soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+- soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
++ 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'
+@@ -10825,8 +10438,8 @@
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+- soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+- library_names_spec='$libname.dll.lib'
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ library_names_spec='${libname}.dll.lib'
+
+ case $build_os in
+ mingw*)
+@@ -10853,7 +10466,7 @@
+ 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
++ 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'`
+@@ -10866,8 +10479,8 @@
+ 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'\''`~
++ 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'
+@@ -10880,7 +10493,7 @@
+
+ *)
+ # Assume MSVC wrapper
+- library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ dynamic_linker='Win32 ld.exe'
+ ;;
+ esac
+@@ -10893,8 +10506,8 @@
+ version_type=darwin
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+- soname_spec='$libname$release$major$shared_ext'
++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++ soname_spec='${libname}${release}${major}$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+@@ -10907,8 +10520,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+@@ -10926,13 +10539,12 @@
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+ freebsd-*)
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
+ ;;
+ esac
+@@ -10957,15 +10569,26 @@
+ esac
+ ;;
+
++gnu*)
++ version_type=linux # correct to gnu/linux during the next big refactor
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ haiku*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LIBRARY_PATH
+- shlibpath_overrides_runpath=no
++ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+@@ -10983,15 +10606,14 @@
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
+- if test 32 = "$HPUX_IA64_MODE"; then
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ if test "X$HPUX_IA64_MODE" = X32; then
+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+- sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+ else
+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+- sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+ fi
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
+ shrext_cmds='.sl'
+@@ -10999,8 +10621,8 @@
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+@@ -11009,8 +10631,8 @@
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+@@ -11023,8 +10645,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+@@ -11035,7 +10657,7 @@
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+ *)
+- if test yes = "$lt_cv_prog_gnu_ld"; then
++ if test "$lt_cv_prog_gnu_ld" = yes; then
+ version_type=linux # correct to gnu/linux during the next big refactor
+ else
+ version_type=irix
+@@ -11043,8 +10665,8 @@
+ esac
+ need_lib_prefix=no
+ need_version=no
+- soname_spec='$libname$release$shared_ext$major'
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ case $host_os in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+@@ -11063,8 +10685,8 @@
+ esac
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+ shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+- sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ hardcode_into_libs=yes
+ ;;
+
+@@ -11073,33 +10695,13 @@
+ dynamic_linker=no
+ ;;
+
+-linux*android*)
+- version_type=none # Android doesn't support versioned libraries.
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='$libname$release$shared_ext'
+- soname_spec='$libname$release$shared_ext'
+- finish_cmds=
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+-
+- # This implies no fast_install, which is unacceptable.
+- # Some rework will be needed to allow for fast_install
+- # before this can be enabled.
+- hardcode_into_libs=yes
+-
+- dynamic_linker='Android linker'
+- # Don't embed -rpath directories since the linker doesn't support them.
+- hardcode_libdir_flag_spec='-L$libdir'
+- ;;
+-
+ # This must be glibc/ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+@@ -11143,15 +10745,14 @@
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # Ideally, we could use ldconfig to report *all* directores which are
+- # searched for libraries, however this is still not possible. Aside from not
+- # being certain /sbin/ldconfig is available, command
+- # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+- # even though it is searched at run-time. Try to do the best guess by
+- # appending ld.so.conf contents (and includes) to the search path.
++ # Add ABI-specific directories to the system library path.
++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
++
++ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -11168,12 +10769,12 @@
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -11183,7 +10784,7 @@
+
+ newsos6)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
+@@ -11192,68 +10793,58 @@
+ version_type=qnx
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='ldqnx.so'
+ ;;
+
+-openbsd* | bitrig*)
++openbsd*)
+ version_type=sunos
+- sys_lib_dlsearch_path_spec=/usr/lib
++ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+- need_version=no
+- else
+- need_version=yes
+- fi
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ case $host_os in
++ openbsd2.[89] | openbsd2.[89].*)
++ shlibpath_overrides_runpath=no
++ ;;
++ *)
++ shlibpath_overrides_runpath=yes
++ ;;
++ esac
++ else
++ shlibpath_overrides_runpath=yes
++ fi
+ ;;
+
+ os2*)
+ libname_spec='$name'
+- version_type=windows
+- shrext_cmds=.dll
+- need_version=no
++ shrext_cmds=".dll"
+ need_lib_prefix=no
+- # OS/2 can only load a DLL with a base name of 8 characters or less.
+- soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+- v=$($ECHO $release$versuffix | tr -d .-);
+- n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+- $ECHO $n$v`$shared_ext'
+- library_names_spec='${libname}_dll.$libext'
++ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+- shlibpath_var=BEGINLIBPATH
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+- 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~
+- chmod a+x \$dldir/$dlname~
+- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+- fi'
+- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+- dlpath=$dir/\$dldll~
+- $RM \$dlpath'
++ shlibpath_var=LIBPATH
+ ;;
+
+ osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+- soname_spec='$libname$release$shared_ext$major'
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+ rdos*)
+@@ -11264,8 +10855,8 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+@@ -11275,11 +10866,11 @@
+
+ sunos4*)
+ version_type=sunos
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+@@ -11287,8 +10878,8 @@
+
+ sysv4 | sysv4.3*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_vendor in
+ sni)
+@@ -11309,24 +10900,24 @@
+ ;;
+
+ sysv4*MP*)
+- if test -d /usr/nec; then
++ if test -d /usr/nec ;then
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+- soname_spec='$libname$shared_ext.$major'
++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+- version_type=sco
++ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+- if test yes = "$with_gnu_ld"; then
++ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+@@ -11344,7 +10935,7 @@
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+@@ -11352,8 +10943,8 @@
+
+ uts4*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+- soname_spec='$libname$release$shared_ext$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+@@ -11363,35 +10954,20 @@
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+ $as_echo "$dynamic_linker" >&6; }
+-test no = "$dynamic_linker" && can_build_shared=no
++test "$dynamic_linker" = no && can_build_shared=no
+
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test yes = "$GCC"; then
++if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+
+-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+- sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ fi
+-
+-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+- sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+ fi
+
+-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+-
+-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+-
+-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+-
+-
+-
+-
+-
+-
+
+
+
+@@ -11488,15 +11064,15 @@
+ hardcode_action=
+ if test -n "$hardcode_libdir_flag_spec" ||
+ test -n "$runpath_var" ||
+- test yes = "$hardcode_automatic"; then
++ test "X$hardcode_automatic" = "Xyes" ; then
+
+ # We can hardcode non-existent directories.
+- if test no != "$hardcode_direct" &&
++ if test "$hardcode_direct" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+- ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+- test no != "$hardcode_minus_L"; then
++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
++ test "$hardcode_minus_L" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action=relink
+ else
+@@ -11511,12 +11087,12 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+ $as_echo "$hardcode_action" >&6; }
+
+-if test relink = "$hardcode_action" ||
+- test yes = "$inherit_rpath"; then
++if test "$hardcode_action" = relink ||
++ test "$inherit_rpath" = yes; then
+ # Fast installation is not supported
+ enable_fast_install=no
+-elif test yes = "$shlibpath_overrides_runpath" ||
+- test no = "$enable_shared"; then
++elif test "$shlibpath_overrides_runpath" = yes ||
++ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+ fi
+@@ -11526,7 +11102,7 @@
+
+
+
+- if test yes != "$enable_dlopen"; then
++ if test "x$enable_dlopen" != xyes; then
+ enable_dlopen=unknown
+ enable_dlopen_self=unknown
+ enable_dlopen_self_static=unknown
+@@ -11536,23 +11112,23 @@
+
+ case $host_os in
+ beos*)
+- lt_cv_dlopen=load_add_on
++ lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ ;;
+
+ mingw* | pw32* | cegcc*)
+- lt_cv_dlopen=LoadLibrary
++ lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen_libs=
+ ;;
+
+ cygwin*)
+- lt_cv_dlopen=dlopen
++ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
+
+ darwin*)
+- # if libdl is installed we need to link against it
++ # if libdl is installed we need to link against it
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+ if ${ac_cv_lib_dl_dlopen+:} false; then :
+@@ -11590,10 +11166,10 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+ if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+- lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+
+- lt_cv_dlopen=dyld
++ lt_cv_dlopen="dyld"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+
+@@ -11601,18 +11177,10 @@
+
+ ;;
+
+- tpf*)
+- # Don't try to run any link tests for TPF. We know it's impossible
+- # because TPF is a cross-compiler, and we know how we open DSOs.
+- lt_cv_dlopen=dlopen
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=no
+- ;;
+-
+ *)
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+ if test "x$ac_cv_func_shl_load" = xyes; then :
+- lt_cv_dlopen=shl_load
++ lt_cv_dlopen="shl_load"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
+@@ -11651,11 +11219,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+ if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+- lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+ if test "x$ac_cv_func_dlopen" = xyes; then :
+- lt_cv_dlopen=dlopen
++ lt_cv_dlopen="dlopen"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+@@ -11694,7 +11262,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+ if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+- lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+ $as_echo_n "checking for dlopen in -lsvld... " >&6; }
+@@ -11733,7 +11301,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+ $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+ if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+- lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+ $as_echo_n "checking for dld_link in -ldld... " >&6; }
+@@ -11772,7 +11340,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+ $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+ if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+- lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+
+
+@@ -11793,21 +11361,21 @@
+ ;;
+ esac
+
+- if test no = "$lt_cv_dlopen"; then
+- enable_dlopen=no
+- else
++ if test "x$lt_cv_dlopen" != xno; then
+ enable_dlopen=yes
++ else
++ enable_dlopen=no
+ fi
+
+ case $lt_cv_dlopen in
+ dlopen)
+- save_CPPFLAGS=$CPPFLAGS
+- test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++ save_CPPFLAGS="$CPPFLAGS"
++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+- save_LDFLAGS=$LDFLAGS
++ save_LDFLAGS="$LDFLAGS"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+- save_LIBS=$LIBS
++ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+@@ -11815,7 +11383,7 @@
+ if ${lt_cv_dlopen_self+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+- if test yes = "$cross_compiling"; then :
++ if test "$cross_compiling" = yes; then :
+ lt_cv_dlopen_self=cross
+ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+@@ -11862,9 +11430,9 @@
+ # endif
+ #endif
+
+-/* When -fvisibility=hidden is used, assume the code has been annotated
++/* 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))
++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+ int fnord () __attribute__((visibility("default")));
+ #endif
+
+@@ -11894,7 +11462,7 @@
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+@@ -11914,14 +11482,14 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+ $as_echo "$lt_cv_dlopen_self" >&6; }
+
+- if test yes = "$lt_cv_dlopen_self"; then
++ if test "x$lt_cv_dlopen_self" = xyes; then
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+ $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+ if ${lt_cv_dlopen_self_static+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+- if test yes = "$cross_compiling"; then :
++ if test "$cross_compiling" = yes; then :
+ lt_cv_dlopen_self_static=cross
+ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+@@ -11968,9 +11536,9 @@
+ # endif
+ #endif
+
+-/* When -fvisibility=hidden is used, assume the code has been annotated
++/* 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))
++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+ int fnord () __attribute__((visibility("default")));
+ #endif
+
+@@ -12000,7 +11568,7 @@
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+@@ -12021,9 +11589,9 @@
+ $as_echo "$lt_cv_dlopen_self_static" >&6; }
+ fi
+
+- CPPFLAGS=$save_CPPFLAGS
+- LDFLAGS=$save_LDFLAGS
+- LIBS=$save_LIBS
++ CPPFLAGS="$save_CPPFLAGS"
++ LDFLAGS="$save_LDFLAGS"
++ LIBS="$save_LIBS"
+ ;;
+ esac
+
+@@ -12067,7 +11635,7 @@
+ # FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+- if test -n "$STRIP"; then
++ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+@@ -12095,7 +11663,7 @@
+
+
+
+- # Report what library types will actually be built
++ # Report which library types will actually be built
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+ $as_echo_n "checking if libtool supports shared libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+@@ -12103,13 +11671,13 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+ $as_echo_n "checking whether to build shared libraries... " >&6; }
+- test no = "$can_build_shared" && enable_shared=no
++ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+- test yes = "$enable_shared" && enable_static=no
++ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+@@ -12117,12 +11685,8 @@
+ ;;
+
+ aix[4-9]*)
+- if test ia64 != "$host_cpu"; then
+- case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+- yes,aix,yes) ;; # shared object as lib.so file only
+- yes,svr4,*) ;; # shared object as lib.so archive member only
+- yes,*) enable_static=no ;; # shared object in lib.a archive as well
+- esac
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+ esac
+@@ -12132,7 +11696,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+ $as_echo_n "checking whether to build static libraries... " >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+- test yes = "$enable_shared" || enable_static=yes
++ test "$enable_shared" = yes || enable_static=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+ $as_echo "$enable_static" >&6; }
+
+@@ -12146,7 +11710,7 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-CC=$lt_save_CC
++CC="$lt_save_CC"
+
+
+
+@@ -16842,7 +16406,6 @@
+ enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+-shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
+ SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+ PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+@@ -16892,13 +16455,10 @@
+ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+ 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_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $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"`'
+-lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $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"`'
+-lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $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"`'
+@@ -16963,8 +16523,7 @@
+ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+ hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+ sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+-configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+-configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
++sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+ hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+ enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+ enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+@@ -17015,12 +16574,9 @@
+ compiler \
+ lt_cv_sys_global_symbol_pipe \
+ lt_cv_sys_global_symbol_to_cdecl \
+-lt_cv_sys_global_symbol_to_import \
+ lt_cv_sys_global_symbol_to_c_name_address \
+ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+-lt_cv_nm_interface \
+ nm_file_list_spec \
+-lt_cv_truncate_bin \
+ lt_prog_compiler_no_builtin_flag \
+ lt_prog_compiler_pic \
+ lt_prog_compiler_wl \
+@@ -17055,7 +16611,7 @@
+ striplib; do
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ *[\\\\\\\`\\"\\\$]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -17082,11 +16638,10 @@
+ postuninstall_cmds \
+ finish_cmds \
+ sys_lib_search_path_spec \
+-configure_time_dlsearch_path \
+-configure_time_lt_sys_library_path; do
++sys_lib_dlsearch_path_spec; do
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ *[\\\\\\\`\\"\\\$]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -17095,16 +16650,19 @@
+ done
+
+ ac_aux_dir='$ac_aux_dir'
++xsi_shell='$xsi_shell'
++lt_shell_append='$lt_shell_append'
+
+-# See if we are running on zsh, and set the options that allow our
++# See if we are running on zsh, and set the options which allow our
+ # commands through without removal of \ escapes INIT.
+-if test -n "\${ZSH_VERSION+set}"; then
++if test -n "\${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+
+
+ PACKAGE='$PACKAGE'
+ VERSION='$VERSION'
++ TIMESTAMP='$TIMESTAMP'
+ RM='$RM'
+ ofile='$ofile'
+
+@@ -17817,52 +17375,55 @@
+ ;;
+ "libtool":C)
+
+- # See if we are running on zsh, and set the options that allow our
++ # See if we are running on zsh, and set the options which allow our
+ # commands through without removal of \ escapes.
+- if test -n "${ZSH_VERSION+set}"; then
++ if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+
+- cfgfile=${ofile}T
++ cfgfile="${ofile}T"
+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+ $RM "$cfgfile"
+
+ cat <<_LT_EOF >> "$cfgfile"
+ #! $SHELL
+-# Generated automatically by $as_me ($PACKAGE) $VERSION
+-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+-
+-# Provide generalized library-building support services.
+-# Written by Gordon Matzigkeit, 1996
+
+-# Copyright (C) 2014 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.
+-
+-# GNU Libtool is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of of the License, or
+-# (at your option) any later version.
++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# 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, 2010, 2011 Free Software
++# Foundation, Inc.
++# Written by Gordon Matzigkeit, 1996
++#
++# This file is part of GNU Libtool.
+ #
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program or library that is built
+-# using GNU Libtool, you may include this file under the same
+-# distribution terms that you use for the rest of that program.
++# GNU Libtool is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License as
++# published by the Free Software Foundation; either version 2 of
++# the License, or (at your option) any later version.
+ #
+-# GNU Libtool is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
++# As a special exception to the GNU General Public License,
++# if you distribute this file as part of a program or library that
++# is built using GNU Libtool, you may include this file under the
++# same distribution terms that you use for the rest of that program.
++#
++# GNU Libtool is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program. If not, see <http://www.gnu.org/licenses/>.
++# along with GNU Libtool; see the file COPYING. If not, a copy
++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
++# obtained by writing to the Free Software Foundation, Inc.,
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+ # The names of the tagged configurations supported by this script.
+-available_tags=''
+-
+-# Configured defaults for sys_lib_dlsearch_path munging.
+-: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
++available_tags=""
+
+ # ### BEGIN LIBTOOL CONFIG
+
+@@ -17882,9 +17443,6 @@
+ # Whether or not to optimize for fast installation.
+ fast_install=$enable_fast_install
+
+-# Shared archive member basename,for filename based shared library versioning on AIX.
+-shared_archive_member_spec=$shared_archive_member_spec
+-
+ # Shell to use when invoking shell scripts.
+ SHELL=$lt_SHELL
+
+@@ -18002,27 +17560,18 @@
+ # Transform the output of nm in a proper C declaration.
+ global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+-# Transform the output of nm into a list of symbols to manually relocate.
+-global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+-
+ # Transform the output of nm in a C name address pair.
+ 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
+
+-# The name lister interface.
+-nm_interface=$lt_lt_cv_nm_interface
+-
+ # 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 where our libraries should be installed.
++# The root where to search for dependent libraries,and in which our libraries should be installed.
+ lt_sysroot=$lt_sysroot
+
+-# Command to truncate a binary pipe.
+-lt_truncate_bin=$lt_lt_cv_truncate_bin
+-
+ # The name of the directory that contains temporary libtool files.
+ objdir=$objdir
+
+@@ -18113,11 +17662,8 @@
+ # Compile-time system search path for libraries.
+ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+-# Detected run-time system search path for libraries.
+-sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+-
+-# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+-configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
++# Run-time system search path for libraries.
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Whether dlopen is supported.
+ dlopen_support=$enable_dlopen
+@@ -18210,13 +17756,13 @@
+ # Whether we need a single "-rpath" flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+ # DIR into the resulting binary.
+ hardcode_direct=$hardcode_direct
+
+-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+ # DIR into the resulting binary and the resulting library dependency is
+-# "absolute",i.e impossible to change by setting \$shlibpath_var if the
++# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+ # library is relocated.
+ hardcode_direct_absolute=$hardcode_direct_absolute
+
+@@ -18268,72 +17814,13 @@
+
+ _LT_EOF
+
+- cat <<'_LT_EOF' >> "$cfgfile"
+-
+-# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+-
+-# func_munge_path_list VARIABLE PATH
+-# -----------------------------------
+-# VARIABLE is name of variable containing _space_ separated list of
+-# directories to be munged by the contents of PATH, which is string
+-# having a format:
+-# "DIR[:DIR]:"
+-# string "DIR[ DIR]" will be prepended to VARIABLE
+-# ":DIR[:DIR]"
+-# string "DIR[ DIR]" will be appended to VARIABLE
+-# "DIRP[:DIRP]::[DIRA:]DIRA"
+-# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+-# "DIRA[ DIRA]" will be appended to VARIABLE
+-# "DIR[:DIR]"
+-# VARIABLE will be replaced by "DIR[ DIR]"
+-func_munge_path_list ()
+-{
+- case x$2 in
+- x)
+- ;;
+- *:)
+- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+- ;;
+- x:*)
+- eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+- ;;
+- *::*)
+- eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+- eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+- ;;
+- *)
+- eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+- ;;
+- esac
+-}
+-
+-
+-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+-func_cc_basename ()
+-{
+- for cc_temp in $*""; do
+- case $cc_temp in
+- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+- \-*) ;;
+- *) break;;
+- esac
+- done
+- func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+-}
+-
+-
+-# ### END FUNCTIONS SHARED WITH CONFIGURE
+-
+-_LT_EOF
+-
+ case $host_os in
+ aix3*)
+ cat <<\_LT_EOF >> "$cfgfile"
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+-if test set != "${COLLECT_NAMES+set}"; then
++if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+@@ -18342,7 +17829,7 @@
+ esac
+
+
+-ltmain=$ac_aux_dir/ltmain.sh
++ltmain="$ac_aux_dir/ltmain.sh"
+
+
+ # We use sed instead of cat because bash on DJGPP gets confused if
+@@ -18352,6 +17839,165 @@
+ 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 -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/include/config.h.in psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/include/config.h.in
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/include/config.h.in 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/include/config.h.in 2020-07-16 10:48:35.486141739 +0200
+@@ -266,7 +266,8 @@
+ /* Define which x86 cycle counter to use */
+ #undef LINUX86_CYCLE_RDTSCP
+
+-/* Define to the sub-directory where libtool stores uninstalled libraries. */
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++ */
+ #undef LT_OBJDIR
+
+ /* Define if use MMAP shared memory */
+@@ -311,6 +312,9 @@
+ /* Define if usleep needs a declaration */
+ #undef NEEDS_USLEEP_DECL
+
++/* Define to 1 if your C compiler doesn't accept -c and -o together. */
++#undef NO_MINUS_C_MINUS_O
++
+ /* Name of package */
+ #undef PACKAGE
+
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/Makefile.in psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/Makefile.in
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/mpl/Makefile.in 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/mpl/Makefile.in 2020-07-16 10:48:35.420135067 +0200
+@@ -64,17 +64,7 @@
+
+
+ VPATH = @srcdir@
+-am__is_gnu_make = { \
+- if test -z '$(MAKELEVEL)'; then \
+- false; \
+- elif test -n '$(MAKE_HOST)'; then \
+- true; \
+- elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+- true; \
+- else \
+- false; \
+- fi; \
+-}
++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+@@ -137,6 +127,26 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
++DIST_COMMON = $(srcdir)/src/Makefile.mk $(srcdir)/src/bt/Makefile.mk \
++ $(srcdir)/src/dbg/Makefile.mk $(srcdir)/src/env/Makefile.mk \
++ $(srcdir)/src/mem/Makefile.mk $(srcdir)/src/msg/Makefile.mk \
++ $(srcdir)/src/sock/Makefile.mk $(srcdir)/src/str/Makefile.mk \
++ $(srcdir)/src/thread/Makefile.mk \
++ $(srcdir)/src/timer/Makefile.mk $(srcdir)/src/shm/Makefile.mk \
++ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
++ $(top_srcdir)/configure $(am__configure_deps) \
++ $(top_srcdir)/include/config.h.in $(srcdir)/localdefs.in \
++ $(top_srcdir)/include/mpl_timer.h.in \
++ $(top_srcdir)/confdb/depcomp $(am__include_HEADERS_DIST) \
++ $(am__noinst_HEADERS_DIST) $(top_srcdir)/confdb/test-driver \
++ confdb/ar-lib confdb/compile confdb/config.guess \
++ confdb/config.rpath confdb/config.sub confdb/depcomp \
++ confdb/install-sh confdb/missing confdb/ltmain.sh \
++ $(top_srcdir)/confdb/ar-lib $(top_srcdir)/confdb/compile \
++ $(top_srcdir)/confdb/config.guess \
++ $(top_srcdir)/confdb/config.sub \
++ $(top_srcdir)/confdb/install-sh $(top_srcdir)/confdb/ltmain.sh \
++ $(top_srcdir)/confdb/missing
+ TESTS = $(am__EXEEXT_1)
+ check_PROGRAMS = $(am__EXEEXT_1)
+ subdir = .
+@@ -152,9 +162,6 @@
+ $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+- $(am__configure_deps) $(am__include_HEADERS_DIST) \
+- $(am__noinst_HEADERS_DIST) $(am__DIST_COMMON)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+ mkinstalldirs = $(install_sh) -d
+@@ -507,22 +514,6 @@
+ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/confdb/test-driver
+ TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+ $(TEST_LOG_FLAGS)
+-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/localdefs.in \
+- $(srcdir)/src/Makefile.mk $(srcdir)/src/bt/Makefile.mk \
+- $(srcdir)/src/dbg/Makefile.mk $(srcdir)/src/env/Makefile.mk \
+- $(srcdir)/src/mem/Makefile.mk $(srcdir)/src/msg/Makefile.mk \
+- $(srcdir)/src/shm/Makefile.mk $(srcdir)/src/sock/Makefile.mk \
+- $(srcdir)/src/str/Makefile.mk $(srcdir)/src/thread/Makefile.mk \
+- $(srcdir)/src/timer/Makefile.mk $(top_srcdir)/confdb/ar-lib \
+- $(top_srcdir)/confdb/compile $(top_srcdir)/confdb/config.guess \
+- $(top_srcdir)/confdb/config.sub $(top_srcdir)/confdb/depcomp \
+- $(top_srcdir)/confdb/install-sh $(top_srcdir)/confdb/ltmain.sh \
+- $(top_srcdir)/confdb/missing $(top_srcdir)/confdb/test-driver \
+- $(top_srcdir)/include/config.h.in \
+- $(top_srcdir)/include/mpl_timer.h.in confdb/ar-lib \
+- confdb/compile confdb/config.guess confdb/config.rpath \
+- confdb/config.sub confdb/depcomp confdb/install-sh \
+- confdb/ltmain.sh confdb/missing
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -580,7 +571,6 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+ MKDIR_P = @MKDIR_P@
+@@ -732,6 +722,7 @@
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign Makefile
++.PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+@@ -741,7 +732,7 @@
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
+ esac;
+-$(srcdir)/src/Makefile.mk $(srcdir)/src/bt/Makefile.mk $(srcdir)/src/dbg/Makefile.mk $(srcdir)/src/env/Makefile.mk $(srcdir)/src/mem/Makefile.mk $(srcdir)/src/msg/Makefile.mk $(srcdir)/src/sock/Makefile.mk $(srcdir)/src/str/Makefile.mk $(srcdir)/src/thread/Makefile.mk $(srcdir)/src/timer/Makefile.mk $(srcdir)/src/shm/Makefile.mk $(am__empty):
++$(srcdir)/src/Makefile.mk $(srcdir)/src/bt/Makefile.mk $(srcdir)/src/dbg/Makefile.mk $(srcdir)/src/env/Makefile.mk $(srcdir)/src/mem/Makefile.mk $(srcdir)/src/msg/Makefile.mk $(srcdir)/src/sock/Makefile.mk $(srcdir)/src/str/Makefile.mk $(srcdir)/src/thread/Makefile.mk $(srcdir)/src/timer/Makefile.mk $(srcdir)/src/shm/Makefile.mk:
+
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+@@ -753,8 +744,8 @@
+ $(am__aclocal_m4_deps):
+
+ include/config.h: include/stamp-h1
+- @test -f $@ || rm -f include/stamp-h1
+- @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) include/stamp-h1
++ @if test ! -f $@; then rm -f include/stamp-h1; else :; fi
++ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) include/stamp-h1; else :; fi
+
+ include/stamp-h1: $(top_srcdir)/include/config.h.in $(top_builddir)/config.status
+ @rm -f include/stamp-h1
+@@ -1179,7 +1170,7 @@
+ if test -n "$$am__remaking_logs"; then \
+ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+ "recursion detected" >&2; \
+- elif test -n "$$redo_logs"; then \
++ else \
+ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+ fi; \
+ if $(am__make_dryrun); then :; else \
+@@ -1355,7 +1346,7 @@
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r "$(distdir)"
+ dist-gzip: distdir
+- tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__post_remove_distdir)
+
+ dist-bzip2: distdir
+@@ -1371,17 +1362,11 @@
+ $(am__post_remove_distdir)
+
+ dist-tarZ: distdir
+- @echo WARNING: "Support for distribution archives compressed with" \
+- "legacy program 'compress' is deprecated." >&2
+- @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__post_remove_distdir)
+
+ dist-shar: distdir
+- @echo WARNING: "Support for shar distribution archives is" \
+- "deprecated." >&2
+- @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+- shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
++ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ $(am__post_remove_distdir)
+
+ dist-zip: distdir
+@@ -1399,7 +1384,7 @@
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lz*) \
+@@ -1409,23 +1394,22 @@
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+ chmod -R a-w $(distdir)
+ chmod u+w $(distdir)
+- mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
++ mkdir $(distdir)/_build $(distdir)/_inst
+ chmod a-w $(distdir)
+ test -d $(distdir)/_build || exit 0; \
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+ && am__cwd=`pwd` \
+- && $(am__cd) $(distdir)/_build/sub \
+- && ../../configure \
++ && $(am__cd) $(distdir)/_build \
++ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+- --srcdir=../.. --prefix="$$dc_install_base" \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+@@ -1699,8 +1683,6 @@
+ recheck tags tags-am uninstall uninstall-am \
+ uninstall-includeHEADERS uninstall-libLTLIBRARIES
+
+-.PRECIOUS: Makefile
+-
+
+ # --------------------------------------------------------------------------
+ .PHONY: coverage
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/test/Makefile.in psmpi-5.4.6-1/mpich2/src/mpi/romio/test/Makefile.in
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/test/Makefile.in 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/test/Makefile.in 2020-07-16 10:48:35.489259068 +0200
+@@ -24,17 +24,7 @@
+ # will not be built by default, but it will participate in "make distclean" and
+ # friends.
+
+-am__is_gnu_make = { \
+- if test -z '$(MAKELEVEL)'; then \
+- false; \
+- elif test -n '$(MAKE_HOST)'; then \
+- true; \
+- elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+- true; \
+- else \
+- false; \
+- fi; \
+-}
++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+@@ -100,6 +90,11 @@
+ noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_3)
+ @BUILD_F77_TESTS_TRUE@am__append_1 = $(FTESTS)
+ subdir = test
++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
++ $(srcdir)/misc.c.in $(srcdir)/large_file.c.in \
++ $(srcdir)/runtests.in $(srcdir)/fmisc.f.in \
++ $(srcdir)/fcoll_test.f.in $(srcdir)/pfcoll_test.f.in \
++ $(srcdir)/fperf.f.in $(top_srcdir)/confdb/depcomp README
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/confdb/aclocal_cc.m4 \
+ $(top_srcdir)/confdb/aclocal_check_visibility.m4 \
+@@ -114,7 +109,6 @@
+ $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+ CONFIG_CLEAN_FILES = misc.c large_file.c runtests fmisc.f fcoll_test.f \
+@@ -381,11 +375,6 @@
+ done | $(am__uniquify_input)`
+ ETAGS = etags
+ CTAGS = ctags
+-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/fcoll_test.f.in \
+- $(srcdir)/fmisc.f.in $(srcdir)/fperf.f.in \
+- $(srcdir)/large_file.c.in $(srcdir)/misc.c.in \
+- $(srcdir)/pfcoll_test.f.in $(srcdir)/runtests.in \
+- $(top_srcdir)/confdb/depcomp README
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ VPATH = @VPATH@
+ ACLOCAL = @ACLOCAL@
+@@ -446,6 +435,7 @@
+ HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+ HAVE_MPI_INFO = @HAVE_MPI_INFO@
+ HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
++IME_INSTALL_PATH = @IME_INSTALL_PATH@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -461,7 +451,6 @@
+ LL = @LL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+ MAINT = @MAINT@
+ MAKE = @MAKE@
+ MAKEINFO = @MAKEINFO@
+@@ -628,6 +617,7 @@
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign test/Makefile
++.PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+@@ -1144,8 +1134,6 @@
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am
+
+-.PRECIOUS: Makefile
+-
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -ruN psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/test-internal/Makefile.in psmpi-5.4.6-1/mpich2/src/mpi/romio/test-internal/Makefile.in
+--- psmpi-5.4.6-1.orig/mpich2/src/mpi/romio/test-internal/Makefile.in 2020-06-17 13:57:56.000000000 +0200
++++ psmpi-5.4.6-1/mpich2/src/mpi/romio/test-internal/Makefile.in 2020-07-16 10:48:35.487333588 +0200
+@@ -24,17 +24,7 @@
+ # will not be built by default, but it will participate in "make distclean" and
+ # friends.
+
+-am__is_gnu_make = { \
+- if test -z '$(MAKELEVEL)'; then \
+- false; \
+- elif test -n '$(MAKE_HOST)'; then \
+- true; \
+- elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+- true; \
+- else \
+- false; \
+- fi; \
+-}
++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+@@ -99,6 +89,8 @@
+ host_triplet = @host@
+ noinst_PROGRAMS = $(am__EXEEXT_1)
+ subdir = test-internal
++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
++ $(top_srcdir)/confdb/depcomp
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/confdb/aclocal_cc.m4 \
+ $(top_srcdir)/confdb/aclocal_check_visibility.m4 \
+@@ -113,7 +105,6 @@
+ $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+ CONFIG_CLEAN_FILES =
+@@ -201,7 +192,6 @@
+ done | $(am__uniquify_input)`
+ ETAGS = etags
+ CTAGS = ctags
+-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/confdb/depcomp
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ VPATH = @VPATH@
+ ACLOCAL = @ACLOCAL@
+@@ -262,6 +252,7 @@
+ HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+ HAVE_MPI_INFO = @HAVE_MPI_INFO@
+ HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
++IME_INSTALL_PATH = @IME_INSTALL_PATH@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -277,7 +268,6 @@
+ LL = @LL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+ MAINT = @MAINT@
+ MAKE = @MAKE@
+ MAKEINFO = @MAKEINFO@
+@@ -434,6 +424,7 @@
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test-internal/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign test-internal/Makefile
++.PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+@@ -729,8 +720,6 @@
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am
+
+-.PRECIOUS: Makefile
+-
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Golden_Repo/p/psmpi/psmpi_shebang.patch b/Golden_Repo/p/psmpi/psmpi_shebang.patch
new file mode 100644
index 000000000..4983f5995
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi_shebang.patch
@@ -0,0 +1,36 @@
+diff -ruN psmpi-5.2.0-1.old/mpich2/src/env/mpicc.bash.in psmpi-5.2.0-1/mpich2/src/env/mpicc.bash.in
+--- psmpi-5.2.0-1.old/mpich2/src/env/mpicc.bash.in 2017-03-08 20:47:13.159276458 +0100
++++ psmpi-5.2.0-1/mpich2/src/env/mpicc.bash.in 2017-03-08 20:47:48.430966270 +0100
+@@ -1,4 +1,4 @@
+-#! @BASH_SHELL@
++#!/usr/bin/env bash
+ #
+ # (C) 2006 by Argonne National Laboratory.
+ # See COPYRIGHT in top-level directory.
+diff -ruN psmpi-5.2.0-1.old/mpich2/src/env/mpicxx.bash.in psmpi-5.2.0-1/mpich2/src/env/mpicxx.bash.in
+--- psmpi-5.2.0-1.old/mpich2/src/env/mpicxx.bash.in 2017-03-08 20:47:13.160276506 +0100
++++ psmpi-5.2.0-1/mpich2/src/env/mpicxx.bash.in 2017-03-08 20:47:51.549115658 +0100
+@@ -1,4 +1,4 @@
+-#! @BASH_SHELL@
++#!/usr/bin/env bash
+ #
+ # (C) 2006 by Argonne National Laboratory.
+ # See COPYRIGHT in top-level directory.
+diff -ruN psmpi-5.2.0-1.old/mpich2/src/env/mpif77.bash.in psmpi-5.2.0-1/mpich2/src/env/mpif77.bash.in
+--- psmpi-5.2.0-1.old/mpich2/src/env/mpif77.bash.in 2017-03-08 20:47:13.160276506 +0100
++++ psmpi-5.2.0-1/mpich2/src/env/mpif77.bash.in 2017-03-08 20:47:55.148288103 +0100
+@@ -1,4 +1,4 @@
+-#! @BASH_SHELL@
++#!/usr/bin/env bash
+ #
+ # (C) 2006 by Argonne National Laboratory.
+ # See COPYRIGHT in top-level directory.
+diff -ruN psmpi-5.2.0-1.old/mpich2/src/env/mpifort.bash.in psmpi-5.2.0-1/mpich2/src/env/mpifort.bash.in
+--- psmpi-5.2.0-1.old/mpich2/src/env/mpifort.bash.in 2017-03-08 20:47:13.160276506 +0100
++++ psmpi-5.2.0-1/mpich2/src/env/mpifort.bash.in 2017-03-08 20:48:08.913947609 +0100
+@@ -1,4 +1,4 @@
+-#! @BASH_SHELL@
++#!/usr/bin/env bash
+ #
+ # (C) 2006 by Argonne National Laboratory.
+ # See COPYRIGHT in top-level directory.
diff --git a/Golden_Repo/u/UCX/UCX-1.8.1.eb b/Golden_Repo/u/UCX/UCX-1.8.1.eb
new file mode 100644
index 000000000..b00a41081
--- /dev/null
+++ b/Golden_Repo/u/UCX/UCX-1.8.1.eb
@@ -0,0 +1,70 @@
+easyblock = 'ConfigureMake'
+
+name = 'UCX'
+version = '1.8.1'
+
+homepage = 'http://www.openucx.org'
+
+description = """Unified Communication X
+An open-source production grade communication framework for data centric
+and high-performance applications
+"""
+
+site_contacts = 'Damian Alvarez <d.alvarez@fz-juelich.de>'
+
+toolchain = SYSTEM
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
+sources = ['%(namelower)s-%(version)s.tar.gz']
+
+builddependencies = [
+ ('binutils', '2.34'),
+ ('pkg-config', '0.29.2'),
+]
+
+osdependencies = [
+ # needed for --with-verbs
+ ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
+ # needed for mlx5 acceleration
+ ('libmlx5-devel')
+]
+
+dependencies = [
+ ('numactl', '2.0.13'),
+ ('CUDA', '11.0.207'),
+]
+
+configopts = '--with-verbs ' # Build OpenFabrics support, adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries
+configopts += '--without-java '
+configopts += '--disable-doxygen-doc '
+
+configopts += '--enable-optimizations ' # Enable machine-specific optimizations, default: NO
+#configopts += '--enable-tuning ' # Enable parameter tuning in run-time, default: NO
+#configopts += '--enable-mt ' # Enable thread support in UCP and UCT, default: NO
+configopts += '--disable-debug '
+configopts += '--disable-logging '
+configopts += '--disable-assertions '
+configopts += '--disable-params-check '
+configopts += '--disable-dependency-tracking '
+configopts += '--with-cuda=$EBROOTCUDA '
+
+configopts += '--enable-cma ' # Enable Cross Memory Attach - allow MPI programs doing intra-node communication to do a single copy of the message rather than double. https://lwn.net/Articles/405284/
+
+configopts += '--with-rc ' # Compile with IB Reliable Connection support
+configopts += '--with-ud ' # Compile with IB Unreliable Datagram support
+configopts += '--with-dc ' # Compile with IB Dynamic Connection support
+configopts += '--with-cm ' # Compile with IB Connection Manager support
+configopts += '--with-mlx5-dv ' # Compile with mlx5 Direct Verbs support. Direct Verbs(DV) support provides additional acceleration capabilities that are not available in a regular mode.
+configopts += '--with-ib-hw-tm ' # Compile with IB Tag Matching support
+configopts += '--with-dm ' # Compile with Device Memory support
+
+configopts += '--with-avx ' # Compile with AVX
+configopts += '--with-gdrcopy ' # Compile with GDRCopy
+
+sanity_check_paths = {
+ 'files': ['bin/ucx_info', 'bin/ucx_perftest', 'bin/ucx_read_profile'],
+ 'dirs': ['include', 'lib', 'share']
+}
+
+moduleclass = 'system'
diff --git a/Golden_Repo/x/XZ/XZ-5.2.5-GCCcore-9.3.0.eb b/Golden_Repo/x/XZ/XZ-5.2.5-GCCcore-9.3.0.eb
new file mode 100644
index 000000000..1ea107f0c
--- /dev/null
+++ b/Golden_Repo/x/XZ/XZ-5.2.5-GCCcore-9.3.0.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'XZ'
+version = '5.2.5'
+
+homepage = 'https://tukaani.org/xz/'
+description = "xz: XZ utilities"
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
+
+source_urls = ['https://tukaani.org/xz/']
+sources = [SOURCELOWER_TAR_BZ2]
+patches = ['XZ-5.2.2_compat-libs.patch']
+checksums = [
+ '5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df', # xz-5.2.5.tar.bz2
+ '578da3ea2ddb551972891a60fe31478b16a516d6ea8b6aa3af89e1d558adb703', # XZ-5.2.2_compat-libs.patch
+]
+
+builddependencies = [
+ # use gettext built with system toolchain as build dep to avoid cyclic dependency (XZ -> gettext -> libxml2 -> XZ)
+ ('gettext', '0.20.2', '', True),
+ ('binutils', '2.34'),
+]
+
+# may become useful in non-x86 archs
+# configopts = ' --disable-assembler '
+
+sanity_check_paths = {
+ 'files': ["bin/xz", "bin/lzmainfo"],
+ 'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/z/zlib/zlib-1.2.11-GCCcore-9.3.0.eb b/Golden_Repo/z/zlib/zlib-1.2.11-GCCcore-9.3.0.eb
new file mode 100644
index 000000000..d04813d73
--- /dev/null
+++ b/Golden_Repo/z/zlib/zlib-1.2.11-GCCcore-9.3.0.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'zlib'
+version = '1.2.11'
+
+homepage = 'http://www.zlib.net/'
+description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is,
+ not covered by any patents -- lossless data-compression library for use on virtually any
+ computer hardware and operating system.
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')]
+
+# use same binutils version that was used when building GCC toolchain
+builddependencies = [('binutils', '2.34', '', True)]
+
+sanity_check_paths = {
+ 'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
+ 'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/z/zlib/zlib-1.2.11.eb b/Golden_Repo/z/zlib/zlib-1.2.11.eb
new file mode 100644
index 000000000..ae1f3363a
--- /dev/null
+++ b/Golden_Repo/z/zlib/zlib-1.2.11.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'zlib'
+version = '1.2.11'
+
+homepage = 'http://www.zlib.net/'
+description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is,
+ not covered by any patents -- lossless data-compression library for use on virtually any
+ computer hardware and operating system.
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')]
+
+# need to take care of $CFLAGS ourselves with system toolchain
+# we need to add -fPIC, but should also include -O* option to avoid compiling with -O0 (default for GCC)
+buildopts = 'CFLAGS="-O2 -fPIC"'
+
+sanity_check_paths = {
+ 'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
+ 'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/README.md b/README.md
index b7b399ac3..c5d403f9b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
# JSC's EasyBuild private repo
This is the repo to store all the EasyBuild configuration files, including easyconfigs.
-Each stage has it's own branch, which contain the configuration for the particular stage.
+Each folder has a set of stages, which contain the configuration for the particular stage.
--
GitLab