Roll libxml to 2.9.3

third_party/libxml/src/ltmain.sh

+#! /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.2
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-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.
 
 # 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
 # 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 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.
-
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-#       --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/>.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4.2
-TIMESTAMP=""
-package_revision=1.3337
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+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
+
+# 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:
+#
+#   . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# 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!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do 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
+  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
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  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
+
+# 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 \"\${$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\"
+  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
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
-
-$lt_unset CDPATH
-
+
+# 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=';'
+  }
+fi
+
+
+
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+    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
+}
+
+
+# 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
+  }
+
+  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+  GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## 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"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+
+
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
+
+# 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'
+
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
+
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# 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"
+
+
+## ----------------- ##
+## 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.
+
+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=:
+
+# 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
 
 # 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"
-
-
-
-: ${CP="cp -f"}
-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.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS="   $lt_nl"
-
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-
-# func_dirname file append nondir_replacement
+progpath=$0
+
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
+
+# Make sure we have an absolute progpath for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
+     progdir=`cd "$progdir" && pwd`
+     progpath=$progdir/$progname
+     ;;
+  *)
+     _G_IFS=$IFS
+     IFS=${PATH_SEPARATOR-:}
+     for progdir in $PATH; do
+       IFS=$_G_IFS
+       test -x "$progdir/$progname" && break
+     done
+     IFS=$_G_IFS
+     test -n "$progdir" || progdir=`pwd`
+     progpath=$progdir/$progname
+     ;;
+esac
+
+
+## ----------------- ##
+## 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=''
+        tc_bold='';   tc_standout=''
+        tc_red='';   tc_green=''
+        tc_blue='';  tc_cyan=''
+      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.
-func_dirname ()
-{
-    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-} # func_dirname may be replaced by extended shell implementation
-
-
-# func_basename file
-func_basename ()
-{
-    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
-
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
+eval 'func_dirname ()
+{
+    $debug_cmd
+
+    '"$_d"'
+}'
+
+
+# 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}"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+    '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    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
+}
+
+
+# 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...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
+}
+
+
+# func_fatal_error ARG...
+# -----------------------
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    $debug_cmd
+
+    func_error "$*"
+    exit $EXIT_FAILURE
+}
+
+
+# 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
+# ---------------------------
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    $debug_cmd
+
+    _G_directory_path=$1
+    _G_dir_list=
+
+    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
+
+      # Protect directory names starting with '-'
+      case $_G_directory_path in
+        -*) _G_directory_path=./$_G_directory_path ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$_G_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
+
+        # If the last portion added has no slash in it, the list is done
+        case $_G_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
+      done
+      _G_dir_list=`$ECHO "$_G_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
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$_G_dir" 2>/dev/null || :
+      done
+      IFS=$func_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'"
+    fi
+}
+
+
+# func_mktempdir [BASENAME]
+# -------------------------
+# 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.
+func_mktempdir ()
+{
+    $debug_cmd
+
+    _G_template=${TMPDIR-/tmp}/${1-$progname}
+
+    if test : = "$opt_dry_run"; then
+      # Return a directory name, but don't create it in dry-run mode
+      _G_tmpdir=$_G_template-$$
     else
-      func_dirname_result="$func_dirname_result${2}"
+
+      # If mktemp works, use that first and foremost
+      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$_G_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        _G_tmpdir=$_G_template-${RANDOM-0}$$
+
+        func_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$_G_tmpdir"
+        umask $func_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'"
     fi
-    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-    case ${2} in
-      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-    esac
-} # func_stripname may be replaced by extended shell implementation
-
-
-# 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,/*$,/,'
+
+    $ECHO "$_G_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.
-#             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"`
+    $debug_cmd
+
+    # 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.
+        ;;
+      *)
+        # 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 "$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
-}
-
-# 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=.
+          -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
-        ;;
-      *)
-        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
-
-  # 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
-
-  # 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=$func_dirname_result
-     progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
-     ;;
-  *)
-     save_IFS="$IFS"
-     IFS=${PATH_SEPARATOR-:}
-     for progdir in $PATH; do
-       IFS="$save_IFS"
-       test -x "$progdir/$progname" && break
-     done
-     IFS="$save_IFS"
-     test -n "$progdir" || progdir=`pwd`
-     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'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
-
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes.  A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# 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, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-}
-
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
-    $opt_verbose && func_echo ${1+"$@"}
+      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_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
-
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-}
-
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
-
-    # bash bug again:
+
+# 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_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_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
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
-    $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_mkdir_p directory-path
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
-    my_directory_path="$1"
-    my_dir_list=
-
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
+
+# 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
-
-      # While some portion of DIR does not yet exist...
-      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.
-        my_dir_list="$my_directory_path:$my_dir_list"
-
-        # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
-
-        # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
-      done
-      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
-
-      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 "$my_dir" 2>/dev/null || :
-      done
-      IFS="$save_mkdir_p_IFS"
-
-      # Bail out if we (or some other process) failed to create a directory.
-      test -d "$my_directory_path" || \
-        func_fatal_error "Failed to create \`$1'"
-    fi
-}
-
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$opt_dry_run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-        # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-        save_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
+      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
 
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-    fi
-
-    $ECHO "$my_tmpdir"
-}
-
-
-# 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 ()
-{
-    case $1 in
-      *[\\\`\"\$]*)
-        func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
-
-    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\""
-        ;;
-      *)
-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
-    esac
-}
-
-
-# func_quote_for_expand arg
+      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
+# -------------------------
 # 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
       *[\\\`\"]*)
-        my_arg=`$ECHO "$1" | $SED \
-            -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+        _G_arg=`$ECHO "$1" | $SED \
+            -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
       *)
-        my_arg="$1" ;;
+        _G_arg=$1 ;;
     esac
 
-    case $my_arg in
+    case $_G_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.
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
-        my_arg="\"$my_arg\""
+        _G_arg=\"$_G_arg\"
         ;;
     esac
 
-    func_quote_for_expand_result="$my_arg"
-}
-
-
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+    func_quote_for_expand_result=$_G_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
 # not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
 # is given, then evaluate it.
 func_show_eval ()
 {
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    func_quote_for_expand "$_G_cmd"
+    eval "func_notquiet $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"
+      fi
     }
-
-    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_silent is true, then output CMD.  Then, if opt_dryrun is
+}
+
+
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet 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 ()
 {
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    $opt_quiet || {
+      func_quote_for_expand "$_G_cmd"
       eval "func_echo $func_quote_for_expand_result"
     }
 
-    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"
+    $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"
       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 ()
 {
-  case $1 in
-  [0-9]* | *[!a-zA-Z0-9_]*)
-    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-    ;;
-  * )
-    func_tr_sh_result=$1
-    ;;
-  esac
-}
-
-
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
-    $opt_debug
-
-    $SED -n '/(C)/!b go
-        :more
-        /\./!{
-          N
-          s/\n# / /
-          b more
-        }
-        :go
-        /^# '$PROGRAM' (GNU /,/# warranty; / {
-        s/^# //
-        s/^# *$//
-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-        p
-     }' < "$progpath"
-     exit $?
-}
-
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
-{
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-        s/^# //
-        s/^# *$//
-        s/\$progname/'$progname'/
-        p
-    }' < "$progpath"
-    echo
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
-}
-
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
+    $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
+}
+
+
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
+{
+    $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+"$@"}
+
+    # Bail if the options were screwed!
+    $exit_cmd $EXIT_FAILURE
+
+    # save modified positional parameters for caller
+    func_validate_options_result=$func_run_hooks_result
+}
+
+
+
+## ----------------- ##
+## 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 ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    eval \$ECHO \""$fatal_help"\"
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
 func_help ()
 {
-    $opt_debug
-
-    $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
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message"
+    exit 0
+}
+
+
+# func_missing_arg ARGNAME
+# ------------------------
 # Echo program name prefixed message to standard error and set global
 # exit_cmd.
 func_missing_arg ()
 {
-    $opt_debug
-
-    func_error "missing argument for $1."
+    $debug_cmd
+
+    func_error "Missing argument for '$1'."
     exit_cmd=exit
 }
 
 
-# func_split_short_opt shortopt
+# 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
+# -----------------------------
 # Set func_split_short_opt_name and func_split_short_opt_arg shell
 # variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
-{
-    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
-
-    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
-
-
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
-{
-    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-    my_sed_long_arg='1s/^--[^=]*=//'
-
-    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
-    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
-
-exit_cmd=:
-
-
-
-
-
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
-
-# 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_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-    eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
-
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
-    func_quote_for_eval "${2}"
-    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
-
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-    func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
-
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
-
-
-# func_lo2o object
-func_lo2o ()
-{
-    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
-
-
-# func_xform libobj-or-source
-func_xform ()
-{
-    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
-
-
-# func_fatal_configuration arg...
+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 ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+    exit 0
+}
+
+
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    echo
+    $SED -n 's|^# ||
+        /^Written by/{
+          x;p;x
+        }
+        h
+        /^Written by/q' < "$progpath"
+    echo
+    eval \$ECHO \""$usage_message"\"
+}
+
+
+# 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:
+
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
+
+
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
+{
+    $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
+}
+
+
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
+{
+    $debug_cmd
+
+    $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 ()
+{
+    $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_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+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_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_fatal_configuration ARG...
+# -------------------------------
 # Echo program name prefixed message to standard error, followed by
 # a configuration failure hint, and exit.
 func_fatal_configuration ()
 {
-    func_error ${1+"$@"}
-    func_error "See the $PACKAGE documentation for more information."
-    func_fatal_error "Fatal configuration error."
+    func__fatal_error ${1+"$@"} \
+      "See the $PACKAGE documentation for more information." \
+      "Fatal configuration error."
 }
 
 
 # func_config
+# -----------
 # Display the configuration for all the tags in this script.
 func_config ()
 {
     re_begincf='^# ### BEGIN LIBTOOL'
     re_endcf='^# ### END LIBTOOL'
 
     # Default configuration.
     $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
 
     # Now print the configurations for the tags.
     for tagname in $taglist; do
       $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
     done
 
     exit $?
 }
 
+
 # func_features
+# -------------
 # Display the features supported by this script.
 func_features ()
 {
     echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
+    if test yes = "$build_libtool_libs"; then
       echo "enable shared libraries"
     else
       echo "disable shared libraries"
     fi
-    if test "$build_old_libs" = yes; then
+    if test yes = "$build_old_libs"; then
       echo "enable static libraries"
     else
       echo "disable static libraries"
     fi
 
     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"
-
-  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) ;;
+    # 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
+
+    # 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"
-
-        # 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
-}
+        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
+}
+
 
 # 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
-}
-
-
-# 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
-
-
-
-# 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
-
-
-# Parse options once, thoroughly.  This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
-{
-  # this just eases exit handling
-  while test $# -gt 0; do
-    opt="$1"
-    shift
-    case $opt in
-      --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  ;;
+}
+
+
+# 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
+
+    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
-  done
-
-  # Validate options:
-
-  # save first non-option argument
-  if test "$#" -gt 0; then
-    nonopt="$opt"
-    shift
-  fi
-
-  # preserve --debug
-  test "$opt_debug" = : || func_append preserve_args " --debug"
-
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # 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
-
-    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-      func_fatal_configuration "not configured to build any kind of library"
+
+    # 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
+
+
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
+{
+    $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"
+                        ;;
+
+        # An option not handled by this hook function:
+        *)              set dummy "$_G_opt" ${1+"$@"};  shift; break  ;;
+      esac
+    done
+
+
+    # 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
+
+
+
+# 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
     fi
 
-    # Darwin sucks
-    eval std_shrext=\"$shrext_cmds\"
-
-    # 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
-
-    # Change the help message to a mode-specific one.
-    generic_help="$help"
-    help="Try \`$progname --help --mode=$opt_mode' for more information."
-  }
-
-
-  # Bail if the options were screwed
-  $exit_cmd $EXIT_FAILURE
-}
-
+    # preserve --debug
+    test : = "$debug_cmd" || func_append preserve_args " --debug"
+
+    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
+
+    $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."
+    }
+
+    # 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
+
+
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
 
 
 
 ## ----------- ##
 ##    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 \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
 }
 
 # 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
     if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
         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 "$lalib_p" = yes
+    test yes = "$lalib_p"
 }
 
 # func_ltwrapper_script_p file
 # True iff FILE is a libtool wrapper script
 # This function is only a basic sanity check; it will hardly flush out
 # determined imposters.
 func_ltwrapper_script_p ()
 {
-    func_lalib_p "$1"
+    test -f "$1" &&
+      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
 }
 
 # func_ltwrapper_executable_p file
 # True iff FILE is a libtool wrapper executable
 # This function is only a basic sanity check; it will hardly flush out
 # determined imposters.
 func_ltwrapper_executable_p ()
 {
     func_ltwrapper_exec_suffix=
     case $1 in
     *.exe) ;;
     *) func_ltwrapper_exec_suffix=.exe ;;
     esac
     $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
 }
 
 # func_ltwrapper_scriptname file
 # Assumes file is an ltwrapper_executable
 # uses $file to determine the appropriate filename for a
 # temporary ltwrapper_script.
 func_ltwrapper_scriptname ()
 {
     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
 # True iff FILE is a libtool wrapper script or wrapper executable
 # This function is only a basic sanity check; it will hardly flush out
 # determined imposters.
 func_ltwrapper_p ()
 {
     func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
 }
 
 
 # func_execute_cmds commands fail_cmd
 # Execute tilde-delimited COMMANDS.
 # If FAIL_CMD is given, eval that upon failure.
 # FAIL_CMD may read-access the current command in variable CMD!
 func_execute_cmds ()
 {
-    $opt_debug
+    $debug_cmd
+
     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
 }
 
 
 # func_source file
 # Source FILE, adding directory component if necessary.
 # 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 ()
 {
-    $opt_debug
+    $debug_cmd
+
     case $1 in
     */* | *\\*) . "$1" ;;
     *)          . "./$1" ;;
     esac
 }
 
 
 # func_resolve_sysroot PATH
 # Replace a leading = in PATH with a sysroot.  Store the result into
 # func_resolve_sysroot_result
 func_resolve_sysroot ()
 {
   func_resolve_sysroot_result=$1
   case $func_resolve_sysroot_result in
   =*)
     func_stripname '=' '' "$func_resolve_sysroot_result"
     func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
     ;;
   esac
 }
 
 # func_replace_sysroot PATH
 # If PATH begins with the sysroot, replace it with = and
 # store the result into func_replace_sysroot_result.
 func_replace_sysroot ()
 {
-  case "$lt_sysroot:$1" in
+  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.
     func_replace_sysroot_result=$1
     ;;
   esac
 }
 
 # func_infer_tag arg
 # Infer tagged configuration to use if any are available and
 # if one wasn't chosen via the "--tag" command line option.
 # Only attempt this if the compiler in the base compile
 # command doesn't match the default compiler.
 # arg is usually of the form 'gcc ...'
 func_infer_tag ()
 {
-    $opt_debug
+    $debug_cmd
+
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
         func_append_quoted CC_quoted "$arg"
       done
       CC_expanded=`func_echo_all $CC`
       CC_quoted_expanded=`func_echo_all $CC_quoted`
       case $@ in
       # Blanks in the command may have been stripped by the calling shell,
       # but not from the CC environment variable when configure was run.
       " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
       " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
       # Blanks at the start of $base_compile will cause this to fail
       # if we don't check for them as well.
       *)
         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.
               func_append_quoted CC_quoted "$arg"
             done
             CC_expanded=`func_echo_all $CC`
             CC_quoted_expanded=`func_echo_all $CC_quoted`
             case "$@ " in
             " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
             " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
               # The compiler in the base compile command matches
               # the one in the tagged configuration.
               # Assume this is the tagged configuration we want.
               tagname=$z
               break
               ;;
             esac
           fi
         done
         # If $tagname still isn't set, then no tagged configuration
         # was found and let the user know that the "--tag" command
         # 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
         ;;
       esac
     fi
 }
 
 
 
 # func_write_libtool_object output_name pic_name nonpic_name
 # Create a libtool object file (analogous to a ".la" file),
 # but don't create it if we're doing a dry run.
 func_write_libtool_object ()
 {
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
+    write_libobj=$1
+    if test yes = "$build_libtool_libs"; then
+      write_lobj=\'$2\'
     else
       write_lobj=none
     fi
 
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
+    if test yes = "$build_old_libs"; then
+      write_oldobj=\'$3\'
     else
       write_oldobj=none
     fi
 
     $opt_dry_run || {
       cat >${write_libobj}T <<EOF
 # $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
 
 # Name of the PIC object.
 pic_object=$write_lobj
 
 # Name of the non-PIC object
 non_pic_object=$write_oldobj
 
 EOF
-      $MV "${write_libobj}T" "${write_libobj}"
+      $MV "${write_libobj}T" "$write_libobj"
     }
 }
 
 
 ##################################################
 # FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
 ##################################################
 
 # func_convert_core_file_wine_to_w32 ARG
 # Helper function used by file name conversion functions when $build is *nix,
 # and $host is mingw, cygwin, or some other w32 environment. Relies on a
 # correctly configured wine environment available, with the winepath program
 # in $build's $PATH.
 #
 # ARG is the $build file name to be converted to w32 format.
 # Result is available in $func_convert_core_file_wine_to_w32_result, and will
 # be empty on error (or when ARG is empty)
 func_convert_core_file_wine_to_w32 ()
 {
-  $opt_debug
-  func_convert_core_file_wine_to_w32_result="$1"
+  $debug_cmd
+
+  func_convert_core_file_wine_to_w32_result=$1
   if test -n "$1"; then
     # Unfortunately, winepath does not exit with a non-zero error code, so we
     # are forced to check the contents of stdout. On the other hand, if the
     # command is not found, the shell will set an exit code of 127 and print
     # *an error message* to stdout. So we must check for both error code of
     # zero AND non-empty stdout, which explains the odd construction:
     func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+    if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
       func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-        $SED -e "$lt_sed_naive_backslashify"`
+        $SED -e "$sed_naive_backslashify"`
     else
       func_convert_core_file_wine_to_w32_result=
     fi
   fi
 }
 # end: func_convert_core_file_wine_to_w32
 
 
 # func_convert_core_path_wine_to_w32 ARG
 # Helper function used by path conversion functions when $build is *nix, and
 # $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
 # configured wine environment available, with the winepath program in $build's
 # $PATH. Assumes ARG has no leading or trailing path separator characters.
 #
 # ARG is path to be converted from $build format to win32.
 # Result is available in $func_convert_core_path_wine_to_w32_result.
 # Unconvertible file (directory) names in ARG are skipped; if no directory names
 # are convertible, then the result may be empty.
 func_convert_core_path_wine_to_w32 ()
 {
-  $opt_debug
+  $debug_cmd
+
   # 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
       fi
     done
     IFS=$oldIFS
   fi
 }
 # end: func_convert_core_path_wine_to_w32
 
 
 # func_cygpath ARGS...
 # Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
 # when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
 # $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
 # (2), returns the Cygwin file name or path in func_cygpath_result (input
 # file name or path is assumed to be in w32 format, as previously converted
 # from $build's *nix or MSYS format). In case (3), returns the w32 file name
 # or path in func_cygpath_result (input file name or path is assumed to be in
 # Cygwin format). Returns an empty string on error.
 #
 # ARGS are passed to cygpath, with the last one being the file name or path to
 # be converted.
 #
 # Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
 # environment variable; do not put it in $PATH.
 func_cygpath ()
 {
-  $opt_debug
+  $debug_cmd
+
   if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
     func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
     if test "$?" -ne 0; then
       # on failure, ensure result is empty
       func_cygpath_result=
     fi
   else
     func_cygpath_result=
-    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
   fi
 }
 #end: func_cygpath
 
 
 # func_convert_core_msys_to_w32 ARG
 # Convert file name or path ARG from MSYS format to w32 format.  Return
 # result in func_convert_core_msys_to_w32_result.
 func_convert_core_msys_to_w32 ()
 {
-  $opt_debug
+  $debug_cmd
+
   # awkward: cmd appends spaces to result
   func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+    $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
 }
 #end: func_convert_core_msys_to_w32
 
 
 # func_convert_file_check ARG1 ARG2
 # Verify that ARG1 (a file name in $build format) was converted to $host
 # format in ARG2. Otherwise, emit an error message, but continue (resetting
 # func_to_host_file_result to ARG1).
 func_convert_file_check ()
 {
-  $opt_debug
-  if test -z "$2" && test -n "$1" ; then
+  $debug_cmd
+
+  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
 
 
 # func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
 # Verify that FROM_PATH (a path in $build format) was converted to $host
 # format in TO_PATH. Otherwise, emit an error message, but continue, resetting
 # func_to_host_file_result to a simplistic fallback value (see below).
 func_convert_path_check ()
 {
-  $opt_debug
+  $debug_cmd
+
   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.
     if test "x$1" != "x$2"; then
       lt_replace_pathsep_chars="s|$1|$2|g"
       func_to_host_path_result=`echo "$3" |
         $SED -e "$lt_replace_pathsep_chars"`
     else
-      func_to_host_path_result="$3"
+      func_to_host_path_result=$3
     fi
   fi
 }
 # end func_convert_path_check
 
 
 # func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
 # Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
 # and appending REPL if ORIG matches BACKPAT.
 func_convert_path_front_back_pathsep ()
 {
-  $opt_debug
+  $debug_cmd
+
   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
   $2 ) func_append func_to_host_path_result "$3"
     ;;
   esac
 }
 # end func_convert_path_front_back_pathsep
 
 
 ##################################################
 # $build to $host FILE NAME CONVERSION FUNCTIONS #
 ##################################################
-# invoked via `$to_host_file_cmd ARG'
+# invoked via '$to_host_file_cmd ARG'
 #
 # In each case, ARG is the path to be converted from $build to $host format.
 # Result will be available in $func_to_host_file_result.
 
 
 # func_to_host_file ARG
 # Converts the file name ARG from $build format to $host format. Return result
 # in func_to_host_file_result.
 func_to_host_file ()
 {
-  $opt_debug
+  $debug_cmd
+
   $to_host_file_cmd "$1"
 }
 # end func_to_host_file
 
 
 # func_to_tool_file ARG LAZY
 # converts the file name ARG from $build format to toolchain format. Return
 # result in func_to_tool_file_result.  If the conversion in use is listed
 # in (the comma separated) LAZY, no conversion takes place.
 func_to_tool_file ()
 {
-  $opt_debug
+  $debug_cmd
+
   case ,$2, in
     *,"$to_tool_file_cmd",*)
       func_to_tool_file_result=$1
       ;;
     *)
       $to_tool_file_cmd "$1"
       func_to_tool_file_result=$func_to_host_file_result
       ;;
   esac
 }
 # end func_to_tool_file
 
 
 # func_convert_file_noop ARG
 # Copy ARG to func_to_host_file_result.
 func_convert_file_noop ()
 {
-  func_to_host_file_result="$1"
+  func_to_host_file_result=$1
 }
 # end func_convert_file_noop
 
 
 # func_convert_file_msys_to_w32 ARG
 # Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
 # conversion to w32 is not available inside the cwrapper.  Returns result in
 # func_to_host_file_result.
 func_convert_file_msys_to_w32 ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  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"
 }
 # end func_convert_file_msys_to_w32
 
 
 # func_convert_file_cygwin_to_w32 ARG
 # Convert file name ARG from Cygwin to w32 format.  Returns result in
 # func_to_host_file_result.
 func_convert_file_cygwin_to_w32 ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  func_to_host_file_result=$1
   if test -n "$1"; then
     # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
     # LT_CYGPATH in this case.
     func_to_host_file_result=`cygpath -m "$1"`
   fi
   func_convert_file_check "$1" "$func_to_host_file_result"
 }
 # end func_convert_file_cygwin_to_w32
 
 
 # func_convert_file_nix_to_w32 ARG
 # Convert file name ARG from *nix to w32 format.  Requires a wine environment
 # and a working winepath. Returns result in func_to_host_file_result.
 func_convert_file_nix_to_w32 ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  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"
 }
 # end func_convert_file_nix_to_w32
 
 
 # func_convert_file_msys_to_cygwin ARG
 # Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
 # Returns result in func_to_host_file_result.
 func_convert_file_msys_to_cygwin ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  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"
 }
 # end func_convert_file_msys_to_cygwin
 
 
 # func_convert_file_nix_to_cygwin ARG
 # Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
 # in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
 # in func_to_host_file_result.
 func_convert_file_nix_to_cygwin ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  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"
 }
 # end func_convert_file_nix_to_cygwin
 
 
 #############################################
 # $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.
 #
 # Path separators are also converted from $build format to $host format.  If
 # ARG begins or ends with a path separator character, it is preserved (but
 # converted to $host format) on output.
 #
 # All path conversion functions are named using the following convention:
 #   file name conversion function    : func_convert_file_X_to_Y ()
 #   path conversion function         : func_convert_path_X_to_Y ()
 # where, for any given $build/$host combination the 'X_to_Y' value is the
 # same.  If conversion functions are added for new $build/$host combinations,
 # the two new functions must follow this pattern, or func_init_to_host_path_cmd
 # will break.
 
 
 # func_init_to_host_path_cmd
 # Ensures that function "pointer" variable $to_host_path_cmd is set to the
 # appropriate value, based on the value of $to_host_file_cmd.
 to_host_path_cmd=
 func_init_to_host_path_cmd ()
 {
-  $opt_debug
+  $debug_cmd
+
   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
 }
 
 
 # func_to_host_path ARG
 # Converts the path ARG from $build format to $host format. Return result
 # in func_to_host_path_result.
 func_to_host_path ()
 {
-  $opt_debug
+  $debug_cmd
+
   func_init_to_host_path_cmd
   $to_host_path_cmd "$1"
 }
 # end func_to_host_path
 
 
 # func_convert_path_noop ARG
 # Copy ARG to func_to_host_path_result.
 func_convert_path_noop ()
 {
-  func_to_host_path_result="$1"
+  func_to_host_path_result=$1
 }
 # end func_convert_path_noop
 
 
 # func_convert_path_msys_to_w32 ARG
 # Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
 # conversion to w32 is not available inside the cwrapper.  Returns result in
 # func_to_host_path_result.
 func_convert_path_msys_to_w32 ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # Remove leading and trailing path separator characters from ARG.  MSYS
     # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
     # and winepath ignores them completely.
     func_stripname : : "$1"
     func_to_host_path_tmp1=$func_stripname_result
     func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result=$func_convert_core_msys_to_w32_result
     func_convert_path_check : ";" \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
     func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
   fi
 }
 # end func_convert_path_msys_to_w32
 
 
 # func_convert_path_cygwin_to_w32 ARG
 # Convert path ARG from Cygwin to w32 format.  Returns result in
 # func_to_host_file_result.
 func_convert_path_cygwin_to_w32 ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # See func_convert_path_msys_to_w32:
     func_stripname : : "$1"
     func_to_host_path_tmp1=$func_stripname_result
     func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
     func_convert_path_check : ";" \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
     func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
   fi
 }
 # end func_convert_path_cygwin_to_w32
 
 
 # func_convert_path_nix_to_w32 ARG
 # Convert path ARG from *nix to w32 format.  Requires a wine environment and
 # a working winepath.  Returns result in func_to_host_file_result.
 func_convert_path_nix_to_w32 ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  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"
   fi
 }
 # end func_convert_path_nix_to_w32
 
 
 # func_convert_path_msys_to_cygwin ARG
 # Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
 # Returns result in func_to_host_file_result.
 func_convert_path_msys_to_cygwin ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  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"
   fi
 }
 # end func_convert_path_msys_to_cygwin
 
 
 # func_convert_path_nix_to_cygwin ARG
 # Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
 # a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
 # func_to_host_file_result.
 func_convert_path_nix_to_cygwin ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # Remove leading and trailing path separator characters from
     # ARG. msys behavior is inconsistent here, cygpath turns them
     # into '.;' and ';.', and winepath ignores them completely.
     func_stripname : : "$1"
     func_to_host_path_tmp1=$func_stripname_result
     func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
     func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
+    func_to_host_path_result=$func_cygpath_result
     func_convert_path_check : : \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
     func_convert_path_front_back_pathsep ":*" "*:" : "$1"
   fi
 }
 # end func_convert_path_nix_to_cygwin
 
 
+# func_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 ()
 {
-    $opt_debug
+    $debug_cmd
+
     # 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
     libobj=
     later=
     pie_flag=
 
     for arg
     do
       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
         ;;
 
       normal )
         # Accept any command-line options.
         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
           ;;
 
         -pie | -fpie | -fPIE)
           func_append pie_flag " $arg"
           continue
           ;;
 
         -shared | -static | -prefer-pic | -prefer-non-pic)
           func_append later " $arg"
           continue
           ;;
 
         -no-suppress)
           suppress_opt=no
           continue
           ;;
 
         -Xcompiler)
           arg_mode=arg  #  the next one goes into the "base_compile" arg list
           continue      #  The current "srcfile" will either be retained or
           ;;            #  replaced later.  I would guess that would be a bug.
 
         -Wc,*)
           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
 
           # Add the arguments to base_compile.
           func_append base_compile " $lastarg"
           continue
           ;;
 
         *)
           # 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
         ;;
       esac    #  case $arg_mode
 
       # Aesthetically quote the previous argument.
       func_append_quoted base_compile "$lastarg"
     done # for arg
 
     case $arg_mode in
     arg)
       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
 
     # Recognize several different file suffixes.
     # If the user specifies -o file.o, it is replaced with file.lo
     case $libobj in
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
     *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
     esac
 
     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
 
     func_infer_tag $base_compile
 
     for arg in $later; do
       case $arg in
       -shared)
-        test "$build_libtool_libs" != yes && \
-          func_fatal_configuration "can not build a shared library"
+        test yes = "$build_libtool_libs" \
+          || func_fatal_configuration "cannot build a shared library"
         build_old_libs=no
         continue
         ;;
 
       -static)
         build_libtool_libs=no
         build_old_libs=yes
         continue
         ;;
 
       -prefer-pic)
         pic_mode=yes
         continue
         ;;
 
       -prefer-non-pic)
         pic_mode=no
         continue
         ;;
       esac
     done
 
     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 "$build_old_libs" = yes; then
+    if test yes = "$build_old_libs"; then
       removelist="$obj $lobj $libobj ${libobj}T"
     else
       removelist="$lobj $libobj ${libobj}T"
     fi
 
     # On Cygwin there's no "real" PIC flag so we must build both object types
     case $host_os in
     cygwin* | mingw* | pw32* | os2* | cegcc*)
       pic_mode=default
       ;;
     esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; 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 "$compiler_c_o" = no; then
-      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
+    if test no = "$compiler_c_o"; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+      lockfile=$output_obj.lock
     else
       output_obj=
       need_locks=no
       lockfile=
     fi
 
     # 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 "$need_locks" = yes; then
+    if test yes = "$need_locks"; 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 "$need_locks" = warn; then
+    elif test warn = "$need_locks"; then
       if test -f "$lockfile"; then
         $ECHO "\
 *** ERROR, $lockfile exists and contains:
 `cat $lockfile 2>/dev/null`
 
 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."
 
         $opt_dry_run || $RM $removelist
         exit $EXIT_FAILURE
       fi
       func_append removelist " $output_obj"
       $ECHO "$srcfile" > "$lockfile"
     fi
 
     $opt_dry_run || $RM $removelist
     func_append removelist " $lockfile"
     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
 
     func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
     srcfile=$func_to_tool_file_result
     func_quote_for_eval "$srcfile"
     qsrcfile=$func_quote_for_eval_result
 
     # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
+    if test yes = "$build_libtool_libs"; then
       # Without this assignment, base_compile gets emptied.
       fbsd_hideous_sh_bug=$base_compile
 
-      if test "$pic_mode" != no; then
+      if test no != "$pic_mode"; then
         command="$base_compile $qsrcfile $pic_flag"
       else
         # Don't build PIC code
         command="$base_compile $qsrcfile"
       fi
 
       func_mkdir_p "$xdir$objdir"
 
       if test -z "$output_obj"; then
         # Place PIC objects in $objdir
         func_append command " -o $lobj"
       fi
 
       func_show_eval_locale "$command"  \
           'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
 
-      if test "$need_locks" = warn &&
+      if test warn = "$need_locks" &&
          test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
         $ECHO "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
 but it should contain:
 $srcfile
 
 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."
 
         $opt_dry_run || $RM $removelist
         exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed, then go on to compile the next one
       if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
         func_show_eval '$MV "$output_obj" "$lobj"' \
           'error=$?; $opt_dry_run || $RM $removelist; exit $error'
       fi
 
       # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
+      if test yes = "$suppress_opt"; then
         suppress_output=' >/dev/null 2>&1'
       fi
     fi
 
     # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
+    if test yes = "$build_old_libs"; then
+      if test yes != "$pic_mode"; then
         # Don't build PIC code
         command="$base_compile $qsrcfile$pie_flag"
       else
         command="$base_compile $qsrcfile $pic_flag"
       fi
-      if test "$compiler_c_o" = yes; then
+      if test yes = "$compiler_c_o"; then
         func_append command " -o $obj"
       fi
 
       # Suppress compiler output if we already did a PIC compilation.
       func_append command "$suppress_output"
       func_show_eval_locale "$command" \
         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
-      if test "$need_locks" = warn &&
+      if test warn = "$need_locks" &&
          test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
         $ECHO "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
 but it should contain:
 $srcfile
 
 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."
 
         $opt_dry_run || $RM $removelist
         exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed
       if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
         func_show_eval '$MV "$output_obj" "$obj"' \
           'error=$?; $opt_dry_run || $RM $removelist; exit $error'
       fi
     fi
 
     $opt_dry_run || {
       func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
 
       # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
+      if test no != "$need_locks"; then
         removelist=$lockfile
         $RM "$lockfile"
       fi
     }
 
     exit $EXIT_SUCCESS
 }
 
 $opt_help || {
-  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
 }
 
 func_mode_help ()
 {
     # We need to display help for each of the modes.
     case $opt_mode in
       "")
         # Generic help is extracted from the usage comments
         # at the start of this file.
         func_help
         ;;
 
       clean)
         $ECHO \
 "Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
 
 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
 with it are deleted. Otherwise, only FILE itself is deleted using RM."
         ;;
 
       compile)
       $ECHO \
 "Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
 
 Compile a source file into a libtool library object.
 
 This mode accepts the following additional options:
 
   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
   -no-suppress      do not suppress compiler output for multiple passes
   -prefer-pic       try to 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)
         $ECHO \
 "Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
 
 Automatically set library path, then run a program.
 
 This mode accepts the following additional options:
 
   -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
 into their corresponding uninstalled binary, and any of their required library
 directories are added to the library path.
 
 Then, COMMAND is executed, with ARGS as arguments."
         ;;
 
       finish)
         $ECHO \
 "Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
 
 Complete the installation of libtool libraries.
 
 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)
         $ECHO \
 "Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
 
 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:
 
   -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
 
 The rest of the components are interpreted as arguments to that command (only
 BSD-compatible install options are recognized)."
         ;;
 
       link)
         $ECHO \
 "Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
 
 Link object files or libraries together to form another library, or to
 create an executable program.
 
 LINK-COMMAND is a command using the C compiler that you would use to create
 a program from several object files.
 
 The following components of LINK-COMMAND are treated specially:
 
   -all-static       do not do any dynamic linking at all
   -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
                     try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
                     try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
   -no-fast-install  disable the fast-install mode
   -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
+  -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)
   -precious-files-regex REGEX
                     don't remove output files matching REGEX
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
   -shared           only do dynamic linking of libtool libraries
   -shrext SUFFIX    override the standard shared library file extension
   -static           do not do any dynamic linking of uninstalled libtool libraries
   -static-libtool-libs
                     do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
                     specify library version info [each variable defaults to 0]
   -weak LIBNAME     declare that the target provides the LIBNAME interface
   -Wc,FLAG
   -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
   -Wl,FLAG
   -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."
         ;;
 
       uninstall)
         $ECHO \
 "Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
 
 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.
 Otherwise, only FILE itself is deleted using RM."
         ;;
 
       *)
-        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
     {
       func_help noexit
       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
         echo
         func_mode_help
       done
     } |
-    sed '1d
+    $SED '1d
       /^When reporting/,/^Report/{
         H
         d
       }
       $x
       /information about other modes/d
       /more detailed .*MODE/d
       s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
   fi
   exit $?
 fi
 
 
 # func_mode_execute arg...
 func_mode_execute ()
 {
-    $opt_debug
+    $debug_cmd
+
     # 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
       *.la)
         func_resolve_sysroot "$file"
         file=$func_resolve_sysroot_result
 
         # Check to see that this really is a libtool archive.
         func_lalib_unsafe_p "$file" \
-          || func_fatal_help "\`$lib' is not a valid libtool archive"
+          || func_fatal_help "'$lib' is not a valid libtool archive"
 
         # Read the libtool library.
         dlname=
         library_names=
         func_source "$file"
 
         # Skip this library if it cannot be dlopened.
         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
         ;;
 
       *.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
         eval "$shlibpath_var=\"\$dir\""
       else
         eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
       fi
     done
 
     # 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=
     for file
     do
       case $file in
       -* | *.la | *.lo ) ;;
       *)
         # Do a test to see if this is really a libtool program.
         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
       # Quote arguments (to preserve shell metacharacters).
       func_append_quoted args "$file"
     done
 
-    if test "X$opt_dry_run" = Xfalse; then
+    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 -n "$shlibpath_var"; then
         # Export the shlibpath_var.
         eval "export $shlibpath_var"
       fi
 
       # Restore saved environment variables
       for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
       do
         eval "if test \"\${save_$lt_var+set}\" = set; then
                 $lt_var=\$save_$lt_var; export $lt_var
               else
                 $lt_unset $lt_var
               fi"
       done
 
       # Now prepare to actually exec the command.
-      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
+      exec_cmd=\$cmd$args
     fi
 }
 
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
 
 
 # func_mode_finish arg...
 func_mode_finish ()
 {
-    $opt_debug
+    $debug_cmd
+
     libs=
     libdirs=
     admincmds=
 
     for opt in "$nonopt" ${1+"$@"}
     do
       if test -d "$opt"; then
         func_append libdirs " $opt"
 
       elif test -f "$opt"; then
         if func_lalib_unsafe_p "$opt"; then
           func_append libs " $opt"
         else
-          func_warning "\`$opt' is not a valid libtool archive"
+          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
 
     if test -n "$libs"; then
       if test -n "$lt_sysroot"; then
         sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
         sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
       else
         sysroot_cmd=
       fi
 
       # Remove sysroot references
       if $opt_dry_run; then
         for lib in $libs; do
-          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+          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
         ${RM}r "$tmpdir"
       fi
     fi
 
     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
       for libdir in $libdirs; do
         if test -n "$finish_cmds"; then
           # Do each command in the finish commands.
           func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
 '"$cmd"'"'
         fi
         if test -n "$finish_eval"; then
           # Do the single finish_eval.
           eval cmds=\"$finish_eval\"
           $opt_dry_run || eval "$cmds" || func_append admincmds "
        $cmds"
         fi
       done
     fi
 
     # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
+    $opt_quiet && exit $EXIT_SUCCESS
 
     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
       echo "----------------------------------------------------------------------"
       echo "Libraries have been installed in:"
       for libdir in $libdirs; do
         $ECHO "   $libdir"
       done
       echo
       echo "If you ever happen to want to link against installed libraries"
       echo "in a given directory, LIBDIR, you must either use libtool, and"
-      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+      echo "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
 
       echo "See any operating system documentation about shared libraries for"
       case $host in
         solaris2.[6789]|solaris2.1[0-9])
           echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
           echo "pages."
           ;;
         *)
           echo "more information, such as the ld(1) and ld.so(8) manual pages."
           ;;
       esac
       echo "----------------------------------------------------------------------"
     fi
     exit $EXIT_SUCCESS
 }
 
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
 
 
 # func_mode_install arg...
 func_mode_install ()
 {
-    $opt_debug
+    $debug_cmd
+
     # There may be an optional sh(1) argument at the beginning of
     # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
        # 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 "
       arg=$1
       shift
     else
       install_prog=
       arg=$nonopt
     fi
 
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
     func_quote_for_eval "$arg"
     func_append install_prog "$func_quote_for_eval_result"
     install_shared_prog=$install_prog
     case " $install_prog " in
       *[\\\ /]cp\ *) install_cp=: ;;
       *) install_cp=false ;;
     esac
 
     # We need to accept at least all the BSD install flags.
     dest=
     files=
     opts=
     prev=
     install_type=
-    isdir=no
+    isdir=false
     stripme=
     no_mode=:
     for arg
     do
       arg2=
       if test -n "$dest"; then
         func_append files " $dest"
         dest=$arg
         continue
       fi
 
       case $arg in
-      -d) isdir=yes ;;
+      -d) isdir=: ;;
       -f)
         if $install_cp; then :; else
           prev=$arg
         fi
         ;;
       -g | -m | -o)
         prev=$arg
         ;;
       -s)
         stripme=" -s"
         continue
         ;;
       -*)
         ;;
       *)
         # If the previous option needed an argument, then skip it.
         if test -n "$prev"; then
-          if test "x$prev" = x-m && test -n "$install_override_mode"; then
+          if test X-m = "X$prev" && test -n "$install_override_mode"; then
             arg2=$install_override_mode
             no_mode=false
           fi
           prev=
         else
           dest=$arg
           continue
         fi
         ;;
       esac
 
       # Aesthetically quote the argument.
       func_quote_for_eval "$arg"
       func_append install_prog " $func_quote_for_eval_result"
       if test -n "$arg2"; then
         func_quote_for_eval "$arg2"
       fi
       func_append install_shared_prog " $func_quote_for_eval_result"
     done
 
     test -z "$install_prog" && \
       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
         func_quote_for_eval "$install_override_mode"
         func_append install_shared_prog " -m $func_quote_for_eval_result"
       fi
     fi
 
     if test -z "$files"; then
       if test -z "$dest"; then
         func_fatal_help "no file or destination specified"
       else
         func_fatal_help "you must specify a destination"
       fi
     fi
 
     # Strip any trailing slash from the destination.
     func_stripname '' '/' "$dest"
     dest=$func_stripname_result
 
     # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
+    test -d "$dest" && isdir=:
+    if $isdir; 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]:[\\/]*) ;;
     *)
       for file in $files; do
         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
       ;;
     esac
 
     # 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=
     current_libdirs=
     for file in $files; do
 
       # Do each installation.
       case $file in
       *.$libext)
         # Do the static libraries later.
         func_append staticlibs " $file"
         ;;
 
       *.la)
         func_resolve_sysroot "$file"
         file=$func_resolve_sysroot_result
 
         # Check to see that this really is a libtool archive.
         func_lalib_unsafe_p "$file" \
-          || func_fatal_help "\`$file' is not a valid libtool archive"
+          || func_fatal_help "'$file' is not a valid libtool archive"
 
         library_names=
         old_library=
         relink_command=
         func_source "$file"
 
         # Add the libdir to current_libdirs if it is the destination.
         if test "X$destdir" = "X$libdir"; then
           case "$current_libdirs " in
           *" $libdir "*) ;;
           *) func_append current_libdirs " $libdir" ;;
           esac
         else
           # Note the libdir as a future libdir.
           case "$future_libdirs " in
           *" $libdir "*) ;;
           *) func_append future_libdirs " $libdir" ;;
           esac
         fi
 
         func_dirname "$file" "/" ""
-        dir="$func_dirname_result"
+        dir=$func_dirname_result
         func_append dir "$objdir"
 
         if test -n "$relink_command"; then
           # Determine the prefix the user has applied to our future dir.
           inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
 
           # Don't allow the user to place us outside of our expected
           # location b/c this prevents finding dependent libraries that
           # are installed to the same prefix.
           # At present, this check doesn't affect windows .dll's that
           # 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.
             relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
           else
             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=""
+              tstripme=
               ;;
             esac
             ;;
+          os2*)
+            case $realname in
+            *_dll.a)
+              tstripme=
+              ;;
+            esac
+            ;;
           esac
           if test -n "$tstripme" && test -n "$striplib"; then
             func_show_eval "$striplib $destdir/$realname" 'exit $?'
           fi
 
           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
             do
               test "$linkname" != "$realname" \
                 && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
             done
           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.
         test -n "$old_library" && func_append staticlibs " $dir/$old_library"
         ;;
 
       *.lo)
         # Install (i.e. copy) a libtool object.
 
         # 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.
         case $destfile in
         *.lo)
           func_lo2o "$destfile"
           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
 
         # Install the libtool object if requested.
         test -n "$destfile" && \
           func_show_eval "$install_prog $file $destfile" 'exit $?'
 
         # Install the old object if enabled.
-        if test "$build_old_libs" = yes; then
+        if test yes = "$build_old_libs"; then
           # Deduce the name of the old-style object file.
           func_lo2o "$file"
           staticobj=$func_lo2o_result
           func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
         fi
         exit $EXIT_SUCCESS
         ;;
 
       *)
         # 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
 
         # Do a test to see if this is really a libtool program.
         case $host in
         *cygwin* | *mingw*)
             if func_ltwrapper_executable_p "$file"; then
               func_ltwrapper_scriptname "$file"
               wrapper=$func_ltwrapper_scriptname_result
             else
               func_stripname '' '.exe' "$file"
               wrapper=$func_stripname_result
             fi
             ;;
         *)
             wrapper=$file
             ;;
         esac
         if func_ltwrapper_script_p "$wrapper"; then
           notinst_deplibs=
           relink_command=
 
           func_source "$wrapper"
 
           # 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=yes
+          finalize=:
           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'` ### testsuite: skip nested quoting test
+            libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
             if test -n "$libdir" && test ! -f "$libfile"; then
-              func_warning "\`$lib' has not been installed in \`$libdir'"
-              finalize=no
+              func_warning "'$lib' has not been installed in '$libdir'"
+              finalize=false
             fi
           done
 
           relink_command=
           func_source "$wrapper"
 
           outputname=
-          if test "$fast_install" = no && test -n "$relink_command"; then
+          if test no = "$fast_install" && test -n "$relink_command"; then
             $opt_dry_run || {
-              if test "$finalize" = yes; then
+              if $finalize; 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_silent || {
+                $opt_quiet || {
                   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
             # Install the binary that we compiled earlier.
             file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
           fi
         fi
 
         # remove .exe since cygwin /usr/bin/install will append another
         # one anyway
@@ skipping 16 matching lines @@
         func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
         $opt_dry_run || if test -n "$outputname"; then
           ${RM}r "$tmpdir"
         fi
         ;;
       esac
     done
 
     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
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
         func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
       func_execute_cmds "$old_postinstall_cmds" 'exit $?'
     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 "$opt_mode" = install && func_mode_install ${1+"$@"}
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
 
 
 # func_generate_dlsyms outputname originator pic_p
 # Extract symbols from dlprefiles and create ${outputname}S.o with
 # a dlpreopen symbol table.
 func_generate_dlsyms ()
 {
-    $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'`
+    $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'`
     my_dlsyms=
 
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; 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
     fi
 
     if test -n "$my_dlsyms"; then
       case $my_dlsyms in
       "") ;;
       *.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"
 
         # Parse the name list into a source file.
         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$TIMESTAMP) $VERSION */
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $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 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can'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 "$dlself" = yes; then
-          func_verbose "generating symbol list for \`$output'"
+        if test yes = "$dlself"; then
+          func_verbose "generating symbol list for '$output'"
 
           $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
 
           # Add our own program objects to the symbol list.
           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
 
           if test -n "$exclude_expsyms"; then
             $opt_dry_run || {
               eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
               eval '$MV "$nlist"T "$nlist"'
             }
           fi
 
           if test -n "$export_symbols_regex"; then
             $opt_dry_run || {
               eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
               eval '$MV "$nlist"T "$nlist"'
             }
           fi
 
           # 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"'
                 eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
                 ;;
               esac
             }
           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
                 *cygwin* | *mingw* | *cegcc* )
                   eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
                   eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
                   ;;
               esac
             }
           fi
         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"
                     dlprefile_dlbasename=$sharedlib_from_linklib_result
                   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"
                     eval '$ECHO ": $name " >> "$nlist"'
                   fi
                   func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
                   eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
                     $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
                 }
               else # not an import lib
@@ skipping 35 matching lines @@
           else
             $GREP -v "^: " < "$nlist" > "$nlist"S
           fi
 
           if test -f "$nlist"S; then
             eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
           else
             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.  */
 typedef struct {
   const char *name;
   void *address;
 } lt_dlsymlist;
 extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
+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_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
-  { \"$my_originator\", (void *) 0 },"
+{ {\"$my_originator\", (void *) 0},"
+
+          if test -s "$nlist"I; then
+            echo >> "$output_objdir/$my_dlsyms" "\
+  {\"@INIT@\", (void *) &lt_syminit},"
+          fi
 
           case $need_lib_prefix in
           no)
             eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
             ;;
           *)
             eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
             ;;
           esac
           echo >> "$output_objdir/$my_dlsyms" "\
@@ skipping 21 matching lines @@
           # compiling the symbol table file with pic_flag works around
           # a FreeBSD bug that causes programs to crash when -lm is
           # linked before any other PIC object.  But we must not use
           # pic_flag when linking with -static.  The problem exists in
           # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
           *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
             pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
           *-*-hpux*)
             pic_flag_for_symtable=" $pic_flag"  ;;
           *)
-            if test "X$my_pic_p" != Xno; then
-              pic_flag_for_symtable=" $pic_flag"
-            fi
+            $my_pic_p && pic_flag_for_symtable=" $pic_flag"
             ;;
           esac
           ;;
         esac
         symtab_cflags=
         for arg in $LTCFLAGS; do
           case $arg in
           -pie | -fpie | -fPIE) ;;
           *) func_append symtab_cflags " $arg" ;;
           esac
         done
 
         # Now compile the dynamic symbol file.
         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"'
+        func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
 
         # 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
             compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
             finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
           else
             compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
             finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
           fi
           ;;
         *)
           compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
           finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
           ;;
         esac
         ;;
       *)
-        func_fatal_error "unknown suffix for \`$my_dlsyms'"
+        func_fatal_error "unknown suffix for '$my_dlsyms'"
         ;;
       esac
     else
       # We keep going just in case the user didn't refer to
       # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
       # really was required.
 
       # Nullify the symbol file.
       compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
       finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
     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'
 #
 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.
 # Despite the name, also deal with 64 bit binaries.
 func_win32_libid ()
 {
-  $opt_debug
-  win32_libid_type="unknown"
+  $debug_cmd
+
+  win32_libid_type=unknown
   win32_fileres=`file -L $1 2>/dev/null`
   case $win32_fileres in
   *ar\ archive\ import\ library*) # definitely import
     win32_libid_type="x86 archive import"
     ;;
   *ar\ archive*) # could be an import, or static
     # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
        $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-      func_to_tool_file "$1" func_convert_file_msys_to_w32
-      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-        $SED -n -e '
+      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 '
             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";;
       esac
     fi
     ;;
   *DLL*)
     win32_libid_type="x86 DLL"
     ;;
   *executable*) # but shell scripts are "executable" too...
@@ skipping 11 matching lines @@
 #
 # Platform-specific function to extract the
 # name of the DLL associated with the specified
 # import library ARG.
 # Invoked by eval'ing the libtool variable
 #    $sharedlib_from_linklib_cmd
 # Result is available in the variable
 #    $sharedlib_from_linklib_result
 func_cygming_dll_for_implib ()
 {
-  $opt_debug
+  $debug_cmd
+
   sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
 }
 
 # func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
 #
 # The is the core of a fallback implementation of a
 # platform-specific function to extract the name of the
 # DLL associated with the specified import library LIBNAME.
 #
 # SECTION_NAME is either .idata$6 or .idata$7, depending
 # on the platform and compiler that created the implib.
 #
 # Echos the name of the DLL associated with the
 # specified import library.
 func_cygming_dll_for_implib_fallback_core ()
 {
-  $opt_debug
+  $debug_cmd
+
   match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
   $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
     $SED '/^Contents of section '"$match_literal"':/{
       # Place marker at beginning of archive member dllname section
       s/.*/====MARK====/
       p
       d
     }
     # These lines can sometimes be longer than 43 characters, but
     # are always uninteresting
@@ skipping 15 matching lines @@
       x
       s/\n//g
       # Remove the marker
       s/^====MARK====//
       # Remove trailing dots and whitespace
       s/[\. \t]*$//
       # Print
       /./p' |
     # we now have a list, one entry per line, of the stringified
     # contents of the appropriate section of all members of the
-    # archive which possess that section. Heuristic: eliminate
-    # all those which have a first or second character that is
+    # archive that possess that section. Heuristic: eliminate
+    # all those that have a first or second character that is
     # a '.' (that is, objdump's representation of an unprintable
     # character.) This should work for all archives with less than
     # 0x302f exports -- but will fail for DLLs whose name actually
     # begins with a literal '.' or a single character followed by
     # a '.'.
     #
     # Of those that remain, print the first one.
     $SED -e '/^\./d;/^.\./d;q'
 }
 
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-  test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-  test -n "$func_cygming_ms_implib_tmp"
-}
-
 # func_cygming_dll_for_implib_fallback ARG
 # Platform-specific function to extract the
 # name of the DLL associated with the specified
 # import library ARG.
 #
 # This fallback implementation is for use when $DLLTOOL
 # does not support the --identify-strict option.
 # Invoked by eval'ing the libtool variable
 #    $sharedlib_from_linklib_cmd
 # Result is available in the variable
 #    $sharedlib_from_linklib_result
 func_cygming_dll_for_implib_fallback ()
 {
-  $opt_debug
-  if func_cygming_gnu_implib_p "$1" ; then
+  $debug_cmd
+
+  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
 }
 
 
 # func_extract_an_archive dir oldlib
 func_extract_an_archive ()
 {
-    $opt_debug
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-    if test "$lock_old_archive_extraction" = yes; then
+    $debug_cmd
+
+    f_ex_an_ar_dir=$1; shift
+    f_ex_an_ar_oldlib=$1
+    if test yes = "$lock_old_archive_extraction"; 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"
         sleep 2
       done
     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 "$lock_old_archive_extraction" = yes; then
+    if test yes = "$lock_old_archive_extraction"; then
       $opt_dry_run || rm -f "$lockfile"
     fi
     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
      :
     else
       func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
     fi
 }
 
 
 # func_extract_archives gentop oldlib ...
 func_extract_archives ()
 {
-    $opt_debug
-    my_gentop="$1"; shift
+    $debug_cmd
+
+    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
         *" $my_xlib_u "*)
           func_arith $extracted_serial + 1
           extracted_serial=$func_arith_result
           my_xlib_u=lt$extracted_serial-$my_xlib ;;
         *) break ;;
         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"
 
       case $host in
       *-darwin*)
         func_verbose "Extracting $my_xabs"
         # Do not bother doing anything if just a dry run
         $opt_dry_run || {
           darwin_orig_dir=`pwd`
           cd $my_xdir || exit $?
           darwin_archive=$my_xabs
           darwin_curdir=`pwd`
-          darwin_base_archive=`basename "$darwin_archive"`
+          func_basename "$darwin_archive"
+          darwin_base_archive=$func_basename_result
           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 "$basename" | sort -u`
+            darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
             darwin_file=
             darwin_files=
             for darwin_file in $darwin_filelist; do
               darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
               $LIPO -create -output "$darwin_file" $darwin_files
             done # $darwin_filelist
             $RM -rf unfat-$$
             cd "$darwin_orig_dir"
           else
             cd $darwin_orig_dir
             func_extract_an_archive "$my_xdir" "$my_xabs"
           fi # $darwin_arches
         } # !$opt_dry_run
         ;;
       *)
         func_extract_an_archive "$my_xdir" "$my_xabs"
         ;;
       esac
       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
 }
 
 
 # func_emit_wrapper [arg=no]
 #
 # Emit a libtool wrapper script on stdout.
 # Don't directly open a file because we may want to
 # incorporate the script contents within a cygwin/mingw
 # wrapper executable.  Must ONLY be called from within
 # func_mode_link because it depends on a number of variables
 # set therein.
 #
 # 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 in which it is stored is
+# will assume that the directory where it is stored is
 # the $objdir directory.  This is a cygwin/mingw-specific
 # behavior.
 func_emit_wrapper ()
 {
         func_emit_wrapper_arg1=${1-no}
 
         $ECHO "\
 #! $SHELL
 
 # $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # The $output program cannot be directly executed until all the libtool
 # libraries that it depends on are installed.
 #
 # This wrapper script should never be moved out of the build directory.
 # If it is, it will not operate correctly.
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
 sed_quote_subst='$sed_quote_subst'
@@ skipping 36 matching lines @@
 {
   eval 'cat <<_LTECHO_EOF
 \$1
 _LTECHO_EOF'
 }
     ECHO=\"$qECHO\"
   fi
 
 # Very basic option parsing. These options are (a) specific to
 # the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
+# /script/ and the wrapper /executable/ that is used only on
 # windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
+# (application programs are unlikely to have options that match
 # this pattern).
 #
 # There are only two supported options: --lt-debug and
 # --lt-dump-script. There is, deliberately, no --lt-help.
 #
 # The first argument to this parsing function should be the
 # script's $0 value, followed by "$@".
 lt_option_debug=
 func_parse_lt_options ()
 {
@@ skipping 12 matching lines @@
       ;;
     --lt-*)
         \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
         exit 1
       ;;
     esac
   done
 
   # Print the debug banner immediately:
   if test -n \"\$lt_option_debug\"; then
-    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
   fi
 }
 
 # Used when --lt-debug. Prints its arguments to stdout
 # (redirection is the responsibility of the caller)
 func_lt_dump_args ()
 {
   lt_dump_args_N=1;
   for lt_arg
   do
-    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
     lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
   done
 }
 
 # Core function for launching the target application
 func_exec_program_core ()
 {
 "
   case $host in
   # Backslashes separate directories on plain windows
   *-*-mingw | *-*-os2* | *-cegcc*)
     $ECHO "\
       if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
         func_lt_dump_args \${1+\"\$@\"} 1>&2
       fi
       exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
 "
     ;;
 
   *)
     $ECHO "\
       if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
         func_lt_dump_args \${1+\"\$@\"} 1>&2
       fi
       exec \"\$progdir/\$program\" \${1+\"\$@\"}
 "
     ;;
   esac
   $ECHO "\
       \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
       exit 1
 }
@@ skipping 54 matching lines @@
     *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
     $objdir )   thisdir=. ;;
     esac
   fi
 
   # Try to get the absolute directory name.
   absdir=\`cd \"\$thisdir\" && pwd\`
   test -n \"\$absdir\" && thisdir=\"\$absdir\"
 "
 
-        if test "$fast_install" = yes; then
+        if test yes = "$fast_install"; 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\"
 
     if test ! -d \"\$progdir\"; then
       $MKDIR \"\$progdir\"
     else
       $RM \"\$progdir/\$file\"
     fi"
 
           $ECHO "\
 
     # relink executable if necessary
     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
     fi
 
     $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
     { $RM \"\$progdir/\$program\";
       $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
     $RM \"\$progdir/\$file\"
   fi"
@@ skipping 14 matching lines @@
         # to shlibpath, because on Windows, both are PATH and uninstalled
         # libraries must come first.
         if test -n "$dllsearchpath"; then
           $ECHO "\
     # Add the dll search path components to the executable PATH
     PATH=$dllsearchpath:\$PATH
 "
         fi
 
         # Export our shlibpath_var if we have one.
-        if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+        if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
           $ECHO "\
     # Add our own library path to $shlibpath_var
     $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
 
     # Some systems cannot cope with colon-terminated $shlibpath_var
     # The second colon is a workaround for a bug in BeOS R4 sed
     $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
 
     export $shlibpath_var
 "
         fi
 
         $ECHO "\
     if test \"\$libtool_execute_magic\" != \"$magic\"; then
       # Run the actual program with our arguments.
       func_exec_program \${1+\"\$@\"}
     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
   fi
 fi\
 "
 }
 
 
 # func_emit_cwrapperexe_src
 # emit the source code for a wrapper executable on stdout
 # Must ONLY be called from within func_mode_link because
 # it depends on a number of variable set therein.
 func_emit_cwrapperexe_src ()
 {
         cat <<EOF
 
 /* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 
    The $output program cannot be directly executed until all the libtool
    libraries that it depends on are installed.
 
    This wrapper executable should never be moved out of the build directory.
    If it is, it will not operate correctly.
 */
 EOF
             cat <<"EOF"
 #ifdef _MSC_VER
@@ skipping 14 matching lines @@
 #endif
 #include <malloc.h>
 #include <stdarg.h>
 #include <assert.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
 #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 platforms) ... */
+/* #elif defined other_platform || defined ... */
 #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
-# ifndef _INTPTR_T_DEFINED
-#  define _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#elif defined(__MINGW32__)
+#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
 #endif
 
 #ifndef S_IXOTH
 # define S_IXOTH 0
 #endif
 #ifndef S_IXGRP
 # define S_IXGRP 0
 #endif
 
 /* path handling portability macros */
 #ifndef DIR_SEPARATOR
 # define DIR_SEPARATOR '/'
 # 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
 #  define DIR_SEPARATOR_2 '\\'
 # endif
 # ifndef PATH_SEPARATOR_2
 #  define PATH_SEPARATOR_2 ';'
 # endif
 #endif
 
@@ skipping 12 matching lines @@
 
 #ifndef FOPEN_WB
 # define FOPEN_WB "w"
 #endif
 #ifndef _O_BINARY
 # define _O_BINARY 0
 #endif
 
 #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
 #define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
+  if (stale) { free (stale); stale = 0; } \
 } while (0)
 
-#if defined(LT_DEBUGWRAPPER)
+#if defined LT_DEBUGWRAPPER
 static int lt_debug = 1;
 #else
 static int lt_debug = 0;
 #endif
 
 const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
 
 void *xmalloc (size_t num);
 char *xstrdup (const char *string);
 const char *base_name (const char *name);
 char *find_executable (const char *wrapper);
 char *chase_symlinks (const char *pathspec);
 int make_executable (const char *path);
 int check_executable (const char *path);
 char *strendzap (char *str, const char *pat);
 void lt_debugprintf (const char *file, int line, const char *fmt, ...);
 void lt_fatal (const char *file, int line, const char *message, ...);
 static const char *nonnull (const char *s);
 static const char *nonempty (const char *s);
 void lt_setenv (const char *name, const char *value);
 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
 void lt_update_exe_path (const char *name, const char *value);
 void lt_update_lib_path (const char *name, const char *value);
 char **prepare_spawn (char **argv);
 void lt_dump_script (FILE *f);
 EOF
 
             cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+#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";
 const char * LIB_PATH_VARNAME = "$shlibpath_var";
 EOF
 
-            if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+            if test yes = "$shlibpath_overrides_runpath" && 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";
 EOF
             else
               cat <<"EOF"
 const char * LIB_PATH_VALUE   = "";
 EOF
             fi
 
             if test -n "$dllsearchpath"; then
               func_to_host_path "$dllsearchpath:"
               cat <<EOF
 const char * EXE_PATH_VARNAME = "PATH";
 const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
 EOF
             else
               cat <<"EOF"
 const char * EXE_PATH_VARNAME = "";
 const char * EXE_PATH_VALUE   = "";
 EOF
             fi
 
-            if test "$fast_install" = yes; then
+            if test yes = "$fast_install"; then
               cat <<EOF
 const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
 EOF
             else
               cat <<EOF
 const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
 EOF
             fi
 
 
             cat <<"EOF"
 
 #define LTWRAPPER_OPTION_PREFIX         "--lt-"
 
 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
 static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
 static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
 
 int
 main (int argc, char *argv[])
 {
   char **newargz;
   int  newargc;
   char *tmp_pathspec;
   char *actual_cwrapper_path;
   char *actual_cwrapper_name;
   char *target_name;
   char *lt_argv_zero;
-  intptr_t rval = 127;
+  int rval = 127;
 
   int i;
 
   program_name = (char *) xstrdup (base_name (argv[0]));
-  newargz = XMALLOC (char *, argc + 1);
+  newargz = XMALLOC (char *, (size_t) argc + 1);
 
   /* very simple arg parsing; don't want to rely on getopt
    * also, copy all non cwrapper options to newargz, except
    * argz[0], which is handled differently
    */
   newargc=0;
   for (i = 1; i < argc; i++)
     {
-      if (strcmp (argv[i], dumpscript_opt) == 0)
+      if (STREQ (argv[i], dumpscript_opt))
         {
 EOF
-            case "$host" in
+            case $host in
               *mingw* | *cygwin* )
                 # make stdout use "unix" line endings
                 echo "          setmode(1,_O_BINARY);"
                 ;;
               esac
 
             cat <<"EOF"
           lt_dump_script (stdout);
           return 0;
         }
-      if (strcmp (argv[i], debug_opt) == 0)
+      if (STREQ (argv[i], debug_opt))
         {
           lt_debug = 1;
           continue;
         }
-      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+      if (STREQ (argv[i], ltwrapper_option_prefix))
         {
           /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
              namespace, but it is not one of the ones we know about and
              have already dealt with, above (inluding dump-script), then
              report an error. Otherwise, targets might begin to believe
              they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
              namespace. The first time any user complains about this, we'll
              need to make LTWRAPPER_OPTION_PREFIX a configure-time option
              or a configure.ac-settable value.
            */
           lt_fatal (__FILE__, __LINE__,
                     "unrecognized %s option: '%s'",
                     ltwrapper_option_prefix, argv[i]);
         }
       /* otherwise ... */
       newargz[++newargc] = xstrdup (argv[i]);
     }
   newargz[++newargc] = NULL;
 
 EOF
             cat <<EOF
   /* The GNU banner must be the first non-error debug message */
-  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
 EOF
             cat <<"EOF"
   lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
   lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
 
   tmp_pathspec = find_executable (argv[0]);
   if (tmp_pathspec == NULL)
     lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
   lt_debugprintf (__FILE__, __LINE__,
                   "(main) found exe (before symlink chase) at: %s\n",
@@ skipping 90 matching lines @@
                       i, nonnull (newargz[i]));
     }
 
 EOF
 
             case $host_os in
               mingw*)
                 cat <<"EOF"
   /* execv doesn't actually work on mingw as expected on unix */
   newargz = prepare_spawn (newargz);
-  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
   if (rval == -1)
     {
       /* failed to start process */
       lt_debugprintf (__FILE__, __LINE__,
                       "(main) failed to launch target \"%s\": %s\n",
                       lt_argv_zero, nonnull (strerror (errno)));
       return 127;
     }
   return rval;
 EOF
@@ skipping 24 matching lines @@
 {
   return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
                           string) : NULL;
 }
 
 const char *
 base_name (const char *name)
 {
   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;
 #endif
 
   for (base = name; *name; name++)
     if (IS_DIR_SEPARATOR (*name))
       base = name + 1;
   return base;
 }
@@ skipping 38 matching lines @@
    Does not chase symlinks, even on platforms that support them.
 */
 char *
 find_executable (const char *wrapper)
 {
   int has_slash = 0;
   const char *p;
   const char *p_next;
   /* static buffer for getcwd */
   char tmp[LT_PATHMAX + 1];
-  int tmp_len;
+  size_t tmp_len;
   char *concat_name;
 
   lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
                   nonempty (wrapper));
 
   if ((wrapper == NULL) || (*wrapper == '\0'))
     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);
       if (check_executable (concat_name))
         return concat_name;
       XFREE (concat_name);
     }
   else
     {
 #endif
       if (IS_DIR_SEPARATOR (wrapper[0]))
         {
           concat_name = xstrdup (wrapper);
           if (check_executable (concat_name))
             return concat_name;
           XFREE (concat_name);
         }
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
     }
 #endif
 
   for (p = wrapper; *p; p++)
     if (*p == '/')
       {
         has_slash = 1;
         break;
       }
   if (!has_slash)
     {
       /* no slashes; search PATH */
       const char *path = getenv ("PATH");
       if (path != NULL)
         {
           for (p = path; *p; p = p_next)
             {
               const char *q;
               size_t p_len;
               for (q = p; *q; q++)
                 if (IS_PATH_SEPARATOR (*q))
                   break;
-              p_len = q - p;
+              p_len = (size_t) (q - p);
               p_next = (*q == '\0' ? q : q + 1);
               if (p_len == 0)
                 {
                   /* empty path: current directory */
                   if (getcwd (tmp, LT_PATHMAX) == NULL)
                     lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
                               nonnull (strerror (errno)));
                   tmp_len = strlen (tmp);
                   concat_name =
                     XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@ skipping 98 matching lines @@
 
   assert (str != NULL);
   assert (pat != NULL);
 
   len = strlen (str);
   patlen = strlen (pat);
 
   if (patlen <= len)
     {
       str += len - patlen;
-      if (strcmp (str, pat) == 0)
+      if (STREQ (str, pat))
         *str = '\0';
     }
   return str;
 }
 
 void
 lt_debugprintf (const char *file, int line, const char *fmt, ...)
 {
   va_list args;
   if (lt_debug)
@@ skipping 44 matching lines @@
 {
   lt_debugprintf (__FILE__, __LINE__,
                   "(lt_setenv) setting '%s' to '%s'\n",
                   nonnull (name), nonnull (value));
   {
 #ifdef HAVE_SETENV
     /* always make a copy, for consistency with !HAVE_SETENV */
     char *str = xstrdup (value);
     setenv (name, str, 1);
 #else
-    int len = strlen (name) + 1 + strlen (value) + 1;
+    size_t len = strlen (name) + 1 + strlen (value) + 1;
     char *str = XMALLOC (char, len);
     sprintf (str, "%s=%s", name, value);
     if (putenv (str) != EXIT_SUCCESS)
       {
         XFREE (str);
       }
 #endif
   }
 }
 
 char *
 lt_extend_str (const char *orig_value, const char *add, int to_end)
 {
   char *new_value;
   if (orig_value && *orig_value)
     {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
+      size_t orig_value_len = strlen (orig_value);
+      size_t add_len = strlen (add);
       new_value = XMALLOC (char, add_len + orig_value_len + 1);
       if (to_end)
         {
           strcpy (new_value, orig_value);
           strcpy (new_value + orig_value_len, add);
         }
       else
         {
           strcpy (new_value, add);
           strcpy (new_value + add_len, orig_value);
@@ skipping 10 matching lines @@
 lt_update_exe_path (const char *name, const char *value)
 {
   lt_debugprintf (__FILE__, __LINE__,
                   "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
                   nonnull (name), nonnull (value));
 
   if (name && *name && value && *value)
     {
       char *new_value = lt_extend_str (getenv (name), value, 0);
       /* some systems can't cope with a ':'-terminated path #' */
-      int len = strlen (new_value);
-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+      size_t len = strlen (new_value);
+      while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
         {
-          new_value[len-1] = '\0';
+          new_value[--len] = '\0';
         }
       lt_setenv (name, new_value);
       XFREE (new_value);
     }
 }
 
 void
 lt_update_lib_path (const char *name, const char *value)
 {
   lt_debugprintf (__FILE__, __LINE__,
@@ skipping 146 matching lines @@
             cat <<"EOF"
 }
 EOF
 }
 # end: func_emit_cwrapperexe_src
 
 # func_win32_import_lib_p ARG
 # True if ARG is an import lib, as indicated by $file_magic_cmd
 func_win32_import_lib_p ()
 {
-    $opt_debug
+    $debug_cmd
+
     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 ()
 {
-    $opt_debug
+    $debug_cmd
+
     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
-      # which system we are compiling for in order to pass an extra
+      # what 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 which has undefined symbols, in which case not
+      # to make a dll that 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.
       allow_undefined=yes
       ;;
     *)
       allow_undefined=yes
       ;;
     esac
     libtool_args=$nonopt
@@ skipping 23 matching lines @@
     dlself=no
     export_dynamic=no
     export_symbols=
     export_symbols_regex=
     generated=
     libobjs=
     ltlibs=
     module=no
     no_install=no
     objs=
+    os2dllname=
     non_pic_objects=
     precious_files_regex=
     prefer_static_libs=no
-    preload=no
+    preload=false
     prev=
     prevarg=
     release=
     rpath=
     xrpath=
     perm_rpath=
     temp_rpath=
     thread_safe=no
     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.
     for arg
     do
       case $arg in
       -shared)
-        test "$build_libtool_libs" != yes && \
-          func_fatal_configuration "can not build a shared library"
+        test yes != "$build_libtool_libs" \
+          && func_fatal_configuration "cannot build a shared library"
         build_old_libs=no
         break
         ;;
       -all-static | -static | -static-libtool-libs)
         case $arg in
         -all-static)
-          if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+          if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
             func_warning "complete static linking is impossible in this configuration"
           fi
           if test -n "$link_static_flag"; then
             dlopen_self=$dlopen_self_static
           fi
           prefer_static_libs=yes
           ;;
         -static)
           if test -z "$pic_flag" && test -n "$link_static_flag"; then
             dlopen_self=$dlopen_self_static
@@ skipping 12 matching lines @@
         break
         ;;
       esac
     done
 
     # See if our shared archives depend on static archives.
     test -n "$old_archive_from_new_cmds" && build_old_libs=yes
 
     # 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
       func_append libtool_args " $func_quote_for_eval_result"
 
       # If the previous option needs an argument, assign it.
       if test -n "$prev"; then
         case $prev in
         output)
           func_append compile_command " @OUTPUT@"
           func_append finalize_command " @OUTPUT@"
           ;;
         esac
 
         case $prev in
         bindir)
-          bindir="$arg"
+          bindir=$arg
           prev=
           continue
           ;;
         dlfiles|dlprefiles)
-          if test "$preload" = no; then
+          $preload || {
             # Add the symbol object into the linking commands.
             func_append compile_command " @SYMFILE@"
             func_append finalize_command " @SYMFILE@"
-            preload=yes
-          fi
+            preload=:
+          }
           case $arg in
           *.la | *.lo) ;;  # We handle these cases below.
           force)
-            if test "$dlself" = no; then
+            if test no = "$dlself"; then
               dlself=needless
               export_dynamic=yes
             fi
             prev=
             continue
             ;;
           self)
-            if test "$prev" = dlprefiles; then
+            if test dlprefiles = "$prev"; then
               dlself=yes
-            elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+            elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
               dlself=yes
             else
               dlself=needless
               export_dynamic=yes
             fi
             prev=
             continue
             ;;
           *)
-            if test "$prev" = dlfiles; then
+            if test dlfiles = "$prev"; then
               func_append dlfiles " $arg"
             else
               func_append dlprefiles " $arg"
             fi
             prev=
             continue
             ;;
           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
           ;;
         framework)
           case $host in
             *-*-darwin*)
               case "$deplibs " in
                 *" $qarg.ltframework "*) ;;
                 *) func_append deplibs " $qarg.ltframework" # this is fixed later
                    ;;
               esac
               ;;
           esac
           prev=
           continue
           ;;
         inst_prefix)
-          inst_prefix_dir="$arg"
+          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.
+          prev=
+          continue
+          ;;
         objectlist)
           if test -f "$arg"; then
             save_arg=$arg
             moreargs=
             for fil in `cat "$save_arg"`
             do
 #             func_append moreargs " $fil"
               arg=$fil
               # A libtool-controlled object.
 
               # Check to see that this really is a libtool object.
               if func_lalib_unsafe_p "$arg"; then
                 pic_object=
                 non_pic_object=
 
                 # Read the .lo file
                 func_source "$arg"
 
                 if test -z "$pic_object" ||
                    test -z "$non_pic_object" ||
-                   test "$pic_object" = none &&
-                   test "$non_pic_object" = none; then
-                  func_fatal_error "cannot find name of object for \`$arg'"
+                   test none = "$pic_object" &&
+                   test none = "$non_pic_object"; 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 "$pic_object" != none; then
+                if test none != "$pic_object"; then
                   # Prepend the subdirectory the object is found in.
-                  pic_object="$xdir$pic_object"
+                  pic_object=$xdir$pic_object
 
-                  if test "$prev" = dlfiles; then
-                    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+                  if test dlfiles = "$prev"; then
+                    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
                       func_append dlfiles " $pic_object"
                       prev=
                       continue
                     else
                       # If libtool objects are unsupported, then we need to preload.
                       prev=dlprefiles
                     fi
                   fi
 
                   # CHECK ME:  I think I busted this.  -Ossama
-                  if test "$prev" = dlprefiles; then
+                  if test dlprefiles = "$prev"; then
                     # Preload the old-style object.
                     func_append dlprefiles " $pic_object"
                     prev=
                   fi
 
                   # A PIC object.
                   func_append libobjs " $pic_object"
-                  arg="$pic_object"
+                  arg=$pic_object
                 fi
 
                 # Non-PIC object.
-                if test "$non_pic_object" != none; then
+                if test none != "$non_pic_object"; 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 "$pic_object" = none ; then
-                    arg="$non_pic_object"
+                  if test -z "$pic_object" || test none = "$pic_object"; 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
                 # Only an error if not doing a dry-run.
                 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
                   non_pic_object=$xdir$func_lo2o_result
                   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
           ;;
         rpath | xrpath)
           # We need an absolute path.
           case $arg in
           [\\/]* | [A-Za-z]:[\\/]*) ;;
           *)
             func_fatal_error "only absolute run-paths are allowed"
             ;;
           esac
-          if test "$prev" = rpath; then
+          if test rpath = "$prev"; then
             case "$rpath " in
             *" $arg "*) ;;
             *) func_append rpath " $arg" ;;
             esac
           else
             case "$xrpath " in
             *" $arg "*) ;;
             *) func_append xrpath " $arg" ;;
             esac
           fi
           prev=
           continue
           ;;
         shrext)
-          shrext_cmds="$arg"
+          shrext_cmds=$arg
           prev=
           continue
           ;;
         weak)
           func_append weak_libs " $arg"
           prev=
           continue
           ;;
         xcclinker)
           func_append linker_flags " $qarg"
@@ skipping 19 matching lines @@
           continue
           ;;
         *)
           eval "$prev=\"\$arg\""
           prev=
           continue
           ;;
         esac
       fi # test -n "$prev"
 
-      prevarg="$arg"
+      prevarg=$arg
 
       case $arg in
       -all-static)
         if test -n "$link_static_flag"; then
           # See comment for -static flag below, for more details.
           func_append compile_command " $link_static_flag"
           func_append finalize_command " $link_static_flag"
         fi
         continue
         ;;
 
       -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)
         avoid_version=yes
         continue
         ;;
 
       -bindir)
         prev=bindir
         continue
@@ skipping 11 matching lines @@
 
       -export-dynamic)
         export_dynamic=yes
         continue
         ;;
 
       -export-symbols | -export-symbols-regex)
         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$arg" = "X-export-symbols"; then
+        if test X-export-symbols = "X$arg"; then
           prev=expsyms
         else
           prev=expsyms_regex
         fi
         continue
         ;;
 
       -framework)
         prev=framework
         continue
@@ skipping 13 matching lines @@
           func_append finalize_command " $arg"
           ;;
         esac
         continue
         ;;
 
       -L*)
         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"
         dir=$func_resolve_sysroot_result
         # We need an absolute path.
         case $dir in
         [\\/]* | [A-Za-z]:[\\/]*) ;;
         *)
           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
         *" -L$dir "* | *" $arg "*)
           # Will only happen for absolute or sysroot arguments
           ;;
         *)
           # Preserve sysroot, but never include relative directories
           case $dir in
             [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
@@ skipping 14 matching lines @@
           *":$testbindir:"*) ;;
           ::) dllsearchpath=$testbindir;;
           *) func_append dllsearchpath ":$testbindir";;
           esac
           ;;
         esac
         continue
         ;;
 
       -l*)
-        if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+        if test X-lc = "X$arg" || test X-lm = "X$arg"; then
           case $host in
           *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
             # These systems don't actually have a C or math library (as such)
             continue
             ;;
           *-*-os2*)
             # These systems don't actually have a C library (as such)
-            test "X$arg" = "X-lc" && continue
+            test X-lc = "X$arg" && continue
             ;;
-          *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+          *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
             # Do not include libc due to us having libc/libc_r.
-            test "X$arg" = "X-lc" && continue
+            test X-lc = "X$arg" && continue
             ;;
           *-*-rhapsody* | *-*-darwin1.[012])
             # Rhapsody C and math libraries are in the System framework
             func_append deplibs " System.ltframework"
             continue
             ;;
           *-*-sco3.2v5* | *-*-sco5v6*)
             # Causes problems with __ctype
-            test "X$arg" = "X-lc" && continue
+            test X-lc = "X$arg" && continue
             ;;
           *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
             # Compiler inserts libc in the correct place for threads to work
-            test "X$arg" = "X-lc" && continue
+            test X-lc = "X$arg" && continue
             ;;
           esac
-        elif test "X$arg" = "X-lc_r"; then
+        elif test X-lc_r = "X$arg"; then
          case $host in
-         *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+         *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
            # Do not include libc_r directly, use -pthread flag.
            continue
            ;;
          esac
         fi
         func_append deplibs " $arg"
         continue
         ;;
 
+      -mllvm)
+        prev=mllvm
+        continue
+        ;;
+
       -module)
         module=yes
         continue
         ;;
 
       # Tru64 UNIX uses -model [arg] to determine the layout of C++
       # classes, name mangling, and exception handling.
       # Darwin uses the -arch flag to determine output architecture.
       -model|-arch|-isysroot|--sysroot)
         func_append compiler_flags " $arg"
         func_append compile_command " $arg"
         func_append finalize_command " $arg"
         prev=xcompiler
         continue
         ;;
 
       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
       |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
         func_append compiler_flags " $arg"
         func_append compile_command " $arg"
         func_append finalize_command " $arg"
         case "$new_inherited_linker_flags " in
             *" $arg "*) ;;
             * ) func_append new_inherited_linker_flags " $arg" ;;
         esac
         continue
         ;;
 
       -multi_module)
-        single_module="${wl}-multi_module"
+        single_module=$wl-multi_module
         continue
         ;;
 
       -no-fast-install)
         fast_install=no
         continue
         ;;
 
       -no-install)
         case $host in
         *-*-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 ;;
         esac
         continue
         ;;
 
       -no-undefined)
         allow_undefined=no
         continue
         ;;
 
       -objectlist)
         prev=objectlist
         continue
         ;;
 
+      -os2dllname)
+        prev=os2dllname
+        continue
+        ;;
+
       -o) prev=output ;;
 
       -precious-files-regex)
         prev=precious_regex
         continue
         ;;
 
       -release)
         prev=release
         continue
@@ skipping 67 matching lines @@
 
       -weak)
         prev=weak
         continue
         ;;
 
       -Wc,*)
         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
         ;;
 
       -Wl,*)
         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
         ;;
 
       -Xcompiler)
         prev=xcompiler
         continue
         ;;
 
       -Xlinker)
         prev=xlinker
         continue
         ;;
 
       -XCClinker)
         prev=xcclinker
         continue
         ;;
 
       # -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:
       # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
       # -r[0-9][0-9]*        specify processor for the SGI compiler
       # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
       # +DA*, +DD*           enable 64-bit mode for the HP compiler
       # -q*                  compiler args for the IBM compiler
       # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
       # -F/path              path to uninstalled frameworks, gcc on darwin
       # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # -fstack-protector*   stack protector flags for GCC
       # @file                GCC response files
       # -tp=*                Portland pgcc target processor selection
       # --sysroot=*          for sysroot support
-      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -stdlib=*            select c++ std lib with clang
       -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*|-flto*|-fwhopr*|-fuse-linker-plugin)
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
         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)
         # A standard object.
         func_append objs " $arg"
         ;;
 
       *.lo)
         # A libtool-controlled object.
 
         # Check to see that this really is a libtool object.
         if func_lalib_unsafe_p "$arg"; then
           pic_object=
           non_pic_object=
 
           # Read the .lo file
           func_source "$arg"
 
           if test -z "$pic_object" ||
              test -z "$non_pic_object" ||
-             test "$pic_object" = none &&
-             test "$non_pic_object" = none; then
-            func_fatal_error "cannot find name of object for \`$arg'"
+             test none = "$pic_object" &&
+             test none = "$non_pic_object"; 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 "$pic_object" != none; then
+          test none = "$pic_object" || {
             # Prepend the subdirectory the object is found in.
-            pic_object="$xdir$pic_object"
+            pic_object=$xdir$pic_object
 
-            if test "$prev" = dlfiles; then
-              if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+            if test dlfiles = "$prev"; then
+              if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
                 func_append dlfiles " $pic_object"
                 prev=
                 continue
               else
                 # If libtool objects are unsupported, then we need to preload.
                 prev=dlprefiles
               fi
             fi
 
             # CHECK ME:  I think I busted this.  -Ossama
-            if test "$prev" = dlprefiles; then
+            if test dlprefiles = "$prev"; then
               # Preload the old-style object.
               func_append dlprefiles " $pic_object"
               prev=
             fi
 
             # A PIC object.
             func_append libobjs " $pic_object"
-            arg="$pic_object"
-          fi
+            arg=$pic_object
+          }
 
           # Non-PIC object.
-          if test "$non_pic_object" != none; then
+          if test none != "$non_pic_object"; 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 "$pic_object" = none ; then
-              arg="$non_pic_object"
+            if test -z "$pic_object" || test none = "$pic_object"; 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
           # Only an error if not doing a dry-run.
           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
             non_pic_object=$xdir$func_lo2o_result
             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
         ;;
 
       *.$libext)
         # An archive.
         func_append deplibs " $arg"
         func_append old_deplibs " $arg"
         continue
         ;;
 
       *.la)
         # A libtool-controlled library.
 
         func_resolve_sysroot "$arg"
-        if test "$prev" = dlfiles; then
+        if test dlfiles = "$prev"; then
           # This library was specified with -dlopen.
           func_append dlfiles " $func_resolve_sysroot_result"
           prev=
-        elif test "$prev" = dlprefiles; then
+        elif test dlprefiles = "$prev"; then
           # The library was specified with -dlpreopen.
           func_append dlprefiles " $func_resolve_sysroot_result"
           prev=
         else
           func_append deplibs " $func_resolve_sysroot_result"
         fi
         continue
         ;;
 
       # Some other compiler argument.
       *)
         # 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
 
       # Now actually substitute the argument into the commands.
       if test -n "$arg"; then
         func_append compile_command " $arg"
         func_append finalize_command " $arg"
       fi
     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 "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+    if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
       eval arg=\"$export_dynamic_flag_spec\"
       func_append compile_command " $arg"
       func_append finalize_command " $arg"
     fi
 
     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.
     func_mkdir_p "$output_objdir"
 
     # Determine the type of output
     case $output in
     "")
       func_fatal_help "you must specify an output file"
       ;;
     *.$libext) linkmode=oldlib ;;
     *.lo | *.$objext) linkmode=obj ;;
     *.la) linkmode=lib ;;
     *) linkmode=prog ;; # Anything else should be a program.
     esac
 
     specialdeplibs=
 
     libs=
     # 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
       fi
       func_append libs " $deplib"
     done
 
-    if test "$linkmode" = lib; then
+    if test lib = "$linkmode"; then
       libs="$predeps $libs $compiler_lib_search_path $postdeps"
 
       # Compute libraries that are listed more than once in $predeps
       # $postdeps and mark them as special (i.e., whose duplicates are
       # not to be eliminated).
       pre_post_deps=
       if $opt_duplicate_compiler_generated_deps; then
         for pre_post_dep in $predeps $postdeps; do
           case "$pre_post_deps " in
           *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
@@ skipping 11 matching lines @@
     notinst_deplibs= # not-installed libtool libraries
     notinst_path= # paths that contain not-installed libtool libraries
 
     case $linkmode in
     lib)
         passes="conv dlpreopen link"
         for file in $dlfiles $dlprefiles; do
           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
         ;;
     prog)
         compile_deplibs=
         finalize_deplibs=
-        alldeplibs=no
+        alldeplibs=false
         newdlfiles=
         newdlprefiles=
         passes="conv scan dlopen dlpreopen link"
         ;;
     *)  passes="conv"
         ;;
     esac
 
     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 "$linkmode,$pass" = "lib,link"; then
+      if test lib,link = "$linkmode,$pass"; 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 "$linkmode,$pass" = "lib,link" ||
-         test "$linkmode,$pass" = "prog,scan"; then
-        libs="$deplibs"
+      if test lib,link = "$linkmode,$pass" ||
+         test prog,scan = "$linkmode,$pass"; then
+        libs=$deplibs
         deplibs=
       fi
-      if test "$linkmode" = prog; then
+      if test prog = "$linkmode"; 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 "$linkmode,$pass" = "lib,dlpreopen"; then
+      if test lib,dlpreopen = "$linkmode,$pass"; then
         # Collect and forward deplibs of preopened libtool libs
         for lib in $dlprefiles; do
           # Ignore non-libtool-libs
           dependency_libs=
           func_resolve_sysroot "$lib"
           case $lib in
           *.la) func_source "$func_resolve_sysroot_result" ;;
           esac
 
           # Collect preopened libtool deplibs, except any this library
           # has declared as weak libs
           for deplib in $dependency_libs; do
             func_basename "$deplib"
             deplib_base=$func_basename_result
             case " $weak_libs " in
             *" $deplib_base "*) ;;
             *) func_append deplibs " $deplib" ;;
             esac
           done
         done
-        libs="$dlprefiles"
+        libs=$dlprefiles
       fi
-      if test "$pass" = dlopen; then
+      if test dlopen = "$pass"; then
         # Collect dlpreopened libraries
-        save_deplibs="$deplibs"
+        save_deplibs=$deplibs
         deplibs=
       fi
 
       for deplib in $libs; do
         lib=
-        found=no
+        found=false
         case $deplib in
         -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
         |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-          if test "$linkmode,$pass" = "prog,link"; then
+          if test prog,link = "$linkmode,$pass"; then
             compile_deplibs="$deplib $compile_deplibs"
             finalize_deplibs="$deplib $finalize_deplibs"
           else
             func_append compiler_flags " $deplib"
-            if test "$linkmode" = lib ; then
+            if test lib = "$linkmode"; then
                 case "$new_inherited_linker_flags " in
                     *" $deplib "*) ;;
                     * ) func_append new_inherited_linker_flags " $deplib" ;;
                 esac
             fi
           fi
           continue
           ;;
         -l*)
-          if test "$linkmode" != lib && test "$linkmode" != prog; then
-            func_warning "\`-l' is ignored for archives/objects"
+          if test lib != "$linkmode" && test prog != "$linkmode"; then
+            func_warning "'-l' is ignored for archives/objects"
             continue
           fi
           func_stripname '-l' '' "$deplib"
           name=$func_stripname_result
-          if test "$linkmode" = lib; then
+          if test lib = "$linkmode"; 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"
           fi
           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 "$search_ext" = ".la"; then
-                  found=yes
+                if test .la = "$search_ext"; then
+                  found=:
                 else
-                  found=no
+                  found=false
                 fi
                 break 2
               fi
             done
           done
-          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 $found; then
+            # 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 "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+            if test yes = "$allow_libtool_libs_with_static_runtimes"; then
               case " $predeps $postdeps " in
               *" $deplib "*)
                 if func_lalib_p "$lib"; then
                   library_names=
                   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=no
+                  if test "X$ll" = "X$old_library"; then # only static version available
+                    found=false
                     func_dirname "$lib" "" "."
-                    ladir="$func_dirname_result"
+                    ladir=$func_dirname_result
                     lib=$ladir/$old_library
-                    if test "$linkmode,$pass" = "prog,link"; then
+                    if test prog,link = "$linkmode,$pass"; then
                       compile_deplibs="$deplib $compile_deplibs"
                       finalize_deplibs="$deplib $finalize_deplibs"
                     else
                       deplibs="$deplib $deplibs"
-                      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+                      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
                     fi
                     continue
                   fi
                 fi
                 ;;
               *) ;;
               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 "$linkmode,$pass" = "prog,link"; then
+          if test prog,link = "$linkmode,$pass"; then
             compile_deplibs="$deplib $compile_deplibs"
             finalize_deplibs="$deplib $finalize_deplibs"
           else
             deplibs="$deplib $deplibs"
-            if test "$linkmode" = lib ; then
+            if test lib = "$linkmode"; then
                 case "$new_inherited_linker_flags " in
                     *" $deplib "*) ;;
                     * ) func_append new_inherited_linker_flags " $deplib" ;;
                 esac
             fi
           fi
           continue
           ;;
         -L*)
           case $linkmode in
           lib)
             deplibs="$deplib $deplibs"
-            test "$pass" = conv && continue
+            test conv = "$pass" && 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 "$pass" = conv; then
+            if test conv = "$pass"; then
               deplibs="$deplib $deplibs"
               continue
             fi
-            if test "$pass" = scan; then
+            if test scan = "$pass"; then
               deplibs="$deplib $deplibs"
             else
               compile_deplibs="$deplib $compile_deplibs"
               finalize_deplibs="$deplib $finalize_deplibs"
             fi
             func_stripname '-L' '' "$deplib"
             func_resolve_sysroot "$func_stripname_result"
             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 "$pass" = link; then
+          if test link = "$pass"; then
             func_stripname '-R' '' "$deplib"
             func_resolve_sysroot "$func_stripname_result"
             dir=$func_resolve_sysroot_result
             # Make sure the xrpath contains only unique directories.
             case "$xrpath " in
             *" $dir "*) ;;
             *) func_append xrpath " $dir" ;;
             esac
           fi
           deplibs="$deplib $deplibs"
           continue
           ;;
         *.la)
           func_resolve_sysroot "$deplib"
           lib=$func_resolve_sysroot_result
           ;;
         *.$libext)
-          if test "$pass" = conv; then
+          if test conv = "$pass"; then
             deplibs="$deplib $deplibs"
             continue
           fi
           case $linkmode in
           lib)
             # Linking convenience modules into shared libraries is allowed,
             # but linking other static libraries is non-portable.
             case " $dlpreconveniencelibs " in
             *" $deplib "*) ;;
             *)
-              valid_a_lib=no
+              valid_a_lib=false
               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=yes
+                    valid_a_lib=:
                   fi
                 ;;
                 pass_all)
-                  valid_a_lib=yes
+                  valid_a_lib=:
                 ;;
               esac
-              if test "$valid_a_lib" != yes; then
+              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
                 echo
                 $ECHO "*** Warning: Trying to link with static lib archive $deplib."
                 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"
                 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 "$pass" != link; then
+            if test link != "$pass"; then
               deplibs="$deplib $deplibs"
             else
               compile_deplibs="$deplib $compile_deplibs"
               finalize_deplibs="$deplib $finalize_deplibs"
             fi
             continue
             ;;
           esac # linkmode
           ;; # *.$libext
         *.lo | *.$objext)
-          if test "$pass" = conv; then
+          if test conv = "$pass"; then
             deplibs="$deplib $deplibs"
-          elif test "$linkmode" = prog; then
-            if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+          elif test prog = "$linkmode"; then
+            if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
               # If there is no dlopen support or we're linking statically,
               # we need to preload.
               func_append newdlprefiles " $deplib"
               compile_deplibs="$deplib $compile_deplibs"
               finalize_deplibs="$deplib $finalize_deplibs"
             else
               func_append newdlfiles " $deplib"
             fi
           fi
           continue
           ;;
         %DEPLIBS%)
-          alldeplibs=yes
+          alldeplibs=:
           continue
           ;;
         esac # case $deplib
 
-        if test "$found" = yes || test -f "$lib"; then :
-        else
-          func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-        fi
+        $found || test -f "$lib" \
+          || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
 
         # 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=
         dlpreopen=
         libdir=
         library_names=
         old_library=
         inherited_linker_flags=
         # If the library was installed with an old release of libtool,
         # it will not redefine variables installed, or shouldnotlink
         installed=yes
         shouldnotlink=no
         avoidtemprpath=
 
 
         # Read the .la file
         func_source "$lib"
 
         # Convert "-framework foo" to "foo.ltframework"
         if test -n "$inherited_linker_flags"; then
           tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
           for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
             case " $new_inherited_linker_flags " in
               *" $tmp_inherited_linker_flag "*) ;;
               *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
             esac
           done
         fi
         dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-        if test "$linkmode,$pass" = "lib,link" ||
-           test "$linkmode,$pass" = "prog,scan" ||
-           { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+        if test lib,link = "$linkmode,$pass" ||
+           test prog,scan = "$linkmode,$pass" ||
+           { test prog != "$linkmode" && test lib != "$linkmode"; }; then
           test -n "$dlopen" && func_append dlfiles " $dlopen"
           test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
         fi
 
-        if test "$pass" = conv; then
+        if test conv = "$pass"; 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 "$linkmode" != prog && test "$linkmode" != lib; then
-            func_fatal_error "\`$lib' is not a convenience library"
+          elif test prog != "$linkmode" && test lib != "$linkmode"; 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
             fi
             func_append tmp_libs " $deplib"
           done
           continue
         fi # $pass = conv
 
 
         # Get the name of the library we link against.
         linklib=
         if test -n "$old_library" &&
-           { test "$prefer_static_libs" = yes ||
-             test "$prefer_static_libs,$installed" = "built,no"; }; then
+           { test yes = "$prefer_static_libs" ||
+             test built,no = "$prefer_static_libs,$installed"; }; 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 "$pass" = dlopen; then
-          if test -z "$libdir"; then
-            func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-          fi
+        if test dlopen = "$pass"; then
+          test -z "$libdir" \
+            && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
           if test -z "$dlname" ||
-             test "$dlopen_support" != yes ||
-             test "$build_libtool_libs" = no; then
+             test yes != "$dlopen_support" ||
+             test no = "$build_libtool_libs"
+          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
             # bomb out in the load deplibs phase.
             func_append dlprefiles " $lib $dependency_libs"
           else
             func_append newdlfiles " $lib"
           fi
           continue
         fi # $pass = dlopen
 
         # 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 "X$installed" = Xyes; then
+        if test yes = "$installed"; 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 "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+          test yes = "$hardcode_automatic" && 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
         fi # $installed = yes
         func_stripname 'lib' '.la' "$laname"
         name=$func_stripname_result
 
         # This library was specified with -dlpreopen.
-        if test "$pass" = dlpreopen; then
-          if test -z "$libdir" && test "$linkmode" = prog; then
-            func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+        if test dlpreopen = "$pass"; then
+          if test -z "$libdir" && test prog = "$linkmode"; 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
               # static and shared are present.  Therefore, ensure we extract
               # symbols from the import library if a shared library is present
               # (otherwise, the dlopen module name will be incorrect).  We do
               # this by putting the import library name into $newdlprefiles.
               # We recover the dlopen module name by 'saving' the la file
               # name in a special purpose variable, and (later) extracting the
               # dlname from the la file.
@@ skipping 23 matching lines @@
                 func_append newdlprefiles " $dir/$dlname"
               else
                 func_append newdlprefiles " $dir/$linklib"
               fi
             ;;
           esac
         fi # $pass = dlpreopen
 
         if test -z "$libdir"; then
           # Link the convenience library
-          if test "$linkmode" = lib; then
+          if test lib = "$linkmode"; then
             deplibs="$dir/$old_library $deplibs"
-          elif test "$linkmode,$pass" = "prog,link"; then
+          elif test prog,link = "$linkmode,$pass"; then
             compile_deplibs="$dir/$old_library $compile_deplibs"
             finalize_deplibs="$dir/$old_library $finalize_deplibs"
           else
             deplibs="$lib $deplibs" # used for prog,scan pass
           fi
           continue
         fi
 
 
-        if test "$linkmode" = prog && test "$pass" != link; then
+        if test prog = "$linkmode" && test link != "$pass"; then
           func_append newlib_search_path " $ladir"
           deplibs="$lib $deplibs"
 
-          linkalldeplibs=no
-          if test "$link_all_deplibs" != no || test -z "$library_names" ||
-             test "$build_libtool_libs" = no; then
-            linkalldeplibs=yes
+          linkalldeplibs=false
+          if test no != "$link_all_deplibs" || test -z "$library_names" ||
+             test no = "$build_libtool_libs"; then
+            linkalldeplibs=:
           fi
 
           tmp_libs=
           for deplib in $dependency_libs; do
             case $deplib in
             -L*) func_stripname '-L' '' "$deplib"
                  func_resolve_sysroot "$func_stripname_result"
                  func_append newlib_search_path " $func_resolve_sysroot_result"
                  ;;
             esac
             # Need to link against all dependency_libs?
-            if test "$linkalldeplibs" = yes; then
+            if $linkalldeplibs; 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
             fi
             func_append tmp_libs " $deplib"
           done # for deplib
           continue
         fi # $linkmode = prog...
 
-        if test "$linkmode,$pass" = "prog,link"; then
+        if test prog,link = "$linkmode,$pass"; then
           if test -n "$library_names" &&
-             { { test "$prefer_static_libs" = no ||
-                 test "$prefer_static_libs,$installed" = "built,yes"; } ||
+             { { test no = "$prefer_static_libs" ||
+                 test built,yes = "$prefer_static_libs,$installed"; } ||
                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
             fi
 
             # Hardcode the library path.
             # Skip directories that are in the system default run-time
             # search path.
             case " $sys_lib_dlsearch_path " in
             *" $absdir "*) ;;
             *)
               case "$compile_rpath " in
               *" $absdir "*) ;;
               *) func_append compile_rpath " $absdir" ;;
               esac
               ;;
             esac
             case " $sys_lib_dlsearch_path " in
             *" $libdir "*) ;;
             *)
               case "$finalize_rpath " in
               *" $libdir "*) ;;
               *) func_append finalize_rpath " $libdir" ;;
               esac
               ;;
             esac
           fi # $linkmode,$pass = prog,link...
 
-          if test "$alldeplibs" = yes &&
-             { test "$deplibs_check_method" = pass_all ||
-               { test "$build_libtool_libs" = yes &&
+          if $alldeplibs &&
+             { test pass_all = "$deplibs_check_method" ||
+               { test yes = "$build_libtool_libs" &&
                  test -n "$library_names"; }; }; then
             # We only need to search for static libraries
             continue
           fi
         fi
 
         link_static=no # Whether the deplib will be linked statically
         use_static_libs=$prefer_static_libs
-        if test "$use_static_libs" = built && test "$installed" = yes; then
+        if test built = "$use_static_libs" && test yes = "$installed"; then
           use_static_libs=no
         fi
         if test -n "$library_names" &&
-           { test "$use_static_libs" = no || test -z "$old_library"; }; then
+           { test no = "$use_static_libs" || test -z "$old_library"; }; then
           case $host in
-          *cygwin* | *mingw* | *cegcc*)
+          *cygwin* | *mingw* | *cegcc* | *os2*)
               # No point in relinking DLLs because paths are not encoded
               func_append notinst_deplibs " $lib"
               need_relink=no
             ;;
           *)
-            if test "$installed" = no; then
+            if test no = "$installed"; then
               func_append notinst_deplibs " $lib"
               need_relink=yes
             fi
             ;;
           esac
           # This is a shared library
 
           # 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 "$shouldnotlink" = yes && test "$pass" = link; then
+          if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
             echo
-            if test "$linkmode" = prog; then
+            if test prog = "$linkmode"; 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 "$linkmode" = lib &&
-             test "$hardcode_into_libs" = yes; then
+          if test lib = "$linkmode" &&
+             test yes = "$hardcode_into_libs"; then
             # Hardcode the library path.
             # Skip directories that are in the system default run-time
             # search path.
             case " $sys_lib_dlsearch_path " in
             *" $absdir "*) ;;
             *)
               case "$compile_rpath " in
               *" $absdir "*) ;;
               *) func_append compile_rpath " $absdir" ;;
               esac
               ;;
             esac
             case " $sys_lib_dlsearch_path " in
             *" $libdir "*) ;;
             *)
               case "$finalize_rpath " in
               *" $libdir "*) ;;
               *) func_append finalize_rpath " $libdir" ;;
               esac
               ;;
             esac
           fi
 
           if test -n "$old_archive_from_expsyms_cmds"; then
             # 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*)
+              *cygwin* | mingw* | *cegcc* | *os2*)
                 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
             dir=$output_objdir
             linklib=$newlib
           fi # test -n "$old_archive_from_expsyms_cmds"
 
-          if test "$linkmode" = prog || test "$opt_mode" != relink; then
+          if test prog = "$linkmode" || test relink != "$opt_mode"; then
             add_shlibpath=
             add_dir=
             add=
             lib_linked=yes
             case $hardcode_action in
             immediate | unsupported)
-              if test "$hardcode_direct" = no; then
-                add="$dir/$linklib"
+              if test no = "$hardcode_direct"; 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 can not
+                    # if the lib is a (non-dlopened) module then we cannot
                     # 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 "$hardcode_minus_L" = no; then
+              elif test no = "$hardcode_minus_L"; then
                 case $host in
-                *-*-sunos*) add_shlibpath="$dir" ;;
+                *-*-sunos*) add_shlibpath=$dir ;;
                 esac
-                add_dir="-L$dir"
-                add="-l$name"
-              elif test "$hardcode_shlibpath_var" = no; then
-                add_shlibpath="$dir"
-                add="-l$name"
+                add_dir=-L$dir
+                add=-l$name
+              elif test no = "$hardcode_shlibpath_var"; then
+                add_shlibpath=$dir
+                add=-l$name
               else
                 lib_linked=no
               fi
               ;;
             relink)
-              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"
+              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
                 # Try looking first in the location we're being installed to.
                 if test -n "$inst_prefix_dir"; then
                   case $libdir in
                     [\\/]*)
                       func_append add_dir " -L$inst_prefix_dir$libdir"
                       ;;
                   esac
                 fi
-                add="-l$name"
-              elif test "$hardcode_shlibpath_var" = yes; then
-                add_shlibpath="$dir"
-                add="-l$name"
+                add=-l$name
+              elif test yes = "$hardcode_shlibpath_var"; then
+                add_shlibpath=$dir
+                add=-l$name
               else
                 lib_linked=no
               fi
               ;;
             *) lib_linked=no ;;
             esac
 
-            if test "$lib_linked" != yes; then
+            if test yes != "$lib_linked"; then
               func_fatal_configuration "unsupported hardcode properties"
             fi
 
             if test -n "$add_shlibpath"; then
               case :$compile_shlibpath: in
               *":$add_shlibpath:"*) ;;
               *) func_append compile_shlibpath "$add_shlibpath:" ;;
               esac
             fi
-            if test "$linkmode" = prog; then
+            if test prog = "$linkmode"; 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 "$hardcode_direct" != yes &&
-                 test "$hardcode_minus_L" != yes &&
-                 test "$hardcode_shlibpath_var" = yes; then
+              if test yes != "$hardcode_direct" &&
+                 test yes != "$hardcode_minus_L" &&
+                 test yes = "$hardcode_shlibpath_var"; then
                 case :$finalize_shlibpath: in
                 *":$libdir:"*) ;;
                 *) func_append finalize_shlibpath "$libdir:" ;;
                 esac
               fi
             fi
           fi
 
-          if test "$linkmode" = prog || test "$opt_mode" = relink; then
+          if test prog = "$linkmode" || test relink = "$opt_mode"; then
             add_shlibpath=
             add_dir=
             add=
             # Finalize command for both is simple: just hardcode it.
-            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
+            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
               case :$finalize_shlibpath: in
               *":$libdir:"*) ;;
               *) func_append finalize_shlibpath "$libdir:" ;;
               esac
-              add="-l$name"
-            elif test "$hardcode_automatic" = yes; then
+              add=-l$name
+            elif test yes = "$hardcode_automatic"; 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
                   [\\/]*)
                     func_append add_dir " -L$inst_prefix_dir$libdir"
                     ;;
                 esac
               fi
-              add="-l$name"
+              add=-l$name
             fi
 
-            if test "$linkmode" = prog; then
+            if test prog = "$linkmode"; then
               test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
               test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
             else
               test -n "$add_dir" && deplibs="$add_dir $deplibs"
               test -n "$add" && deplibs="$add $deplibs"
             fi
           fi
-        elif test "$linkmode" = prog; then
+        elif test prog = "$linkmode"; 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 "$hardcode_direct" != unsupported; then
-            test -n "$old_library" && linklib="$old_library"
+          if test unsupported != "$hardcode_direct"; 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 "$build_libtool_libs" = yes; then
+        elif test yes = "$build_libtool_libs"; then
           # Not a shared library
-          if test "$deplibs_check_method" != pass_all; then
+          if test pass_all != "$deplibs_check_method"; 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 can not link to static lib archive $lib."
+            $ECHO "*** Warning: This system cannot 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 "$module" = yes; then
+            if test yes = "$module"; 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 "$build_old_libs" = no; then
+              if test no = "$build_old_libs"; then
                 build_libtool_libs=module
                 build_old_libs=yes
               else
                 build_libtool_libs=no
               fi
             fi
           else
             deplibs="$dir/$old_library $deplibs"
             link_static=yes
           fi
         fi # link shared/static library?
 
-        if test "$linkmode" = lib; then
+        if test lib = "$linkmode"; then
           if test -n "$dependency_libs" &&
-             { test "$hardcode_into_libs" != yes ||
-               test "$build_old_libs" = yes ||
-               test "$link_static" = yes; }; then
+             { test yes != "$hardcode_into_libs" ||
+               test yes = "$build_old_libs" ||
+               test yes = "$link_static"; }; then
             # Extract -R from dependency_libs
             temp_deplibs=
             for libdir in $dependency_libs; do
               case $libdir in
               -R*) func_stripname '-R' '' "$libdir"
                    temp_xrpath=$func_stripname_result
                    case " $xrpath " in
                    *" $temp_xrpath "*) ;;
                    *) func_append xrpath " $temp_xrpath";;
                    esac;;
               *) 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 "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+          test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
           # ... and its dependency_libs
           tmp_libs=
           for deplib in $dependency_libs; do
             newdependency_libs="$deplib $newdependency_libs"
             case $deplib in
               -L*) func_stripname '-L' '' "$deplib"
                    func_resolve_sysroot "$func_stripname_result";;
               *) func_resolve_sysroot "$deplib" ;;
             esac
-            if $opt_preserve_dup_deps ; then
+            if $opt_preserve_dup_deps; then
               case "$tmp_libs " in
               *" $func_resolve_sysroot_result "*)
                 func_append specialdeplibs " $func_resolve_sysroot_result" ;;
               esac
             fi
             func_append tmp_libs " $func_resolve_sysroot_result"
           done
 
-          if test "$link_all_deplibs" != no; then
+          if test no != "$link_all_deplibs"; 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
                 func_dirname "$deplib" "" "."
                 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
                 if $GREP "^installed=no" $deplib > /dev/null; then
                 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"
-                  #test "$absdir" != "$libdir" && \
-                  #  func_warning "\`$deplib' seems to be moved"
+                    func_fatal_error "'$deplib' is not a valid libtool archive"
+                  test "$absdir" != "$libdir" && \
+                    func_warning "'$deplib' seems to be moved"
 
-                  path="-L$absdir"
+                  path=-L$absdir
                 fi
                 ;;
               esac
               case " $deplibs " in
               *" $path "*) ;;
               *) deplibs="$path $deplibs" ;;
               esac
             done
           fi # link_all_deplibs != no
         fi # linkmode = lib
       done # for deplib in $libs
-      if test "$pass" = link; then
-        if test "$linkmode" = "prog"; then
+      if test link = "$pass"; then
+        if test prog = "$linkmode"; 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 "$pass" = dlpreopen; then
+      dependency_libs=$newdependency_libs
+      if test dlpreopen = "$pass"; then
         # Link the dlpreopened libraries before other libraries
         for deplib in $save_deplibs; do
           deplibs="$deplib $deplibs"
         done
       fi
-      if test "$pass" != dlopen; then
-        if test "$pass" != conv; then
+      if test dlopen != "$pass"; then
+        test conv = "$pass" || {
           # Make sure lib_search_path contains only unique directories.
           lib_search_path=
           for dir in $newlib_search_path; do
             case "$lib_search_path " in
             *" $dir "*) ;;
             *) func_append lib_search_path " $dir" ;;
             esac
           done
           newlib_search_path=
-        fi
+        }
 
-        if test "$linkmode,$pass" != "prog,link"; then
-          vars="deplibs"
+        if test prog,link = "$linkmode,$pass"; then
+          vars="compile_deplibs finalize_deplibs"
         else
-          vars="compile_deplibs finalize_deplibs"
+          vars=deplibs
         fi
         for var in $vars dependency_libs; do
           # Add libraries to $var in reverse order
           eval tmp_libs=\"\$$var\"
           new_libs=
           for deplib in $tmp_libs; do
             # FIXME: Pedantically, this is the right thing to do, so
             #        that some nasty dependency loop isn't accidentally
             #        broken:
             #new_libs="$deplib $new_libs"
@@ skipping 37 matching lines @@
               *" $deplib "*) ;;
               *) func_append tmp_libs " $deplib" ;;
               esac
               ;;
             *) func_append tmp_libs " $deplib" ;;
             esac
           done
           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 "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
+    if test prog = "$linkmode"; then
+      dlfiles=$newdlfiles
     fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
+    if test prog = "$linkmode" || test lib = "$linkmode"; then
+      dlprefiles=$newdlprefiles
     fi
 
     case $linkmode in
     oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-        func_warning "\`-dlopen' is ignored for archives"
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; 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"
         name=$func_stripname_result
         eval shared_ext=\"$shrext_cmds\"
         eval libname=\"$libname_spec\"
         ;;
       *)
-        test "$module" = no && \
-          func_fatal_help "libtool library \`$output' must begin with \`lib'"
+        test no = "$module" \
+          && func_fatal_help "libtool library '$output' must begin with 'lib'"
 
-        if test "$need_lib_prefix" != no; then
+        if test no != "$need_lib_prefix"; then
           # Add the "lib" prefix for modules if required
           func_stripname '' '.la' "$outputname"
           name=$func_stripname_result
           eval shared_ext=\"$shrext_cmds\"
           eval libname=\"$libname_spec\"
         else
           func_stripname '' '.la' "$outputname"
           libname=$func_stripname_result
         fi
         ;;
       esac
 
       if test -n "$objs"; then
-        if test "$deplibs_check_method" != pass_all; then
-          func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+        if test pass_all != "$deplibs_check_method"; 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"
           $ECHO "*** objects $objs is not portable!"
           func_append libobjs " $objs"
         fi
       fi
 
-      test "$dlself" != no && \
-        func_warning "\`-dlopen self' is ignored for libtool libraries"
+      test no = "$dlself" \
+        || func_warning "'-dlopen self' is ignored for libtool libraries"
 
       set dummy $rpath
       shift
-      test "$#" -gt 1 && \
-        func_warning "ignoring multiple \`-rpath's for a libtool library"
+      test 1 -lt "$#" \
+        && func_warning "ignoring multiple '-rpath's for a libtool library"
 
-      install_libdir="$1"
+      install_libdir=$1
 
       oldlibs=
       if test -z "$rpath"; then
-        if test "$build_libtool_libs" = yes; then
+        if test yes = "$build_libtool_libs"; 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"
           build_libtool_libs=convenience
           build_old_libs=yes
         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
         # to make the code below a bit more comprehensible
 
         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
-          # which has an extra 1 added just for fun
+          # that has an extra 1 added just for fun
           #
           case $version_type in
           # correct linux to gnu/linux during the next big refactor
-          darwin|linux|osf|windows|none)
+          darwin|freebsd-elf|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|freebsd-elf|qnx|sunos)
-            current="$number_major"
-            revision="$number_minor"
-            age="0"
+          freebsd-aout|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
 
         # Check that each of the things are valid numbers.
         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.
         major=
         versuffix=
         verstring=
         case $version_type in
         none) ;;
 
         darwin)
           # Like Linux, but with the current version available in
           # 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)
-          major=".$current"
-          versuffix=".$current"
+          func_arith $current - $age
+          major=.$func_arith_result
+          versuffix=$major.$age.$revision
           ;;
 
         irix | nonstopux)
-          if test "X$lt_irix_increment" = "Xno"; then
+          if test no = "$lt_irix_increment"; then
             func_arith $current - $age
           else
             func_arith $current - $age + 1
           fi
           major=$func_arith_result
 
           case $version_type in
             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 "$loop" -ne 0; do
+          while test 0 -ne "$loop"; 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 "$loop" -ne 0; do
+          while test 0 -ne "$loop"; 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"
+          major=.$current
+          versuffix=.$current
+          ;;
+
+        sco)
+          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 filesystems.
+          # extension on DOS 8.3 file systems.
           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
 
         # Clear the version info if we defaulted, and they specified a release.
         if test -z "$vinfo" && test -n "$release"; then
           major=
           case $version_type in
           darwin)
             # we can't check for "0.0" in archive_cmds due to quoting
             # problems, so we reset it completely
             verstring=
             ;;
           *)
-            verstring="0.0"
+            verstring=0.0
             ;;
           esac
-          if test "$need_version" = no; then
+          if test no = "$need_version"; then
             versuffix=
           else
-            versuffix=".0.0"
+            versuffix=.0.0
           fi
         fi
 
         # Remove version info from name if versioning should be avoided
-        if test "$avoid_version" = yes && test "$need_version" = no; then
+        if test yes,no = "$avoid_version,$need_version"; then
           major=
           versuffix=
-          verstring=""
+          verstring=
         fi
 
         # Check to see if the archive will have undefined symbols.
-        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
+        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
           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" "yes"
+      func_generate_dlsyms "$libname" "$libname" :
       func_append libobjs " $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
+      test " " = "$libobjs" && libobjs=
 
-      if test "$opt_mode" != relink; then
+      if test relink != "$opt_mode"; then
         # Remove our outputs, but don't remove object files since they
         # may have been created when compiling PIC objects.
         removelist=
         tempremovelist=`$ECHO "$output_objdir/*"`
         for p in $tempremovelist; do
           case $p in
             *.$objext | *.gcno)
                ;;
-            $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-               if test "X$precious_files_regex" != "X"; then
+            $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+               if test -n "$precious_files_regex"; then
                  if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
                  then
                    continue
                  fi
                fi
                func_append removelist " $p"
                ;;
             *) ;;
           esac
         done
         test -n "$removelist" && \
           func_show_eval "${RM}r \$removelist"
       fi
 
       # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; 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.
       #for path in $notinst_path; do
       # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
       # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
       # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
       #done
 
       if test -n "$xrpath"; then
         # If the user specified any rpath flags, then add them.
         temp_xrpath=
         for libdir in $xrpath; do
           func_replace_sysroot "$libdir"
           func_append temp_xrpath " -R$func_replace_sysroot_result"
           case "$finalize_rpath " in
           *" $libdir "*) ;;
           *) func_append finalize_rpath " $libdir" ;;
           esac
         done
-        if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+        if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; 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
         *" $lib "*) ;;
         *) func_append dlfiles " $lib" ;;
         esac
       done
 
       # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
+      old_dlprefiles=$dlprefiles
       dlprefiles=
       for lib in $old_dlprefiles; do
         case "$dlprefiles " in
         *" $lib "*) ;;
         *) func_append dlprefiles " $lib" ;;
         esac
       done
 
-      if test "$build_libtool_libs" = yes; then
+      if test yes = "$build_libtool_libs"; then
         if test -n "$rpath"; then
           case $host in
           *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
             # these systems don't actually have a c library (as such)!
             ;;
           *-*-rhapsody* | *-*-darwin1.[012])
             # Rhapsody C library is in the System framework
             func_append deplibs " System.ltframework"
             ;;
           *-*-netbsd*)
             # Don't link with libc until the a.out ld.so is fixed.
             ;;
           *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
             # Do not include libc due to us having libc/libc_r.
             ;;
           *-*-sco3.2v5* | *-*-sco5v6*)
             # Causes problems with __ctype
             ;;
           *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
             # Compiler inserts libc in the correct place for threads to work
             ;;
           *)
             # Add libc to deplibs on all other systems if necessary.
-            if test "$build_libtool_need_lc" = "yes"; then
+            if test yes = "$build_libtool_need_lc"; then
               func_append deplibs " -lc"
             fi
             ;;
           esac
         fi
 
         # Transform deplibs into only deplibs that can be linked in shared.
         name_save=$name
         libname_save=$libname
         release_save=$release
         versuffix_save=$versuffix
         major_save=$major
         # 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
         pass_all)
           # Don't check for shared/static.  Everything works.
           # This might be a little naive.  We might want to check
           # whether the library exists or not.  But this is on
           # osf3 & osf4 and I'm not really sure... Just
           # implementing what was already the behavior.
           newdeplibs=$deplibs
           ;;
         test_compile)
           # This code stresses the "libraries are programs" paradigm to its
           # limits. Maybe even breaks it.  We compile a program, linking it
           # against the deplibs as a proxy for the library.  Then we can check
           # whether they linked in statically or dynamically with ldd.
           $opt_dry_run || $RM conftest.c
           cat > conftest.c <<EOF
           int main() { return 0; }
 EOF
           $opt_dry_run || $RM conftest
           if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
             ldd_output=`ldd conftest`
             for i in $deplibs; do
               case $i in
               -l*)
                 func_stripname -l '' "$i"
                 name=$func_stripname_result
-                if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+                if test yes = "$allow_libtool_libs_with_static_runtimes"; 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
                     echo
                     $ECHO "*** Warning: dynamic linker does not accept needed library $i."
                     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 I believe you do not have"
                     echo "*** because a test_compile did reveal that the linker did not use it for"
                     echo "*** its dynamic dependency list that programs get resolved with at runtime."
                   fi
                 fi
                 ;;
               *)
                 func_append newdeplibs " $i"
                 ;;
               esac
             done
           else
             # Error occurred in the first compile.  Let's try to salvage
             # the situation: Compile a separate program for each library.
             for i in $deplibs; do
               case $i in
               -l*)
                 func_stripname -l '' "$i"
                 name=$func_stripname_result
                 $opt_dry_run || $RM conftest
                 if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
                   ldd_output=`ldd conftest`
-                  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+                  if test yes = "$allow_libtool_libs_with_static_runtimes"; 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
                       echo
                       $ECHO "*** Warning: dynamic linker does not accept needed library $i."
                       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"
                       echo "*** because a test_compile did reveal that the linker did not use this one"
                       echo "*** as a dynamic dependency that programs can get resolved with at runtime."
@@ skipping 16 matching lines @@
           fi
           ;;
         file_magic*)
           set dummy $deplibs_check_method; shift
           file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
           for a_deplib in $deplibs; do
             case $a_deplib in
             -l*)
               func_stripname -l '' "$a_deplib"
               name=$func_stripname_result
-              if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+              if test yes = "$allow_libtool_libs_with_static_runtimes"; 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 "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+                test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
                 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-                  if test "$want_nocaseglob" = yes; then
+                  if test yes = "$want_nocaseglob"; then
                     shopt -s nocaseglob
                     potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
                     $nocaseglob
                   else
                     potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
                   fi
                   for potent_lib in $potential_libs; do
                       # Follow soft links.
                       if ls -lLd "$potent_lib" 2>/dev/null |
                          $GREP " -> " >/dev/null; then
                         continue
                       fi
                       # The statement above tries to avoid entering an
                       # endless loop below, in case of cyclic links.
                       # 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."
                 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"
                 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"
                   $ECHO "*** using a file magic. Last file checked: $potlib"
                 fi
               fi
               ;;
             *)
               # Add a -L argument.
               func_append newdeplibs " $a_deplib"
               ;;
             esac
           done # Gone through all deplibs.
           ;;
         match_pattern*)
           set dummy $deplibs_check_method; shift
           match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
           for a_deplib in $deplibs; do
             case $a_deplib in
             -l*)
               func_stripname -l '' "$a_deplib"
               name=$func_stripname_result
-              if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+              if test yes = "$allow_libtool_libs_with_static_runtimes"; 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."
                 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"
                 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"
                   $ECHO "*** using a regex pattern. Last file checked: $potlib"
                 fi
               fi
               ;;
             *)
               # Add a -L argument.
               func_append newdeplibs " $a_deplib"
               ;;
             esac
           done # Gone through all deplibs.
           ;;
         none | unknown | *)
-          newdeplibs=""
+          newdeplibs=
           tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
-          if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-            for i in $predeps $postdeps ; do
+          if test yes = "$allow_libtool_libs_with_static_runtimes"; 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 "X$deplibs_check_method" = "Xnone"; then
+            if test none = "$deplibs_check_method"; then
               echo "*** Warning: inter-library dependencies are not supported in this platform."
             else
               echo "*** Warning: inter-library dependencies are not known to be supported."
             fi
             echo "*** All declared inter-library dependencies are being dropped."
             droppeddeps=yes
             ;;
           esac
           ;;
         esac
         versuffix=$versuffix_save
         major=$major_save
         release=$release_save
         libname=$libname_save
         name=$name_save
 
         case $host in
         *-*-rhapsody* | *-*-darwin1.[012])
           # On Rhapsody replace the C library with the System framework
           newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
           ;;
         esac
 
-        if test "$droppeddeps" = yes; then
-          if test "$module" = yes; then
+        if test yes = "$droppeddeps"; then
+          if test yes = "$module"; then
             echo
             echo "*** Warning: libtool could not satisfy all declared inter-library"
             $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
             echo "*** a static module, that should work as long as the dlopening"
             echo "*** application is linked with the -dlopen flag."
             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 "$build_old_libs" = no; then
-              oldlibs="$output_objdir/$libname.$libext"
+            if test no = "$build_old_libs"; then
+              oldlibs=$output_objdir/$libname.$libext
               build_libtool_libs=module
               build_old_libs=yes
             else
               build_libtool_libs=no
             fi
           else
             echo "*** The inter-library dependencies that have been dropped here will be"
             echo "*** automatically added whenever a program is linked with this library"
             echo "*** or is declared to -dlopen it."
 
-            if test "$allow_undefined" = no; then
+            if test no = "$allow_undefined"; 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 "$build_old_libs" = no; then
-                oldlibs="$output_objdir/$libname.$libext"
+              if test no = "$build_old_libs"; then
+                oldlibs=$output_objdir/$libname.$libext
                 build_libtool_libs=module
                 build_old_libs=yes
               else
                 build_libtool_libs=no
               fi
             fi
           fi
         fi
         # Done checking deplibs!
         deplibs=$newdeplibs
@@ skipping 25 matching lines @@
         case $deplib in
         -L*)
           case " $new_libs " in
           *" $deplib "*) ;;
           *) func_append new_libs " $deplib" ;;
           esac
           ;;
         *) 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=
       old_library=
       dlname=
 
       # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-        # Remove ${wl} instances when linking with ld.
+      if test yes = "$build_libtool_libs"; then
+        # Remove $wl instances when linking with ld.
         # FIXME: should test the right _cmds variable.
         case $archive_cmds in
           *\$LD\ *) wl= ;;
         esac
-        if test "$hardcode_into_libs" = yes; then
+        if test yes = "$hardcode_into_libs"; then
           # Hardcode the library paths
           hardcode_libdirs=
           dep_rpath=
-          rpath="$finalize_rpath"
-          test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+          rpath=$finalize_rpath
+          test relink = "$opt_mode" || 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
                   *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
                     ;;
                   *)
                     func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
                     ;;
                   esac
                 fi
               else
                 eval flag=\"$hardcode_libdir_flag_spec\"
                 func_append dep_rpath " $flag"
               fi
             elif test -n "$runpath_var"; then
               case "$perm_rpath " in
               *" $libdir "*) ;;
               *) func_append perm_rpath " $libdir" ;;
               esac
             fi
           done
           # 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
             # We should set the runpath_var.
             rpath=
             for dir in $perm_rpath; do
               func_append rpath "$dir:"
             done
             eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
           fi
           test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
         fi
 
-        shlibpath="$finalize_shlibpath"
-        test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+        shlibpath=$finalize_shlibpath
+        test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
         if test -n "$shlibpath"; then
           eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
         fi
 
         # Get the real and link names of the library.
         eval shared_ext=\"$shrext_cmds\"
         eval library_names=\"$library_names_spec\"
         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
           func_append linknames " $link"
         done
 
         # Use standard objects if they are pic
         test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
         test "X$libobjs" = "X " && libobjs=
 
         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
 
         orig_export_symbols=
         case $host_os in
         cygwin* | mingw* | cegcc*)
           if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
             # exporting using user supplied symfile
-            if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+            func_dll_def_p "$export_symbols" || {
               # 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 "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-            func_verbose "generating symbol list for \`$libname.la'"
-            export_symbols="$output_objdir/$libname.exp"
+          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
             $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
                 *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
                   try_normal_branch=yes
                   eval cmd=\"$cmd1\"
                   func_len " $cmd"
                   len=$func_len_result
                   ;;
                 *)
                   try_normal_branch=no
                   ;;
               esac
-              if test "$try_normal_branch" = yes \
+              if test yes = "$try_normal_branch" \
                  && { test "$len" -lt "$max_cmd_len" \
                       || test "$max_cmd_len" -le -1; }
               then
                 func_show_eval "$cmd" 'exit $?'
                 skipped_export=false
               elif test -n "$nm_file_list_spec"; then
                 func_basename "$output"
                 output_la=$func_basename_result
                 save_libobjs=$libobjs
                 save_output=$output
-                output=${output_objdir}/${output_la}.nm
+                output=$output_objdir/$output_la.nm
                 func_to_tool_file "$output"
                 libobjs=$nm_file_list_spec$func_to_tool_file_result
                 func_append delfiles " $output"
                 func_verbose "creating $NM input file list: $output"
                 for obj in $save_libobjs; do
                   func_to_tool_file "$obj"
                   $ECHO "$func_to_tool_file_result"
                 done > "$output"
                 eval cmd=\"$cmd1\"
                 func_show_eval "$cmd" 'exit $?'
                 output=$save_output
                 libobjs=$save_libobjs
                 skipped_export=false
               else
                 # The command line is too long to execute in one step.
                 func_verbose "using reloadable object file for export list..."
                 skipped_export=:
                 # Break out early, otherwise skipped_export may be
                 # set to false by a later but shorter cmd.
                 break
               fi
             done
-            IFS="$save_ifs"
-            if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+            IFS=$save_ifs
+            if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
               func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
               func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
             fi
           fi
         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 "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+        if test : != "$skipped_export" && 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.
           $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
           func_append delfiles " $export_symbols $output_objdir/$libname.filter"
           export_symbols=$output_objdir/$libname.def
           $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
         fi
 
         tmp_deplibs=
         for test_deplib in $deplibs; do
           case " $convenience " in
           *" $test_deplib "*) ;;
           *)
             func_append tmp_deplibs " $test_deplib"
             ;;
           esac
         done
-        deplibs="$tmp_deplibs"
+        deplibs=$tmp_deplibs
 
         if test -n "$convenience"; then
           if test -n "$whole_archive_flag_spec" &&
-            test "$compiler_needs_object" = yes &&
+            test yes = "$compiler_needs_object" &&
             test -z "$libobjs"; then
             # extract the archives, so we have objects to list.
             # TODO: could optimize this to just extract one archive.
             whole_archive_flag_spec=
           fi
           if test -n "$whole_archive_flag_spec"; then
             save_libobjs=$libobjs
             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
             func_append libobjs " $func_extract_archives_result"
             test "X$libobjs" = "X " && libobjs=
           fi
         fi
 
-        if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+        if test yes = "$thread_safe" && 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 "$opt_mode" = relink; then
+        if test relink = "$opt_mode"; then
           $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
         fi
 
         # Do each of the archive commands.
-        if test "$module" = yes && test -n "$module_cmds" ; then
+        if test yes = "$module" && 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
           else
             eval test_cmds=\"$module_cmds\"
             cmds=$module_cmds
           fi
         else
           if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
             eval test_cmds=\"$archive_expsym_cmds\"
             cmds=$archive_expsym_cmds
           else
             eval test_cmds=\"$archive_cmds\"
             cmds=$archive_cmds
           fi
         fi
 
-        if test "X$skipped_export" != "X:" &&
+        if test : != "$skipped_export" &&
            func_len " $test_cmds" &&
            len=$func_len_result &&
            test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
           :
         else
           # The command line is too long to link in one step, link piecewise
           # or, if using GNU ld and skipped_export is not :, use a linker
           # script.
 
           # Save the value of $output and $libobjs because we want to
@@ skipping 12 matching lines @@
           output_la=$func_basename_result
 
           # Clear the reloadable object creation command queue and
           # initialize k to one.
           test_cmds=
           concat_cmds=
           objlist=
           last_robj=
           k=1
 
-          if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-            output=${output_objdir}/${output_la}.lnkscript
+          if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+            output=$output_objdir/$output_la.lnkscript
             func_verbose "creating GNU ld script: $output"
             echo 'INPUT (' > $output
             for obj in $save_libobjs
             do
               func_to_tool_file "$obj"
               $ECHO "$func_to_tool_file_result" >> $output
             done
             echo ')' >> $output
             func_append delfiles " $output"
             func_to_tool_file "$output"
             output=$func_to_tool_file_result
-          elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-            output=${output_objdir}/${output_la}.lnk
+          elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+            output=$output_objdir/$output_la.lnk
             func_verbose "creating linker input file list: $output"
             : > $output
             set x $save_libobjs
             shift
             firstobj=
-            if test "$compiler_needs_object" = yes; then
+            if test yes = "$compiler_needs_object"; then
               firstobj="$1 "
               shift
             fi
             for obj
             do
               func_to_tool_file "$obj"
               $ECHO "$func_to_tool_file_result" >> $output
             done
             func_append delfiles " $output"
             func_to_tool_file "$output"
             output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
           else
             if test -n "$save_libobjs"; then
               func_verbose "creating reloadable object files..."
-              output=$output_objdir/$output_la-${k}.$objext
+              output=$output_objdir/$output_la-$k.$objext
               eval test_cmds=\"$reload_cmds\"
               func_len " $test_cmds"
               len0=$func_len_result
               len=$len0
 
               # Loop over the list of objects to be linked.
               for obj in $save_libobjs
               do
                 func_len " $obj"
                 func_arith $len + $func_len_result
                 len=$func_arith_result
-                if test "X$objlist" = X ||
+                if test -z "$objlist" ||
                    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 "$k" -eq 1 ; then
+                  if test 1 -eq "$k"; then
                     # The first file doesn't have a previous command to add.
                     reload_objs=$objlist
                     eval concat_cmds=\"$reload_cmds\"
                   else
                     # All subsequent reloadable object files will link in
                     # the last one created.
                     reload_objs="$objlist $last_robj"
                     eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
                   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
                   len=$func_arith_result
                 fi
               done
               # Handle the remaining objects by creating one last
               # reloadable object file.  All subsequent reloadable object
               # 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"
 
             else
               output=
             fi
 
-            if ${skipped_export-false}; then
-              func_verbose "generating symbol list for \`$libname.la'"
-              export_symbols="$output_objdir/$libname.exp"
+            ${skipped_export-false} && {
+              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.
               test -z "$concat_cmds" || concat_cmds=$concat_cmds~
               eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
               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_silent || {
+              IFS=$save_ifs
+              $opt_quiet || {
                   func_quote_for_expand "$cmd"
                   eval "func_echo $func_quote_for_expand_result"
               }
               $opt_dry_run || eval "$cmd" || {
                 lt_exit=$?
 
                 # Restore the uninstalled library and exit
-                if test "$opt_mode" = relink; then
+                if test relink = "$opt_mode"; then
                   ( cd "$output_objdir" && \
                     $RM "${realname}T" && \
                     $MV "${realname}U" "$realname" )
                 fi
 
                 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"'
               func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
             fi
           fi
 
-          if ${skipped_export-false}; then
+          ${skipped_export-false} && {
             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.
               $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
               func_append delfiles " $export_symbols $output_objdir/$libname.filter"
               export_symbols=$output_objdir/$libname.def
               $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
             fi
-          fi
+          }
 
           libobjs=$output
           # Restore the value of output.
           output=$save_output
 
           if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
             eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
             test "X$libobjs" = "X " && libobjs=
           fi
           # Expand the library linking commands again to reset the
           # value of $libobjs for piecewise linking.
 
           # Do each of the archive commands.
-          if test "$module" = yes && test -n "$module_cmds" ; then
+          if test yes = "$module" && test -n "$module_cmds"; then
             if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
               cmds=$module_expsym_cmds
             else
               cmds=$module_cmds
             fi
           else
             if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
               cmds=$archive_expsym_cmds
             else
               cmds=$archive_cmds
             fi
           fi
         fi
 
         if test -n "$delfiles"; then
           # Append the command to remove temporary files to $cmds.
           eval cmds=\"\$cmds~\$RM $delfiles\"
         fi
 
         # 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
           func_append libobjs " $func_extract_archives_result"
           test "X$libobjs" = "X " && libobjs=
         fi
 
-        save_ifs="$IFS"; IFS='~'
+        save_ifs=$IFS; IFS='~'
         for cmd in $cmds; do
-          IFS="$save_ifs"
+          IFS=$sp$nl
           eval cmd=\"$cmd\"
-          $opt_silent || {
+          IFS=$save_ifs
+          $opt_quiet || {
             func_quote_for_expand "$cmd"
             eval "func_echo $func_quote_for_expand_result"
           }
           $opt_dry_run || eval "$cmd" || {
             lt_exit=$?
 
             # Restore the uninstalled library and exit
-            if test "$opt_mode" = relink; then
+            if test relink = "$opt_mode"; then
               ( cd "$output_objdir" && \
                 $RM "${realname}T" && \
                 $MV "${realname}U" "$realname" )
             fi
 
             exit $lt_exit
           }
         done
-        IFS="$save_ifs"
+        IFS=$save_ifs
 
         # Restore the uninstalled library and exit
-        if test "$opt_mode" = relink; then
+        if test relink = "$opt_mode"; then
           $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 
           if test -n "$convenience"; then
             if test -z "$whole_archive_flag_spec"; then
               func_show_eval '${RM}r "$gentop"'
             fi
           fi
 
           exit $EXIT_SUCCESS
         fi
 
         # Create links to the real library.
         for linkname in $linknames; do
           if test "$realname" != "$linkname"; then
             func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
           fi
         done
 
         # If -module or -export-dynamic was specified, set the dlname.
-        if test "$module" = yes || test "$export_dynamic" = yes; then
+        if test yes = "$module" || test yes = "$export_dynamic"; then
           # On all known operating systems, these are identical.
-          dlname="$soname"
+          dlname=$soname
         fi
       fi
       ;;
 
     obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-        func_warning "\`-dlopen' is ignored for objects"
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; 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"
         obj=$func_lo2o_result
         ;;
       *)
         libobj=
-        obj="$output"
+        obj=$output
         ;;
       esac
 
       # Delete the old objects.
       $opt_dry_run || $RM $obj $libobj
 
       # Objects from convenience libraries.  This assumes
       # single-version convenience libraries.  Whenever we create
       # different ones for PIC/non-PIC, this we'll have to duplicate
       # the extraction.
       reload_conv_objs=
       gentop=
-      # 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 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
       if test -n "$convenience"; then
         if test -n "$whole_archive_flag_spec"; then
           eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-          reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+          test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+          reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
         else
-          gentop="$output_objdir/${obj}x"
+          gentop=$output_objdir/${obj}x
           func_append generated " $gentop"
 
           func_extract_archives $gentop $convenience
           reload_conv_objs="$reload_objs $func_extract_archives_result"
         fi
       fi
 
       # If we're not building shared, we need to use non_pic_objs
-      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+      test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
 
       # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
 
-      output="$obj"
+      output=$obj
       func_execute_cmds "$reload_cmds" 'exit $?'
 
       # Exit if we aren't doing a library object file.
       if test -z "$libobj"; then
         if test -n "$gentop"; then
           func_show_eval '${RM}r "$gentop"'
         fi
 
         exit $EXIT_SUCCESS
       fi
 
-      if test "$build_libtool_libs" != yes; then
+      test yes = "$build_libtool_libs" || {
         if test -n "$gentop"; then
           func_show_eval '${RM}r "$gentop"'
         fi
 
         # Create an invalid libtool object if no PIC, so that we don't
         # accidentally link it into a program.
         # $show "echo timestamp > $libobj"
         # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
         exit $EXIT_SUCCESS
-      fi
+      }
 
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
+      if test -n "$pic_flag" || test default != "$pic_mode"; 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
 
       if test -n "$gentop"; then
         func_show_eval '${RM}r "$gentop"'
       fi
 
       exit $EXIT_SUCCESS
       ;;
 
     prog)
       case $host in
         *cygwin*) func_stripname '' '.exe' "$output"
                   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"
 
-      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."
+      $preload \
+        && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+        && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
 
       case $host in
       *-*-rhapsody* | *-*-darwin1.[012])
         # On Rhapsody replace the C library is the System framework
         compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
         finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
         ;;
       esac
 
       case $host in
       *-*-darwin*)
         # Don't allow lazy linking, it breaks C++ global constructors
         # But is supposedly fixed on 10.4 or later (yay!).
-        if test "$tagname" = CXX ; then
+        if test CXX = "$tagname"; 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
         # Time to change all our "foo.ltframework" stuff back to "-framework foo"
         compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
         finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
         ;;
       esac
 
 
@@ skipping 15 matching lines @@
         case $deplib in
         -L*)
           case " $new_libs " in
           *" $deplib "*) ;;
           *) func_append new_libs " $deplib" ;;
           esac
           ;;
         *) func_append new_libs " $deplib" ;;
         esac
       done
-      compile_deplibs="$new_libs"
+      compile_deplibs=$new_libs
 
 
       func_append compile_command " $compile_deplibs"
       func_append finalize_command " $finalize_deplibs"
 
       if test -n "$rpath$xrpath"; then
         # If the user specified any rpath flags, then add them.
         for libdir in $rpath $xrpath; do
           # This is the magic to use -rpath.
           case "$finalize_rpath " in
           *" $libdir "*) ;;
           *) func_append finalize_rpath " $libdir" ;;
           esac
         done
       fi
 
       # Now hardcode the library paths
       rpath=
       hardcode_libdirs=
       for libdir in $compile_rpath $finalize_rpath; do
         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
               *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
                 ;;
               *)
                 func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
                 ;;
               esac
             fi
           else
             eval flag=\"$hardcode_libdir_flag_spec\"
             func_append rpath " $flag"
           fi
         elif test -n "$runpath_var"; then
           case "$perm_rpath " in
           *" $libdir "*) ;;
           *) func_append perm_rpath " $libdir" ;;
           esac
         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;;
           *) func_append dllsearchpath ":$libdir";;
           esac
           case :$dllsearchpath: in
           *":$testbindir:"*) ;;
           ::) dllsearchpath=$testbindir;;
           *) func_append dllsearchpath ":$testbindir";;
           esac
           ;;
         esac
       done
       # 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=
       for libdir in $finalize_rpath; do
         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
               *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
                 ;;
               *)
                 func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
                 ;;
               esac
             fi
           else
             eval flag=\"$hardcode_libdir_flag_spec\"
             func_append rpath " $flag"
           fi
         elif test -n "$runpath_var"; then
           case "$finalize_perm_rpath " in
           *" $libdir "*) ;;
           *) func_append finalize_perm_rpath " $libdir" ;;
           esac
         fi
       done
       # 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 "$build_old_libs" = yes; then
+      if test -n "$libobjs" && test yes = "$build_old_libs"; 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@" "no"
+      func_generate_dlsyms "$outputname" "@PROGRAM@" false
 
       # template prelinking step
       if test -n "$prelink_cmds"; then
         func_execute_cmds "$prelink_cmds" 'exit $?'
       fi
 
-      wrappers_required=yes
+      wrappers_required=:
       case $host in
       *cegcc* | *mingw32ce*)
         # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-        wrappers_required=no
+        wrappers_required=false
         ;;
       *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
+        test yes = "$build_libtool_libs" || wrappers_required=false
         ;;
       *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
+        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+          wrappers_required=false
         fi
         ;;
       esac
-      if test "$wrappers_required" = no; then
+      $wrappers_required || {
         # 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
         func_show_eval "$link_command" 'exit_status=$?'
 
         if test -n "$postlink_cmds"; then
           func_to_tool_file "$output"
           postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
           func_execute_cmds "$postlink_cmds" 'exit $?'
         fi
 
         # Delete the generated files.
-        if test -f "$output_objdir/${outputname}S.${objext}"; then
-          func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+        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"
       fi
       if test -n "$finalize_shlibpath"; then
         finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
       fi
 
       compile_var=
       finalize_var=
       if test -n "$runpath_var"; then
         if test -n "$perm_rpath"; then
           # We should set the runpath_var.
           rpath=
           for dir in $perm_rpath; do
             func_append rpath "$dir:"
           done
           compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
         fi
         if test -n "$finalize_perm_rpath"; then
           # We should set the runpath_var.
           rpath=
           for dir in $finalize_perm_rpath; do
             func_append rpath "$dir:"
           done
           finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
         fi
       fi
 
-      if test "$no_install" = yes; then
+      if test yes = "$no_install"; 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.
         $opt_dry_run || $RM $output
         # Link the executable and exit
         func_show_eval "$link_command" 'exit $?'
 
         if test -n "$postlink_cmds"; then
           func_to_tool_file "$output"
           postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
           func_execute_cmds "$postlink_cmds" 'exit $?'
         fi
 
         exit $EXIT_SUCCESS
       fi
 
-      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"
+      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"
-      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
+          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
 
       # Replace the output file specification.
       link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
 
       # Delete the old output files.
       $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
       func_show_eval "$link_command" 'exit $?'
 
       if test -n "$postlink_cmds"; then
@@ skipping 36 matching lines @@
             exeext=.exe
             func_stripname '' '.exe' "$outputname"
             outputname=$func_stripname_result ;;
           *) exeext= ;;
         esac
         case $host in
           *cygwin* | *mingw* )
             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
 
             func_emit_cwrapperexe_src > $cwrappersource
 
             # The wrapper executable is built using the $host compiler,
             # because it contains $host paths and files. If cross-
             # compiling, it, like the target executable, must be
             # executed on the $host or under an emulation environment.
             $opt_dry_run || {
               $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
               $STRIP $cwrapper
             }
 
             # Now, create the wrapper script for func_source use:
             func_ltwrapper_scriptname $cwrapper
             $RM $func_ltwrapper_scriptname_result
             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
               fi
             }
           ;;
           * )
             $RM $output
             trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
 
             func_emit_wrapper no > $output
             chmod +x $output
           ;;
         esac
       }
       exit $EXIT_SUCCESS
       ;;
     esac
 
     # See if we need to build an old-fashioned archive.
     for oldlib in $oldlibs; do
 
-      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"
+      case $build_libtool_libs in
+        convenience)
+          oldobjs="$libobjs_save $symfileobj"
+          addlibs=$convenience
           build_libtool_libs=no
-        else
+          ;;
+        module)
+          oldobjs=$libobjs_save
+          addlibs=$old_convenience
+          build_libtool_libs=no
+          ;;
+        *)
           oldobjs="$old_deplibs $non_pic_objects"
-          if test "$preload" = yes && test -f "$symfileobj"; then
-            func_append oldobjs " $symfileobj"
-          fi
-        fi
-        addlibs="$old_convenience"
-      fi
+          $preload && test -f "$symfileobj" \
+            && func_append oldobjs " $symfileobj"
+          addlibs=$old_convenience
+          ;;
+      esac
 
       if test -n "$addlibs"; then
-        gentop="$output_objdir/${outputname}x"
+        gentop=$output_objdir/${outputname}x
         func_append generated " $gentop"
 
         func_extract_archives $gentop $addlibs
         func_append oldobjs " $func_extract_archives_result"
       fi
 
       # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; 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
           func_append oldobjs " $func_extract_archives_result"
         fi
 
         # POSIX demands no paths to be encoded in archives.  We have
         # to avoid creating archives with duplicate basenames if we
         # might have to extract them afterwards, e.g., when creating a
         # static archive out of a convenience library, or when linking
         # the entirety of a libtool archive into another (currently
         # not supported by libtool).
         if (for obj in $oldobjs
             do
               func_basename "$obj"
               $ECHO "$func_basename_result"
             done | sort | sort -uc >/dev/null 2>&1); then
           :
         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
           oldobjs=
           counter=1
           for obj in $save_oldobjs
           do
             func_basename "$obj"
-            objbase="$func_basename_result"
+            objbase=$func_basename_result
             case " $oldobjs " in
             " ") oldobjs=$obj ;;
             *[\ /]"$objbase "*)
               while :; do
                 # Make sure we don't pick an alternate name that also
                 # overlaps.
                 newobj=lt$counter-$objbase
                 func_arith $counter + 1
                 counter=$func_arith_result
                 case " $oldobjs " in
@@ skipping 48 matching lines @@
           do
             func_len " $obj"
             func_arith $len + $func_len_result
             len=$func_arith_result
             func_append objlist " $obj"
             if test "$len" -lt "$max_cmd_len"; then
               :
             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 "X$oldobjs" = "X" ; then
+          if test -z "$oldobjs"; then
             eval cmds=\"\$concat_cmds\"
           else
             eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
           fi
         fi
       fi
       func_execute_cmds "$cmds" 'exit $?'
     done
 
     test -n "$generated" && \
       func_show_eval "${RM}r$generated"
 
     # Now create the libtool archive.
     case $output in
     *.la)
       old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      test yes = "$build_old_libs" && old_library=$libname.$libext
       func_verbose "creating $output"
 
       # Preserve any variables that may affect compiler behavior
       for var in $variables_saved_for_relink; do
         if eval test -z \"\${$var+set}\"; then
           relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
         elif eval var_value=\$$var; test -z "$var_value"; then
           relink_command="$var=; export $var; $relink_command"
         else
           func_quote_for_eval "$var_value"
           relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
         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 "$hardcode_automatic" = yes ; then
+      if test yes = "$hardcode_automatic"; then
         relink_command=
       fi
 
       # Only create the output if not a dry run.
       $opt_dry_run || {
         for installed in no yes; do
-          if test "$installed" = yes; then
+          if test yes = "$installed"; 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*)
                 func_stripname -L '' "$deplib"
                 func_replace_sysroot "$func_stripname_result"
                 func_append newdependency_libs " -L$func_replace_sysroot_result"
                 ;;
               -R*)
                 func_stripname -R '' "$deplib"
                 func_replace_sysroot "$func_stripname_result"
                 func_append newdependency_libs " -R$func_replace_sysroot_result"
                 ;;
               *) func_append newdependency_libs " $deplib" ;;
               esac
             done
-            dependency_libs="$newdependency_libs"
+            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
               *.la)
                 # Only pass preopened files to the pseudo-archive (for
                 # eventual linking with the app. that links it) if we
                 # 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
           # In fact, it would be nice if we could use this code for all target
           # systems that can't hard-code library paths into their executables
           # and that have no shared library path variable independent of PATH,
           # but it turns out we can't easily determine that from inspecting
           # libtool variables, so we have to hard-code the OSs to which it
           # applies here; at the moment, that means platforms that use the PE
           # object format with DLL files.  See the long comment at the top of
           # tests/bindir.at for full details.
           tdlname=$dlname
           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 "x$bindir" != x ;
-              then
+              if test -n "$bindir"; 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
               fi
               ;;
           esac
           $ECHO > $output "\
 # $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
 
 # The name that we can dlopen(3).
 dlname='$tdlname'
 
 # Names of this library.
 library_names='$library_names'
 
 # The name of the static archive.
 old_library='$old_library'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags='$new_inherited_linker_flags'
 
 # Libraries that this one depends upon.
 dependency_libs='$dependency_libs'
 
 # Names of additional weak libraries provided by this library
 weak_library_names='$weak_libs'
 
 # Version information for $libname.
 current=$current
 age=$age
 revision=$revision
 
 # Is this an already installed library?
 installed=$installed
 
 # Should we warn about portability when linking against -modules?
 shouldnotlink=$module
 
 # Files to dlopen/dlpreopen
 dlopen='$dlfiles'
 dlpreopen='$dlprefiles'
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-          if test "$installed" = no && test "$need_relink" = yes; then
+          if test no,yes = "$installed,$need_relink"; then
             $ECHO >> $output "\
 relink_command=\"$relink_command\""
           fi
         done
       }
 
       # Do a symbolic link so that the libtool archive can be found in
       # LD_LIBRARY_PATH before the program is installed.
       func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
       ;;
     esac
     exit $EXIT_SUCCESS
 }
 
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-    func_mode_link ${1+"$@"}
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+  func_mode_link ${1+"$@"}
+fi
 
 
 # func_mode_uninstall arg...
 func_mode_uninstall ()
 {
-    $opt_debug
-    RM="$nonopt"
+    $debug_cmd
+
+    RM=$nonopt
     files=
-    rmforce=
+    rmforce=false
     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=yes ;;
+      -f) func_append RM " $arg"; rmforce=: ;;
       -*) func_append RM " $arg" ;;
       *) func_append files " $arg" ;;
       esac
     done
 
     test -z "$RM" && \
       func_fatal_help "you must specify an RM program"
 
     rmdirs=
 
     for file in $files; do
       func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-        odir="$objdir"
+      dir=$func_dirname_result
+      if test . = "$dir"; then
+        odir=$objdir
       else
-        odir="$dir/$objdir"
+        odir=$dir/$objdir
       fi
       func_basename "$file"
-      name="$func_basename_result"
-      test "$opt_mode" = uninstall && odir="$dir"
+      name=$func_basename_result
+      test uninstall = "$opt_mode" && odir=$dir
 
       # Remember odir for removal later, being careful to avoid duplicates
-      if test "$opt_mode" = clean; then
+      if test clean = "$opt_mode"; then
         case " $rmdirs " in
           *" $odir "*) ;;
           *) func_append rmdirs " $odir" ;;
         esac
       fi
 
       # Don't error if the file doesn't exist and rm -f was used.
       if { test -L "$file"; } >/dev/null 2>&1 ||
          { test -h "$file"; } >/dev/null 2>&1 ||
          test -f "$file"; then
         :
       elif test -d "$file"; then
         exit_status=1
         continue
-      elif test "$rmforce" = yes; then
+      elif $rmforce; then
         continue
       fi
 
-      rmfiles="$file"
+      rmfiles=$file
 
       case $name in
       *.la)
         # Possibly a libtool archive, so verify it.
         if func_lalib_p "$file"; then
           func_source $dir/$name
 
           # Delete the libtool libraries and symlinks.
           for n in $library_names; do
             func_append rmfiles " $odir/$n"
           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 "*) ;;
             *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
             esac
             test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
             ;;
           uninstall)
             if test -n "$library_names"; then
               # Do each command in the postuninstall commands.
-              func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+              func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
             fi
 
             if test -n "$old_library"; then
               # Do each command in the old_postuninstall commands.
-              func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+              func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
             fi
             # FIXME: should reinstall the best remaining shared library.
             ;;
           esac
         fi
         ;;
 
       *.lo)
         # Possibly a libtool object, so verify it.
         if func_lalib_p "$file"; then
 
           # Read the .lo file
           func_source $dir/$name
 
           # Add PIC object to the list of files to remove.
-          if test -n "$pic_object" &&
-             test "$pic_object" != none; then
+          if test -n "$pic_object" && test none != "$pic_object"; 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 "$non_pic_object" != none; then
+          if test -n "$non_pic_object" && test none != "$non_pic_object"; then
             func_append rmfiles " $dir/$non_pic_object"
           fi
         fi
         ;;
 
       *)
-        if test "$opt_mode" = clean ; then
+        if test clean = "$opt_mode"; then
           noexename=$name
           case $file in
           *.exe)
             func_stripname '' '.exe' "$file"
             file=$func_stripname_result
             func_stripname '' '.exe' "$name"
             noexename=$func_stripname_result
             # $file with .exe has already been added to rmfiles,
             # add $file without .exe
             func_append rmfiles " $file"
             ;;
           esac
           # Do a test to see if this is a libtool program.
           if func_ltwrapper_p "$file"; then
             if func_ltwrapper_executable_p "$file"; then
               func_ltwrapper_scriptname "$file"
               relink_command=
               func_source $func_ltwrapper_scriptname_result
               func_append rmfiles " $func_ltwrapper_scriptname_result"
             else
               relink_command=
               func_source $dir/$noexename
             fi
 
             # 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 "$fast_install" = yes && test -n "$relink_command"; then
+            func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+            if test yes = "$fast_install" && 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
         ;;
       esac
       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"
       fi
     done
 
     exit $exit_status
 }
 
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+  func_mode_uninstall ${1+"$@"}
+fi
 
 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"
   exit $EXIT_FAILURE
 fi
 
 exit $exit_status
 
 
 # The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
+# where 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
 # them.  This is particularly important on AIX, because we don't
 # support having both static and shared libraries enabled at the same
 # time on that platform, so we default to a shared-only configuration.
 # If a disable-shared tag is given, we'll fallback to a static-only
 # configuration.  But we'll never go from static-only to shared-only.
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
 build_libtool_libs=no
 build_old_libs=yes
 # ### END LIBTOOL TAG CONFIG: disable-shared
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-static
 build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
 # ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables:
 # mode:shell-script
 # sh-indentation:2
 # End:
-# vi:sw=2
-