You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@singa.apache.org by wa...@apache.org on 2015/08/15 10:11:22 UTC
[09/12] incubator-singa git commit: SINGA-55 Refactor main.cc and
singa.h
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/2498ff13/config/ltmain.sh
----------------------------------------------------------------------
diff --cc config/ltmain.sh
index c2852d8,c2852d8..a72f2fd
mode 100644,100644..100755
--- a/config/ltmain.sh
+++ b/config/ltmain.sh
@@@ -1,9 -1,9 +1,9 @@@
++# Generated from ltmain.m4sh.
--# libtool (GNU libtool) 2.4.2
++# ltmain.sh (GNU libtool) 2.2.6b
# Written by Gordon Matzigkeit <go...@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, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 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.
@@@ -32,57 -32,57 +32,50 @@@
#
# 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
++# --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
++# --tag=TAG use configuration variables from tag TAG
++# -v, --verbose print informational messages (default)
++# --version print version information
++# -h, --help print short or 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
++# 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.
++# MODE-ARGS vary depending on the MODE.
# 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 Debian-2.4.2-1ubuntu1
--# automake: $automake_version
--# autoconf: $autoconf_version
++# host-triplet: $host
++# shell: $SHELL
++# compiler: $LTCC
++# compiler flags: $LTCFLAGS
++# linker: $LD (gnu? $with_gnu_ld)
++# $progname: (GNU libtool) 2.2.6b
++# automake: $automake_version
++# autoconf: $autoconf_version
#
# Report bugs to <bu...@gnu.org>.
--# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
--# General help using GNU software: <http://www.gnu.org/gethelp/>.
--PROGRAM=libtool
++PROGRAM=ltmain.sh
PACKAGE=libtool
--VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
++VERSION=2.2.6b
TIMESTAMP=""
--package_revision=1.3337
++package_revision=1.3017
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@@ -98,15 -98,15 +91,10 @@@ f
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.
++# Only set LANG and LC_ALL to C if already set.
++# These must not be set unconditionally because not all systems understand
++# e.g. LANG=C (notably SCO).
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@@ -119,28 -119,28 +107,24 @@@ d
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
--LC_ALL=C
--LANGUAGE=C
--export LANGUAGE LC_ALL
$lt_unset CDPATH
--# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
--# is ksh but when the shell is invoked as "sh" and the current value of
--# the _XPG environment variable is not equal to 1 (one), the special
--# 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'}
++: ${ECHO="echo"}
++: ${EGREP="/bin/grep -E"}
++: ${FGREP="/bin/grep -F"}
++: ${GREP="/bin/grep"}
++: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
++: ${SED="/bin/sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
@@@ -160,27 -160,27 +144,6 @@@ IFS=" $lt_nl
dirname="s,/[^/]*$,,"
basename="s,^.*/,,"
--# func_dirname file append nondir_replacement
--# Compute the dirname of FILE. If nonempty, add APPEND to the result,
--# otherwise set result to NONDIR_REPLACEMENT.
--func_dirname ()
--{
-- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-- if test "X$func_dirname_result" = "X${1}"; then
-- func_dirname_result="${3}"
-- else
-- func_dirname_result="$func_dirname_result${2}"
-- fi
--} # func_dirname may be replaced by extended shell implementation
--
--
--# func_basename file
--func_basename ()
--{
-- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
--} # func_basename may be replaced by extended shell implementation
--
--
# func_dirname_and_basename file append nondir_replacement
# perform func_basename and func_dirname in a single function
# call:
@@@ -195,183 -195,183 +158,33 @@@
# those functions but instead duplicate the functionality here.
func_dirname_and_basename ()
{
-- # Extract subdirectory from the argument.
-- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-- if test "X$func_dirname_result" = "X${1}"; then
-- func_dirname_result="${3}"
-- else
-- func_dirname_result="$func_dirname_result${2}"
-- fi
-- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
--} # func_dirname_and_basename may be replaced by extended shell implementation
--
--
--# 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,/*$,/,'
--
--# func_normal_abspath PATH
--# Remove doubled-up and trailing slashes, "." path components,
--# and cancel out any ".." path components in PATH after making
--# it an absolute path.
--# value returned in "$func_normal_abspath_result"
--func_normal_abspath ()
--{
-- # Start from root dir and reassemble the path.
-- func_normal_abspath_result=
-- func_normal_abspath_tpath=$1
-- func_normal_abspath_altnamespace=
-- case $func_normal_abspath_tpath in
-- "")
-- # Empty path, that just means $cwd.
-- func_stripname '' '/' "`pwd`"
-- func_normal_abspath_result=$func_stripname_result
-- return
-- ;;
-- # The next three entries are used to spot a run of precisely
-- # two leading slashes without using negated character classes;
-- # we take advantage of case's first-match behaviour.
-- ///*)
-- # Unusual form of absolute path, do nothing.
-- ;;
-- //*)
-- # Not necessarily an ordinary path; POSIX reserves leading '//'
-- # and for example Cygwin uses it to access remote file shares
-- # over CIFS/SMB, so we conserve a leading double slash if found.
-- func_normal_abspath_altnamespace=/
-- ;;
-- /*)
-- # Absolute path, do nothing.
-- ;;
-- *)
-- # Relative path, prepend $cwd.
-- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-- ;;
-- esac
-- # Cancel out all the simple stuff to save iterations. We also want
-- # the path to end with a slash for ease of parsing, so make sure
-- # there is one (and only one) here.
-- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
-- while :; do
-- # Processed it all yet?
-- if test "$func_normal_abspath_tpath" = / ; then
-- # If we ascended to the root using ".." the result may be empty now.
-- if test -z "$func_normal_abspath_result" ; then
-- func_normal_abspath_result=/
-- fi
-- break
-- fi
-- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-- -e "$pathcar"`
-- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-- -e "$pathcdr"`
-- # Figure out what to do with it
-- case $func_normal_abspath_tcomponent in
-- "")
-- # Trailing empty path component, ignore it.
-- ;;
-- ..)
-- # Parent dir; strip last assembled component from result.
-- func_dirname "$func_normal_abspath_result"
-- func_normal_abspath_result=$func_dirname_result
-- ;;
-- *)
-- # Actual path component, append it.
-- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
-- ;;
-- esac
-- done
-- # Restore leading double-slash if one was found on entry.
-- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
++ # Extract subdirectory from the argument.
++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
++ if test "X$func_dirname_result" = "X${1}"; then
++ func_dirname_result="${3}"
++ else
++ func_dirname_result="$func_dirname_result${2}"
++ fi
++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
}
--# func_relative_path SRCDIR DSTDIR
--# generates a relative path from SRCDIR to DSTDIR, with a trailing
--# slash if non-empty, suitable for immediately appending a filename
--# without needing to append a separator.
--# value returned in "$func_relative_path_result"
--func_relative_path ()
--{
-- func_relative_path_result=
-- func_normal_abspath "$1"
-- func_relative_path_tlibdir=$func_normal_abspath_result
-- func_normal_abspath "$2"
-- func_relative_path_tbindir=$func_normal_abspath_result
--
-- # Ascend the tree starting from libdir
-- while :; do
-- # check if we have found a prefix of bindir
-- case $func_relative_path_tbindir in
-- $func_relative_path_tlibdir)
-- # found an exact match
-- func_relative_path_tcancelled=
-- break
-- ;;
-- $func_relative_path_tlibdir*)
-- # found a matching prefix
-- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-- func_relative_path_tcancelled=$func_stripname_result
-- if test -z "$func_relative_path_result"; then
-- func_relative_path_result=.
-- fi
-- break
-- ;;
-- *)
-- func_dirname $func_relative_path_tlibdir
-- func_relative_path_tlibdir=${func_dirname_result}
-- if test "x$func_relative_path_tlibdir" = x ; then
-- # Have to descend all the way to the root!
-- func_relative_path_result=../$func_relative_path_result
-- func_relative_path_tcancelled=$func_relative_path_tbindir
-- break
-- fi
-- func_relative_path_result=../$func_relative_path_result
-- ;;
-- esac
-- done
--
-- # 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
++# Generated shell functions inserted here.
-- # 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
--}
++# 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"
# The name of this program:
++# In the unlikely event $progname began with a '-', it would play havoc with
++# func_echo (imagine progname=-n), so we prepend ./ in that case:
func_dirname_and_basename "$progpath"
progname=$func_basename_result
++case $progname in
++ -*) progname=./$progname ;;
++esac
# Make sure we have an absolute path for reexecution:
case $progpath in
@@@ -383,7 -383,7 +196,7 @@@
;;
*)
save_IFS="$IFS"
-- IFS=${PATH_SEPARATOR-:}
++ IFS=:
for progdir in $PATH; do
IFS="$save_IFS"
test -x "$progdir/$progname" && break
@@@ -402,15 -402,15 +215,6 @@@ 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.
@@@ -439,7 -439,7 +243,7 @@@ opt_warning=
# name if it has been set yet.
func_echo ()
{
-- $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
++ $ECHO "$progname${mode+: }$mode: $*"
}
# func_verbose arg...
@@@ -454,25 -454,25 +258,18 @@@ func_verbose (
:
}
--# 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
++ $ECHO "$progname${mode+: }$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
++ $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
# bash bug again:
:
@@@ -529,9 -529,9 +326,9 @@@ func_mkdir_p (
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"`
++ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
done
-- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
++ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
@@@ -581,7 -581,7 +378,7 @@@ func_mktempdir (
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
-- $ECHO "$my_tmpdir"
++ $ECHO "X$my_tmpdir" | $Xsed
}
@@@ -595,7 -595,7 +392,7 @@@ 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=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
@@@ -622,7 -622,7 +419,7 @@@ func_quote_for_expand (
{
case $1 in
*[\\\`\"]*)
-- my_arg=`$ECHO "$1" | $SED \
++ my_arg=`$ECHO "X$1" | $Xsed \
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
@@@ -691,39 -691,39 +488,15 @@@ func_show_eval_locale (
fi
}
--# func_tr_sh
--# Turn $1 into a string suitable for a shell variable name.
--# Result is stored in $func_tr_sh_result. All characters
--# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
--# if $1 begins with a digit, a '_' is prepended as well.
--func_tr_sh ()
--{
-- case $1 in
-- [0-9]* | *[!a-zA-Z0-9_]*)
-- func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-- ;;
-- * )
-- func_tr_sh_result=$1
-- ;;
-- esac
--}
++
++
# func_version
# Echo version message to standard output and exit.
func_version ()
{
-- $opt_debug
--
-- $SED -n '/(C)/!b go
-- :more
-- /\./!{
-- N
-- s/\n# / /
-- b more
-- }
-- :go
-- /^# '$PROGRAM' (GNU /,/# warranty; / {
++ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@@ -736,28 -736,28 +509,22 @@@
# Echo short help message to standard output and exit.
func_usage ()
{
-- $opt_debug
--
-- $SED -n '/^# Usage:/,/^# *.*--help/ {
++ $SED -n '/^# Usage:/,/# -h/ {
s/^# //
s/^# *$//
s/\$progname/'$progname'/
p
}' < "$progpath"
-- echo
++ $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.
++# 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'*
@@@ -767,18 -767,18 +534,11 @@@
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`"'/
++ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
++ s/\$autoconf_version/'"`(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
++ }' < "$progpath"
++ exit $?
}
# func_missing_arg argname
@@@ -786,106 -786,106 +546,63 @@@
# exit_cmd.
func_missing_arg ()
{
-- $opt_debug
--
-- func_error "missing argument for $1."
++ func_error "missing argument for $1"
exit_cmd=exit
}
++exit_cmd=:
--# func_split_short_opt shortopt
--# Set func_split_short_opt_name and func_split_short_opt_arg shell
--# variables after splitting SHORTOPT after the 2nd character.
--func_split_short_opt ()
--{
-- my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-- my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
--
-- func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-- func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
--} # func_split_short_opt may be replaced by extended shell implementation
--
--
--# func_split_long_opt longopt
--# Set func_split_long_opt_name and func_split_long_opt_arg shell
--# variables after splitting LONGOPT at the `=' sign.
--func_split_long_opt ()
--{
-- my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-- my_sed_long_arg='1s/^--[^=]*=//'
--
-- func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
-- func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
--} # func_split_long_opt may be replaced by extended shell implementation
--exit_cmd=:
++# Check that we have a working $ECHO.
++if test "X$1" = X--no-reexec; then
++ # Discard the --no-reexec flag, and continue.
++ shift
++elif test "X$1" = X--fallback-echo; then
++ # Avoid inline document here, it may be left over
++ :
++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
++ # Yippee, $ECHO works!
++ :
++else
++ # Restart under the correct shell, and then maybe $ECHO will work.
++ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
++fi
++if test "X$1" = X--fallback-echo; then
++ # used as fallback echo
++ shift
++ cat <<EOF
++$*
++EOF
++ exit $EXIT_SUCCESS
++fi
magic="%%%MAGIC variable%%%"
magic_exe="%%%MAGIC EXE variable%%%"
# Global variables.
++# $mode is unset
nonopt=
++execute_dlfiles=
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
extracted_archives=
extracted_serial=0
++opt_dry_run=false
++opt_duplicate_deps=false
++opt_silent=false
++opt_debug=:
++
# If this variable is set in any of the actions, the command in it
# will be execed at the end. This prevents here-documents from being
# left over by shells.
exec_cmd=
--# func_append var value
--# Append VALUE to the end of shell variable VAR.
--func_append ()
--{
-- eval "${1}=\$${1}\${2}"
--} # func_append may be replaced by extended shell implementation
--
--# func_append_quoted var value
--# Quote VALUE and append to the end of shell variable VAR, separated
--# by a space.
--func_append_quoted ()
--{
-- func_quote_for_eval "${2}"
-- eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
--} # func_append_quoted may be replaced by extended shell implementation
--
--
--# func_arith arithmetic-term...
--func_arith ()
--{
-- func_arith_result=`expr "${@}"`
--} # func_arith may be replaced by extended shell implementation
--
--
--# func_len string
--# STRING may not start with a hyphen.
--func_len ()
--{
-- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
--} # func_len may be replaced by extended shell implementation
--
--
--# func_lo2o object
--func_lo2o ()
--{
-- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
--} # func_lo2o may be replaced by extended shell implementation
--
--
--# func_xform libobj-or-source
--func_xform ()
--{
-- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
--} # func_xform may be replaced by extended shell implementation
--
--
# func_fatal_configuration arg...
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
@@@ -919,16 -919,16 +636,16 @@@ func_config (
# Display the features supported by this script.
func_features ()
{
-- echo "host: $host"
++ $ECHO "host: $host"
if test "$build_libtool_libs" = yes; then
-- echo "enable shared libraries"
++ $ECHO "enable shared libraries"
else
-- echo "disable shared libraries"
++ $ECHO "disable shared libraries"
fi
if test "$build_old_libs" = yes; then
-- echo "enable static libraries"
++ $ECHO "enable static libraries"
else
-- echo "disable static libraries"
++ $ECHO "disable static libraries"
fi
exit $?
@@@ -975,209 -975,209 +692,117 @@@ func_enable_tag (
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 ()
++# Parse options once, thoroughly. This comes as soon as possible in
++# the script to make things like `libtool --version' happen quickly.
{
-- if test "$package_revision" != "$macro_revision"; then
-- if test "$VERSION" != "$macro_version"; then
-- if test -z "$macro_version"; then
-- cat >&2 <<_LT_EOF
--$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
--$progname: definition of this LT_INIT comes from an older release.
--$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
--$progname: and run autoconf again.
--_LT_EOF
-- else
-- cat >&2 <<_LT_EOF
--$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
--$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
--$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
--$progname: and run autoconf again.
--_LT_EOF
-- fi
-- else
-- cat >&2 <<_LT_EOF
--$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
--$progname: but the definition of this LT_INIT comes from revision $macro_revision.
--$progname: You should recreate aclocal.m4 with macros from revision $package_revision
--$progname: of $PACKAGE $VERSION and run autoconf again.
--_LT_EOF
-- fi
--
-- 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
++ # Shorthand for --mode=foo, only valid as the first argument
++ case $1 in
++ clean|clea|cle|cl)
++ shift; set dummy --mode clean ${1+"$@"}; shift
++ ;;
++ compile|compil|compi|comp|com|co|c)
++ shift; set dummy --mode compile ${1+"$@"}; shift
++ ;;
++ execute|execut|execu|exec|exe|ex|e)
++ shift; set dummy --mode execute ${1+"$@"}; shift
++ ;;
++ finish|finis|fini|fin|fi|f)
++ shift; set dummy --mode finish ${1+"$@"}; shift
++ ;;
++ install|instal|insta|inst|ins|in|i)
++ shift; set dummy --mode install ${1+"$@"}; shift
++ ;;
++ link|lin|li|l)
++ shift; set dummy --mode link ${1+"$@"}; shift
++ ;;
++ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
++ shift; set dummy --mode uninstall ${1+"$@"}; shift
++ ;;
++ esac
--# Parse 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
++ # Parse non-mode specific arguments:
++ while test "$#" -gt 0; do
opt="$1"
shift
++
case $opt in
-- --debug|-x) opt_debug='set -x'
++ --config) func_config ;;
++
++ --debug) preserve_args="$preserve_args $opt"
func_echo "enabling shell trace mode"
++ opt_debug='set -x'
$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"
++
++ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
++ execute_dlfiles="$execute_dlfiles $1"
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
++
++ --dry-run | -n) opt_dry_run=: ;;
++ --features) func_features ;;
++ --finish) mode="finish" ;;
++
++ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
++ case $1 in
++ # Valid mode arguments:
++ clean) ;;
++ compile) ;;
++ execute) ;;
++ finish) ;;
++ install) ;;
++ link) ;;
++ relink) ;;
++ uninstall) ;;
++
++ # Catch anything else as an error
++ *) func_error "invalid argument for $opt"
++ exit_cmd=exit
++ break
++ ;;
++ esac
++
++ mode="$1"
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)
++
++ --preserve-dup-deps)
++ opt_duplicate_deps=: ;;
++
++ --quiet|--silent) preserve_args="$preserve_args $opt"
opt_silent=:
--func_append preserve_args " $opt"
-- opt_verbose=false
;;
-- --verbose|-v)
-- opt_verbose=:
--func_append preserve_args " $opt"
--opt_silent=false
++
++ --verbose| -v) preserve_args="$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"
++
++ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
++ preserve_args="$preserve_args $opt $1"
++ func_enable_tag "$1" # tagname is set here
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+"$@"}
++ -dlopen=*|--mode=*|--tag=*)
++ func_opt_split "$opt"
++ set dummy "$func_opt_split_opt" "$func_opt_split_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
-- ;;
++ -\?|-h) func_usage ;;
++ --help) opt_help=: ;;
++ --version) func_version ;;
-- --) break ;;
-- -*) func_fatal_help "unrecognized option \`$opt'" ;;
-- *) set dummy "$opt" ${1+"$@"}; shift; break ;;
++ -*) func_fatal_help "unrecognized option \`$opt'" ;;
++
++ *) nonopt="$opt"
++ break
++ ;;
esac
done
-- # Validate options:
--
-- # save first non-option argument
-- if test "$#" -gt 0; then
-- nonopt="$opt"
-- shift
-- fi
--
-- # preserve --debug
-- test "$opt_debug" = : || func_append preserve_args " --debug"
case $host in
*cygwin* | *mingw* | *pw32* | *cegcc*)
@@@ -1185,44 -1185,44 +810,82 @@@
opt_duplicate_compiler_generated_deps=:
;;
*)
-- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
++ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
;;
esac
-- $opt_help || {
-- # Sanity checks first:
-- func_check_version_match
++ # Having warned about all mis-specified options, bail out if
++ # anything was wrong.
++ $exit_cmd $EXIT_FAILURE
++}
-- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-- func_fatal_configuration "not configured to build any kind of library"
++# func_check_version_match
++# Ensure that we are using m4 macros, and libtool script from the same
++# release of libtool.
++func_check_version_match ()
++{
++ if test "$package_revision" != "$macro_revision"; then
++ if test "$VERSION" != "$macro_version"; then
++ if test -z "$macro_version"; then
++ cat >&2 <<_LT_EOF
++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
++$progname: definition of this LT_INIT comes from an older release.
++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
++$progname: and run autoconf again.
++_LT_EOF
++ else
++ cat >&2 <<_LT_EOF
++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
++$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
++$progname: and run autoconf again.
++_LT_EOF
++ fi
++ else
++ cat >&2 <<_LT_EOF
++$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
++$progname: but the definition of this LT_INIT comes from revision $macro_revision.
++$progname: You should recreate aclocal.m4 with macros from revision $package_revision
++$progname: of $PACKAGE $VERSION and run autoconf again.
++_LT_EOF
fi
-- # Darwin sucks
-- eval std_shrext=\"$shrext_cmds\"
++ exit $EXIT_MISMATCH
++ fi
++}
-- # Only execute mode is allowed to have -dlopen flags.
-- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
-- func_error "unrecognized option \`-dlopen'"
-- $ECHO "$help" 1>&2
-- exit $EXIT_FAILURE
-- fi
-- # Change the help message to a mode-specific one.
-- generic_help="$help"
-- help="Try \`$progname --help --mode=$opt_mode' for more information."
-- }
++## ----------- ##
++## Main. ##
++## ----------- ##
++$opt_help || {
++ # Sanity checks first:
++ func_check_version_match
-- # Bail if the options were screwed
-- $exit_cmd $EXIT_FAILURE
--}
++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
++ func_fatal_configuration "not configured to build any kind of library"
++ fi
++ test -z "$mode" && func_fatal_error "error: you must specify a MODE."
++ # Darwin sucks
++ eval std_shrext=\"$shrext_cmds\"
++
++
++ # Only execute mode is allowed to have -dlopen flags.
++ if test -n "$execute_dlfiles" && test "$mode" != execute; then
++ func_error "unrecognized option \`-dlopen'"
++ $ECHO "$help" 1>&2
++ exit $EXIT_FAILURE
++ fi
++
++ # Change the help message to a mode-specific one.
++ generic_help="$help"
++ help="Try \`$progname --help --mode=$mode' for more information."
++}
--## ----------- ##
--## Main. ##
--## ----------- ##
# func_lalib_p file
# True iff FILE is a libtool `.la' library or `.lo' object file.
@@@ -1287,9 -1287,9 +950,12 @@@ func_ltwrapper_executable_p (
# 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=""
++ if func_ltwrapper_executable_p "$1"; then
++ func_dirname_and_basename "$1" "" "."
++ func_stripname '' '.exe' "$func_basename_result"
++ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
++ fi
}
# func_ltwrapper_p file
@@@ -1335,37 -1335,37 +1001,6 @@@ func_source (
}
--# func_resolve_sysroot PATH
--# Replace a leading = in PATH with a sysroot. Store the result into
--# func_resolve_sysroot_result
--func_resolve_sysroot ()
--{
-- func_resolve_sysroot_result=$1
-- case $func_resolve_sysroot_result in
-- =*)
-- func_stripname '=' '' "$func_resolve_sysroot_result"
-- func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
-- ;;
-- esac
--}
--
--# func_replace_sysroot PATH
--# If PATH begins with the sysroot, replace it with = and
--# store the result into func_replace_sysroot_result.
--func_replace_sysroot ()
--{
-- case "$lt_sysroot:$1" in
-- ?*:"$lt_sysroot"*)
-- func_stripname "$lt_sysroot" '' "$1"
-- func_replace_sysroot_result="=$func_stripname_result"
-- ;;
-- *)
-- # Including no sysroot.
-- func_replace_sysroot_result=$1
-- ;;
-- esac
--}
--
# func_infer_tag arg
# Infer tagged configuration to use if any are available and
# if one wasn't chosen via the "--tag" command line option.
@@@ -1378,15 -1378,15 +1013,13 @@@ func_infer_tag (
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
-- func_append_quoted CC_quoted "$arg"
++ func_quote_for_eval "$arg"
++ CC_quoted="$CC_quoted $func_quote_for_eval_result"
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 "*) ;;
++ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
@@@ -1397,13 -1397,13 +1030,11 @@@
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
-- func_append_quoted CC_quoted "$arg"
++ func_quote_for_eval "$arg"
++ CC_quoted="$CC_quoted $func_quote_for_eval_result"
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 "*)
++ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
@@@ -1466,486 -1466,486 +1097,6 @@@ EO
}
}
--
--##################################################
--# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
--##################################################
--
--# func_convert_core_file_wine_to_w32 ARG
--# Helper function used by file name conversion functions when $build is *nix,
--# and $host is mingw, cygwin, or some other w32 environment. Relies on a
--# correctly configured wine environment available, with the winepath program
--# in $build's $PATH.
--#
--# ARG is the $build file name to be converted to w32 format.
--# Result is available in $func_convert_core_file_wine_to_w32_result, and will
--# be empty on error (or when ARG is empty)
--func_convert_core_file_wine_to_w32 ()
--{
-- $opt_debug
-- func_convert_core_file_wine_to_w32_result="$1"
-- if test -n "$1"; then
-- # Unfortunately, winepath does not exit with a non-zero error code, so we
-- # are forced to check the contents of stdout. On the other hand, if the
-- # command is not found, the shell will set an exit code of 127 and print
-- # *an error message* to stdout. So we must check for both error code of
-- # zero AND non-empty stdout, which explains the odd construction:
-- func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
-- func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-- $SED -e "$lt_sed_naive_backslashify"`
-- else
-- func_convert_core_file_wine_to_w32_result=
-- fi
-- fi
--}
--# end: func_convert_core_file_wine_to_w32
--
--
--# func_convert_core_path_wine_to_w32 ARG
--# Helper function used by path conversion functions when $build is *nix, and
--# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
--# configured wine environment available, with the winepath program in $build's
--# $PATH. Assumes ARG has no leading or trailing path separator characters.
--#
--# ARG is path to be converted from $build format to win32.
--# Result is available in $func_convert_core_path_wine_to_w32_result.
--# Unconvertible file (directory) names in ARG are skipped; if no directory names
--# are convertible, then the result may be empty.
--func_convert_core_path_wine_to_w32 ()
--{
-- $opt_debug
-- # unfortunately, winepath doesn't convert paths, only file names
-- func_convert_core_path_wine_to_w32_result=""
-- if test -n "$1"; then
-- oldIFS=$IFS
-- IFS=:
-- for func_convert_core_path_wine_to_w32_f in $1; do
-- IFS=$oldIFS
-- func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-- if test -n "$func_convert_core_file_wine_to_w32_result" ; then
-- if test -z "$func_convert_core_path_wine_to_w32_result"; then
-- func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
-- else
-- func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
-- fi
-- fi
-- done
-- IFS=$oldIFS
-- fi
--}
--# end: func_convert_core_path_wine_to_w32
--
--
--# func_cygpath ARGS...
--# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
--# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
--# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
--# (2), returns the Cygwin file name or path in func_cygpath_result (input
--# file name or path is assumed to be in w32 format, as previously converted
--# from $build's *nix or MSYS format). In case (3), returns the w32 file name
--# or path in func_cygpath_result (input file name or path is assumed to be in
--# Cygwin format). Returns an empty string on error.
--#
--# ARGS are passed to cygpath, with the last one being the file name or path to
--# be converted.
--#
--# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
--# environment variable; do not put it in $PATH.
--func_cygpath ()
--{
-- $opt_debug
-- if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
-- func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
-- if test "$?" -ne 0; then
-- # on failure, ensure result is empty
-- func_cygpath_result=
-- fi
-- else
-- func_cygpath_result=
-- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
-- fi
--}
--#end: func_cygpath
--
--
--# func_convert_core_msys_to_w32 ARG
--# Convert file name or path ARG from MSYS format to w32 format. Return
--# result in func_convert_core_msys_to_w32_result.
--func_convert_core_msys_to_w32 ()
--{
-- $opt_debug
-- # awkward: cmd appends spaces to result
-- func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
--}
--#end: func_convert_core_msys_to_w32
--
--
--# func_convert_file_check ARG1 ARG2
--# Verify that ARG1 (a file name in $build format) was converted to $host
--# format in ARG2. Otherwise, emit an error message, but continue (resetting
--# func_to_host_file_result to ARG1).
--func_convert_file_check ()
--{
-- $opt_debug
-- if test -z "$2" && test -n "$1" ; then
-- func_error "Could not determine host file name corresponding to"
-- func_error " \`$1'"
-- func_error "Continuing, but uninstalled executables may not work."
-- # Fallback:
-- func_to_host_file_result="$1"
-- fi
--}
--# end func_convert_file_check
--
--
--# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
--# Verify that FROM_PATH (a path in $build format) was converted to $host
--# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
--# func_to_host_file_result to a simplistic fallback value (see below).
--func_convert_path_check ()
--{
-- $opt_debug
-- if test -z "$4" && test -n "$3"; then
-- func_error "Could not determine the host path corresponding to"
-- func_error " \`$3'"
-- func_error "Continuing, but uninstalled executables may not work."
-- # Fallback. This is a deliberately simplistic "conversion" and
-- # should not be "improved". See libtool.info.
-- if test "x$1" != "x$2"; then
-- lt_replace_pathsep_chars="s|$1|$2|g"
-- func_to_host_path_result=`echo "$3" |
-- $SED -e "$lt_replace_pathsep_chars"`
-- else
-- func_to_host_path_result="$3"
-- fi
-- fi
--}
--# end func_convert_path_check
--
--
--# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
--# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
--# and appending REPL if ORIG matches BACKPAT.
--func_convert_path_front_back_pathsep ()
--{
-- $opt_debug
-- case $4 in
-- $1 ) func_to_host_path_result="$3$func_to_host_path_result"
-- ;;
-- esac
-- case $4 in
-- $2 ) func_append func_to_host_path_result "$3"
-- ;;
-- esac
--}
--# end func_convert_path_front_back_pathsep
--
--
--##################################################
--# $build to $host FILE NAME CONVERSION FUNCTIONS #
--##################################################
--# invoked via `$to_host_file_cmd ARG'
--#
--# In each case, ARG is the path to be converted from $build to $host format.
--# Result will be available in $func_to_host_file_result.
--
--
--# func_to_host_file ARG
--# Converts the file name ARG from $build format to $host format. Return result
--# in func_to_host_file_result.
--func_to_host_file ()
--{
-- $opt_debug
-- $to_host_file_cmd "$1"
--}
--# end func_to_host_file
--
--
--# func_to_tool_file ARG LAZY
--# converts the file name ARG from $build format to toolchain format. Return
--# result in func_to_tool_file_result. If the conversion in use is listed
--# in (the comma separated) LAZY, no conversion takes place.
--func_to_tool_file ()
--{
-- $opt_debug
-- case ,$2, in
-- *,"$to_tool_file_cmd",*)
-- func_to_tool_file_result=$1
-- ;;
-- *)
-- $to_tool_file_cmd "$1"
-- func_to_tool_file_result=$func_to_host_file_result
-- ;;
-- esac
--}
--# end func_to_tool_file
--
--
--# func_convert_file_noop ARG
--# Copy ARG to func_to_host_file_result.
--func_convert_file_noop ()
--{
-- func_to_host_file_result="$1"
--}
--# end func_convert_file_noop
--
--
--# func_convert_file_msys_to_w32 ARG
--# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
--# conversion to w32 is not available inside the cwrapper. Returns result in
--# func_to_host_file_result.
--func_convert_file_msys_to_w32 ()
--{
-- $opt_debug
-- func_to_host_file_result="$1"
-- if test -n "$1"; then
-- func_convert_core_msys_to_w32 "$1"
-- func_to_host_file_result="$func_convert_core_msys_to_w32_result"
-- fi
-- func_convert_file_check "$1" "$func_to_host_file_result"
--}
--# end func_convert_file_msys_to_w32
--
--
--# func_convert_file_cygwin_to_w32 ARG
--# Convert file name ARG from Cygwin to w32 format. Returns result in
--# func_to_host_file_result.
--func_convert_file_cygwin_to_w32 ()
--{
-- $opt_debug
-- func_to_host_file_result="$1"
-- if test -n "$1"; then
-- # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
-- # LT_CYGPATH in this case.
-- func_to_host_file_result=`cygpath -m "$1"`
-- fi
-- func_convert_file_check "$1" "$func_to_host_file_result"
--}
--# end func_convert_file_cygwin_to_w32
--
--
--# func_convert_file_nix_to_w32 ARG
--# Convert file name ARG from *nix to w32 format. Requires a wine environment
--# and a working winepath. Returns result in func_to_host_file_result.
--func_convert_file_nix_to_w32 ()
--{
-- $opt_debug
-- func_to_host_file_result="$1"
-- if test -n "$1"; then
-- func_convert_core_file_wine_to_w32 "$1"
-- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
-- fi
-- func_convert_file_check "$1" "$func_to_host_file_result"
--}
--# end func_convert_file_nix_to_w32
--
--
--# func_convert_file_msys_to_cygwin ARG
--# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
--# Returns result in func_to_host_file_result.
--func_convert_file_msys_to_cygwin ()
--{
-- $opt_debug
-- func_to_host_file_result="$1"
-- if test -n "$1"; then
-- func_convert_core_msys_to_w32 "$1"
-- func_cygpath -u "$func_convert_core_msys_to_w32_result"
-- func_to_host_file_result="$func_cygpath_result"
-- fi
-- func_convert_file_check "$1" "$func_to_host_file_result"
--}
--# end func_convert_file_msys_to_cygwin
--
--
--# func_convert_file_nix_to_cygwin ARG
--# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
--# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
--# in func_to_host_file_result.
--func_convert_file_nix_to_cygwin ()
--{
-- $opt_debug
-- func_to_host_file_result="$1"
-- if test -n "$1"; then
-- # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
-- func_convert_core_file_wine_to_w32 "$1"
-- func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-- func_to_host_file_result="$func_cygpath_result"
-- fi
-- func_convert_file_check "$1" "$func_to_host_file_result"
--}
--# end func_convert_file_nix_to_cygwin
--
--
--#############################################
--# $build to $host PATH CONVERSION FUNCTIONS #
--#############################################
--# invoked via `$to_host_path_cmd ARG'
--#
--# In each case, ARG is the path to be converted from $build to $host format.
--# The result will be available in $func_to_host_path_result.
--#
--# Path separators are also converted from $build format to $host format. If
--# ARG begins or ends with a path separator character, it is preserved (but
--# converted to $host format) on output.
--#
--# All path conversion functions are named using the following convention:
--# file name conversion function : func_convert_file_X_to_Y ()
--# path conversion function : func_convert_path_X_to_Y ()
--# where, for any given $build/$host combination the 'X_to_Y' value is the
--# same. If conversion functions are added for new $build/$host combinations,
--# the two new functions must follow this pattern, or func_init_to_host_path_cmd
--# will break.
--
--
--# func_init_to_host_path_cmd
--# Ensures that function "pointer" variable $to_host_path_cmd is set to the
--# appropriate value, based on the value of $to_host_file_cmd.
--to_host_path_cmd=
--func_init_to_host_path_cmd ()
--{
-- $opt_debug
-- if test -z "$to_host_path_cmd"; then
-- func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-- to_host_path_cmd="func_convert_path_${func_stripname_result}"
-- fi
--}
--
--
--# func_to_host_path ARG
--# Converts the path ARG from $build format to $host format. Return result
--# in func_to_host_path_result.
--func_to_host_path ()
--{
-- $opt_debug
-- func_init_to_host_path_cmd
-- $to_host_path_cmd "$1"
--}
--# end func_to_host_path
--
--
--# func_convert_path_noop ARG
--# Copy ARG to func_to_host_path_result.
--func_convert_path_noop ()
--{
-- func_to_host_path_result="$1"
--}
--# end func_convert_path_noop
--
--
--# func_convert_path_msys_to_w32 ARG
--# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
--# conversion to w32 is not available inside the cwrapper. Returns result in
--# func_to_host_path_result.
--func_convert_path_msys_to_w32 ()
--{
-- $opt_debug
-- func_to_host_path_result="$1"
-- if test -n "$1"; then
-- # Remove leading and trailing path separator characters from ARG. MSYS
-- # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
-- # and winepath ignores them completely.
-- func_stripname : : "$1"
-- func_to_host_path_tmp1=$func_stripname_result
-- func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-- func_to_host_path_result="$func_convert_core_msys_to_w32_result"
-- func_convert_path_check : ";" \
-- "$func_to_host_path_tmp1" "$func_to_host_path_result"
-- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-- fi
--}
--# end func_convert_path_msys_to_w32
--
--
--# func_convert_path_cygwin_to_w32 ARG
--# Convert path ARG from Cygwin to w32 format. Returns result in
--# func_to_host_file_result.
--func_convert_path_cygwin_to_w32 ()
--{
-- $opt_debug
-- func_to_host_path_result="$1"
-- if test -n "$1"; then
-- # See func_convert_path_msys_to_w32:
-- func_stripname : : "$1"
-- func_to_host_path_tmp1=$func_stripname_result
-- func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
-- func_convert_path_check : ";" \
-- "$func_to_host_path_tmp1" "$func_to_host_path_result"
-- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-- fi
--}
--# end func_convert_path_cygwin_to_w32
--
--
--# func_convert_path_nix_to_w32 ARG
--# Convert path ARG from *nix to w32 format. Requires a wine environment and
--# a working winepath. Returns result in func_to_host_file_result.
--func_convert_path_nix_to_w32 ()
--{
-- $opt_debug
-- func_to_host_path_result="$1"
-- if test -n "$1"; then
-- # See func_convert_path_msys_to_w32:
-- func_stripname : : "$1"
-- func_to_host_path_tmp1=$func_stripname_result
-- func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
-- func_convert_path_check : ";" \
-- "$func_to_host_path_tmp1" "$func_to_host_path_result"
-- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-- fi
--}
--# end func_convert_path_nix_to_w32
--
--
--# func_convert_path_msys_to_cygwin ARG
--# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
--# Returns result in func_to_host_file_result.
--func_convert_path_msys_to_cygwin ()
--{
-- $opt_debug
-- func_to_host_path_result="$1"
-- if test -n "$1"; then
-- # See func_convert_path_msys_to_w32:
-- func_stripname : : "$1"
-- func_to_host_path_tmp1=$func_stripname_result
-- func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-- func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-- func_to_host_path_result="$func_cygpath_result"
-- func_convert_path_check : : \
-- "$func_to_host_path_tmp1" "$func_to_host_path_result"
-- func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-- fi
--}
--# end func_convert_path_msys_to_cygwin
--
--
--# func_convert_path_nix_to_cygwin ARG
--# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
--# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
--# func_to_host_file_result.
--func_convert_path_nix_to_cygwin ()
--{
-- $opt_debug
-- func_to_host_path_result="$1"
-- if test -n "$1"; then
-- # Remove leading and trailing path separator characters from
-- # ARG. msys behavior is inconsistent here, cygpath turns them
-- # into '.;' and ';.', and winepath ignores them completely.
-- func_stripname : : "$1"
-- func_to_host_path_tmp1=$func_stripname_result
-- func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-- func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-- func_to_host_path_result="$func_cygpath_result"
-- func_convert_path_check : : \
-- "$func_to_host_path_tmp1" "$func_to_host_path_result"
-- func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-- fi
--}
--# end func_convert_path_nix_to_cygwin
--
--
# func_mode_compile arg...
func_mode_compile ()
{
@@@ -1986,12 -1986,12 +1137,12 @@@
;;
-pie | -fpie | -fPIE)
-- func_append pie_flag " $arg"
++ pie_flag="$pie_flag $arg"
continue
;;
-shared | -static | -prefer-pic | -prefer-non-pic)
-- func_append later " $arg"
++ later="$later $arg"
continue
;;
@@@ -2012,14 -2012,14 +1163,15 @@@
save_ifs="$IFS"; IFS=','
for arg in $args; do
IFS="$save_ifs"
-- func_append_quoted lastarg "$arg"
++ func_quote_for_eval "$arg"
++ lastarg="$lastarg $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
# Add the arguments to base_compile.
-- func_append base_compile " $lastarg"
++ base_compile="$base_compile $lastarg"
continue
;;
@@@ -2035,7 -2035,7 +1187,8 @@@
esac # case $arg_mode
# Aesthetically quote the previous argument.
-- func_append_quoted base_compile "$lastarg"
++ func_quote_for_eval "$lastarg"
++ base_compile="$base_compile $func_quote_for_eval_result"
done # for arg
case $arg_mode in
@@@ -2060,7 -2060,7 +1213,7 @@@
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-- *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
++ *.[fF][09]? | *.for | *.java | *.obj | *.sx)
func_xform "$libobj"
libobj=$func_xform_result
;;
@@@ -2135,7 -2135,7 +1288,7 @@@
# 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}
++ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
else
output_obj=
@@@ -2166,16 -2166,16 +1319,17 @@@ compiler.
$opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
-- func_append removelist " $output_obj"
++ removelist="$removelist $output_obj"
$ECHO "$srcfile" > "$lockfile"
fi
$opt_dry_run || $RM $removelist
-- func_append removelist " $lockfile"
++ removelist="$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
++ if test -n "$fix_srcfile_path"; then
++ eval srcfile=\"$fix_srcfile_path\"
++ fi
func_quote_for_eval "$srcfile"
qsrcfile=$func_quote_for_eval_result
@@@ -2195,7 -2195,7 +1349,7 @@@
if test -z "$output_obj"; then
# Place PIC objects in $objdir
-- func_append command " -o $lobj"
++ command="$command -o $lobj"
fi
func_show_eval_locale "$command" \
@@@ -2242,11 -2242,11 +1396,11 @@@ compiler.
command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
-- func_append command " -o $obj"
++ command="$command -o $obj"
fi
# Suppress compiler output if we already did a PIC compilation.
-- func_append command "$suppress_output"
++ command="$command$suppress_output"
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
@@@ -2291,13 -2291,13 +1445,13 @@@ compiler.
}
$opt_help || {
-- test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
++test "$mode" = compile && func_mode_compile ${1+"$@"}
}
func_mode_help ()
{
# We need to display help for each of the modes.
-- case $opt_mode in
++ case $mode in
"")
# Generic help is extracted from the usage comments
# at the start of this file.
@@@ -2328,11 -2328,11 +1482,10 @@@ This mode accepts the following additio
-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
++ -prefer-pic try to building PIC objects only
++ -prefer-non-pic try to building non-PIC objects only
-shared do not build a \`.o' file suitable for static linking
-static only build a \`.o' file suitable for static linking
-- -Wc,FLAG pass FLAG directly to the compiler
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
@@@ -2385,7 -2385,7 +1538,7 @@@ 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
++ -inst-prefix 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)."
@@@ -2405,8 -2405,8 +1558,6 @@@ The following components of LINK-COMMAN
-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
-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)
@@@ -2435,11 -2435,11 +1586,6 @@@
-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.
@@@ -2473,44 -2473,44 +1619,18 @@@ Otherwise, only FILE itself is deleted
;;
*)
-- func_fatal_help "invalid operation mode \`$opt_mode'"
++ func_fatal_help "invalid operation mode \`$mode'"
;;
esac
-- echo
++ $ECHO
$ECHO "Try \`$progname --help' for more information about other modes."
++
++ exit $?
}
--# Now that we've collected a possible --mode arg, show help if necessary
--if $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'
-- {
-- func_help noexit
-- for opt_mode in compile link execute install finish uninstall clean; do
-- echo
-- func_mode_help
-- done
-- } |
-- 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
++ # Now that we've collected a possible --mode arg, show help if necessary
++ $opt_help && func_mode_help
# func_mode_execute arg...
@@@ -2523,16 -2523,16 +1643,13 @@@ func_mode_execute (
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
-- for file in $opt_dlopen; do
++ for file in $execute_dlfiles; do
test -f "$file" \
|| func_fatal_help "\`$file' is not a file"
dir=
case $file in
*.la)
-- func_resolve_sysroot "$file"
-- file=$func_resolve_sysroot_result
--
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$lib' is not a valid libtool archive"
@@@ -2554,7 -2554,7 +1671,7 @@@
dir="$func_dirname_result"
if test -f "$dir/$objdir/$dlname"; then
-- func_append dir "/$objdir"
++ dir="$dir/$objdir"
else
if test ! -f "$dir/$dlname"; then
func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@@ -2595,7 -2595,7 +1712,7 @@@
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
@@@ -2611,7 -2611,7 +1728,8 @@@
;;
esac
# Quote arguments (to preserve shell metacharacters).
-- func_append_quoted args "$file"
++ func_quote_for_eval "$file"
++ args="$args $func_quote_for_eval_result"
done
if test "X$opt_dry_run" = Xfalse; then
@@@ -2636,66 -2636,66 +1754,29 @@@
# Display what would be done.
if test -n "$shlibpath_var"; then
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-- echo "export $shlibpath_var"
++ $ECHO "export $shlibpath_var"
fi
$ECHO "$cmd$args"
exit $EXIT_SUCCESS
fi
}
--test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
++test "$mode" = execute && func_mode_execute ${1+"$@"}
# func_mode_finish arg...
func_mode_finish ()
{
$opt_debug
-- libs=
-- libdirs=
++ libdirs="$nonopt"
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"
-- fi
--
-- else
-- func_fatal_error "invalid argument \`$opt'"
-- fi
-- done
--
-- if test -n "$libs"; then
-- if test -n "$lt_sysroot"; then
-- sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
-- sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
-- else
-- sysroot_cmd=
-- fi
--
-- # Remove sysroot references
-- if $opt_dry_run; then
-- for lib in $libs; do
-- echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
-- done
-- else
-- tmpdir=`func_mktempdir`
-- for lib in $libs; do
-- sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
-- > $tmpdir/tmp-la
-- mv -f $tmpdir/tmp-la $lib
-- done
-- ${RM}r "$tmpdir"
-- fi
-- fi
--
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
++ for dir
++ do
++ libdirs="$libdirs $dir"
++ done
++
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
@@@ -2705,7 -2705,7 +1786,7 @@@
if test -n "$finish_eval"; then
# Do the single finish_eval.
eval cmds=\"$finish_eval\"
-- $opt_dry_run || eval "$cmds" || func_append admincmds "
++ $opt_dry_run || eval "$cmds" || admincmds="$admincmds
$cmds"
fi
done
@@@ -2714,55 -2714,55 +1795,53 @@@
# Exit here if they wanted silent mode.
$opt_silent && 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 "flag during linking and do at least one of the following:"
-- if test -n "$shlibpath_var"; then
-- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
-- echo " during execution"
-- fi
-- if test -n "$runpath_var"; then
-- echo " - add LIBDIR to the \`$runpath_var' environment variable"
-- echo " during linking"
-- fi
-- if test -n "$hardcode_libdir_flag_spec"; then
-- libdir=LIBDIR
-- eval flag=\"$hardcode_libdir_flag_spec\"
--
-- $ECHO " - use the \`$flag' linker flag"
-- fi
-- if test -n "$admincmds"; then
-- $ECHO " - have your system administrator run these commands:$admincmds"
-- fi
-- if test -f /etc/ld.so.conf; then
-- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-- fi
-- echo
--
-- echo "See any operating system documentation about shared libraries for"
-- case $host in
-- solaris2.[6789]|solaris2.1[0-9])
-- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-- echo "pages."
-- ;;
-- *)
-- echo "more information, such as the ld(1) and ld.so(8) manual pages."
-- ;;
-- esac
-- echo "----------------------------------------------------------------------"
++ $ECHO "X----------------------------------------------------------------------" | $Xsed
++ $ECHO "Libraries have been installed in:"
++ for libdir in $libdirs; do
++ $ECHO " $libdir"
++ done
++ $ECHO
++ $ECHO "If you ever happen to want to link against installed libraries"
++ $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
++ $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
++ $ECHO "flag during linking and do at least one of the following:"
++ if test -n "$shlibpath_var"; then
++ $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
++ $ECHO " during execution"
fi
++ if test -n "$runpath_var"; then
++ $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
++ $ECHO " during linking"
++ fi
++ if test -n "$hardcode_libdir_flag_spec"; then
++ libdir=LIBDIR
++ eval flag=\"$hardcode_libdir_flag_spec\"
++
++ $ECHO " - use the \`$flag' linker flag"
++ fi
++ if test -n "$admincmds"; then
++ $ECHO " - have your system administrator run these commands:$admincmds"
++ fi
++ if test -f /etc/ld.so.conf; then
++ $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
++ fi
++ $ECHO
++
++ $ECHO "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 "X----------------------------------------------------------------------" | $Xsed
exit $EXIT_SUCCESS
}
--test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
++test "$mode" = finish && func_mode_finish ${1+"$@"}
# func_mode_install arg...
@@@ -2773,7 -2773,7 +1852,7 @@@ func_mode_install (
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
-- case $nonopt in *shtool*) :;; *) false;; esac; then
++ $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@@ -2787,12 -2787,12 +1866,7 @@@
# 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
++ install_prog="$install_prog$func_quote_for_eval_result"
# We need to accept at least all the BSD install flags.
dest=
@@@ -2802,12 -2802,12 +1876,10 @@@
install_type=
isdir=no
stripme=
-- no_mode=:
for arg
do
-- arg2=
if test -n "$dest"; then
-- func_append files " $dest"
++ files="$files $dest"
dest=$arg
continue
fi
@@@ -2815,9 -2815,9 +1887,10 @@@
case $arg in
-d) isdir=yes ;;
-f)
-- if $install_cp; then :; else
-- prev=$arg
-- fi
++ case " $install_prog " in
++ *[\\\ /]cp\ *) ;;
++ *) prev=$arg ;;
++ esac
;;
-g | -m | -o)
prev=$arg
@@@ -2831,10 -2831,10 +1904,6 @@@
*)
# 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
-- arg2=$install_override_mode
-- no_mode=false
-- fi
prev=
else
dest=$arg
@@@ -2845,11 -2845,11 +1914,7 @@@
# 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"
++ install_prog="$install_prog $func_quote_for_eval_result"
done
test -z "$install_prog" && \
@@@ -2858,13 -2858,13 +1923,6 @@@
test -n "$prev" && \
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"
@@@ -2919,13 -2919,13 +1977,10 @@@
case $file in
*.$libext)
# Do the static libraries later.
-- func_append staticlibs " $file"
++ staticlibs="$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"
@@@ -2939,23 -2939,23 +1994,23 @@@
if test "X$destdir" = "X$libdir"; then
case "$current_libdirs " in
*" $libdir "*) ;;
-- *) func_append current_libdirs " $libdir" ;;
++ *) current_libdirs="$current_libdirs $libdir" ;;
esac
else
# Note the libdir as a future libdir.
case "$future_libdirs " in
*" $libdir "*) ;;
-- *) func_append future_libdirs " $libdir" ;;
++ *) future_libdirs="$future_libdirs $libdir" ;;
esac
fi
func_dirname "$file" "/" ""
dir="$func_dirname_result"
-- func_append dir "$objdir"
++ dir="$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\$%%"`
++ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
@@@ -2968,9 -2968,9 +2023,9 @@@
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%"`
++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
else
-- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
fi
func_warning "relinking \`$file'"
@@@ -2988,7 -2988,7 +2043,7 @@@
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" \
++ func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
'exit $?'
tstripme="$stripme"
case $host_os in
@@@ -3028,7 -3028,7 +2083,7 @@@
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"
++ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
;;
*.lo)
@@@ -3128,7 -3128,7 +2183,7 @@@
if test -f "$lib"; then
func_source "$lib"
fi
-- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
++ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
finalize=no
@@@ -3147,7 -3147,7 +2202,7 @@@
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
-- relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
++ relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
$opt_silent || {
func_quote_for_expand "$relink_command"
@@@ -3166,7 -3166,7 +2221,7 @@@
}
else
# Install the binary that we compiled earlier.
-- file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
++ file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
fi
fi
@@@ -3202,13 -3202,13 +2257,11 @@@
# Set up the ranlib parameters.
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 $?'
++ func_show_eval "$old_striplib $oldlib" 'exit $?'
fi
# Do each command in the postinstall commands.
@@@ -3227,7 -3227,7 +2280,7 @@@
fi
}
--test "$opt_mode" = install && func_mode_install ${1+"$@"}
++test "$mode" = install && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
@@@ -3270,22 -3270,22 +2323,6 @@@ func_generate_dlsyms (
extern \"C\" {
#endif
--#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
-- relocations are performed -- see ld's documentation on pseudo-relocs. */
--# define LT_DLSYM_CONST
--#elif defined(__osf__)
--/* This system does not cope well with relocations in const data. */
--# define LT_DLSYM_CONST
--#else
--# define LT_DLSYM_CONST const
--#endif
--
/* External symbol declarations for the compiler. */\
"
@@@ -3295,11 -3295,11 +2332,10 @@@
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
-- progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
++ progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$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'"
-- $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
++ func_verbose "extracting global C symbols from \`$progfile'"
++ $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
done
if test -n "$exclude_expsyms"; then
@@@ -3335,7 -3335,7 +2371,7 @@@
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
-- *cygwin* | *mingw* | *cegcc* )
++ *cygwin | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
@@@ -3348,52 -3348,52 +2384,10 @@@
func_verbose "extracting global C symbols from \`$dlprefile'"
func_basename "$dlprefile"
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=""
-- if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
-- # Use subshell, to avoid clobbering current variable values
-- dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-- if test -n "$dlprefile_dlname" ; then
-- func_basename "$dlprefile_dlname"
-- dlprefile_dlbasename="$func_basename_result"
-- else
-- # no lafile. user explicitly requested -dlpreopen <import library>.
-- $sharedlib_from_linklib_cmd "$dlprefile"
-- dlprefile_dlbasename=$sharedlib_from_linklib_result
-- fi
-- fi
-- $opt_dry_run || {
-- if test -n "$dlprefile_dlbasename" ; then
-- eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
-- else
-- func_warning "Could not compute DLL name from $name"
-- eval '$ECHO ": $name " >> "$nlist"'
-- fi
-- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
-- $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
-- }
-- else # not an import lib
-- $opt_dry_run || {
-- eval '$ECHO ": $name " >> "$nlist"'
-- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-- }
-- fi
-- ;;
-- *)
-- $opt_dry_run || {
-- eval '$ECHO ": $name " >> "$nlist"'
-- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-- }
-- ;;
-- esac
++ $opt_dry_run || {
++ eval '$ECHO ": $name " >> "$nlist"'
++ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
++ }
done
$opt_dry_run || {
@@@ -3421,19 -3421,19 +2415,36 @@@
if test -f "$nlist"S; then
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
-- echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
++ $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
-- echo >> "$output_objdir/$my_dlsyms" "\
++ $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
++"
++ case $host in
++ *cygwin* | *mingw* | *cegcc* )
++ $ECHO >> "$output_objdir/$my_dlsyms" "\
++/* DATA imports from DLLs on WIN32 con't be const, because
++ runtime relocations are performed -- see ld's documentation
++ on pseudo-relocs. */"
++ lt_dlsym_const= ;;
++ *osf5*)
++ echo >> "$output_objdir/$my_dlsyms" "\
++/* This system does not cope well with relocations in const data */"
++ lt_dlsym_const= ;;
++ *)
++ lt_dlsym_const=const ;;
++ esac
++
++ $ECHO >> "$output_objdir/$my_dlsyms" "\
++extern $lt_dlsym_const lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[];
--LT_DLSYM_CONST lt_dlsymlist
++$lt_dlsym_const lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[] =
{\
{ \"$my_originator\", (void *) 0 },"
@@@ -3446,7 -3446,7 +2457,7 @@@
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
;;
esac
-- echo >> "$output_objdir/$my_dlsyms" "\
++ $ECHO >> "$output_objdir/$my_dlsyms" "\
{0, (void *) 0}
};
@@@ -3473,7 -3473,7 +2484,7 @@@ static const void *lt_preloaded_setup(
# 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*)
++ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
@@@ -3489,7 -3489,7 +2500,7 @@@
for arg in $LTCFLAGS; do
case $arg in
-pie | -fpie | -fPIE) ;;
-- *) func_append symtab_cflags " $arg" ;;
++ *) symtab_cflags="$symtab_cflags $arg" ;;
esac
done
@@@ -3504,16 -3504,16 +2515,16 @@@
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%"`
++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "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%"`
++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
fi
;;
*)
-- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
;;
esac
;;
@@@ -3527,8 -3527,8 +2538,8 @@@
# really was required.
# Nullify the symbol file.
-- compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
-- finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
fi
}
@@@ -3538,7 -3538,7 +2549,6 @@@
# 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
@@@ -3549,11 -3549,11 +2559,9 @@@
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(.*archit
<TRUNCATED>