diff options
| author | Gary V. Vaughan <gary@gnu.org> | 2011-11-16 18:59:01 +0700 |
|---|---|---|
| committer | Gary V. Vaughan <gary@gnu.org> | 2011-11-25 14:53:41 +0700 |
| commit | 06c6555d4a77a5e91f43da3451586534da93e0ae (patch) | |
| tree | d7231883b36c9cc1afa28ea9a738f54afe36c8ff | |
| parent | 59e09030ae0f79108745dd527b2fd03f0f149696 (diff) | |
| download | libtool-06c6555d4a77a5e91f43da3451586534da93e0ae.tar.gz | |
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
| -rwxr-xr-x | bootstrap | 112 | ||||
| -rw-r--r-- | bootstrap.conf | 40 | ||||
| -rwxr-xr-x | build-aux/edit-readme-alpha | 2 | ||||
| -rw-r--r-- | build-aux/general.m4sh | 64 | ||||
| -rw-r--r-- | build-aux/getopt.m4sh | 14 | ||||
| -rwxr-xr-x | build-aux/git-hooks/commit-msg | 2 | ||||
| -rw-r--r-- | build-aux/ltmain.m4sh | 700 | ||||
| -rw-r--r-- | build-aux/options-parser | 22 | ||||
| -rw-r--r-- | cfg.mk | 20 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/libtool.texi | 8 | ||||
| -rw-r--r-- | libtoolize.m4sh | 96 | ||||
| -rw-r--r-- | m4/libtool.m4 | 260 | ||||
| -rw-r--r-- | m4/ltdl.m4 | 44 | ||||
| -rw-r--r-- | m4/ltoptions.m4 | 24 | ||||
| -rw-r--r-- | tests/cwrapper.at | 4 | ||||
| -rw-r--r-- | tests/defs.m4sh | 36 | ||||
| -rw-r--r-- | tests/lalib-syntax.at | 2 | ||||
| -rw-r--r-- | tests/libtoolize.at | 10 | ||||
| -rw-r--r-- | tests/lt_dlopenext.at | 2 | ||||
| -rw-r--r-- | tests/mdemo/configure.ac | 2 | ||||
| -rw-r--r-- | tests/mdemo2/configure.ac | 2 | ||||
| -rw-r--r-- | tests/need_lib_prefix.at | 2 | ||||
| -rw-r--r-- | tests/no-executables.at | 2 | ||||
| -rwxr-xr-x | tests/quote.test | 12 | ||||
| -rwxr-xr-x | tests/suffix.test | 2 |
26 files changed, 753 insertions, 733 deletions
@@ -233,7 +233,7 @@ func_bootstrap () # Save the current positional parameters to prevent them being # corrupted by calls to `set' in `func_init'. func_quote_for_eval ${1+"$@"} - _G_saved_positional_parameters="$func_quote_for_eval_result" + _G_saved_positional_parameters=$func_quote_for_eval_result # Initialisation. func_init @@ -378,7 +378,7 @@ func_gnulib_tool () # Try not to pick up any stale values from `gnulib-cache.m4'. rm -f "$gnulib_cache" - gnulib_mode="--import" + gnulib_mode=--import # `gnulib_modules' and others are maintained in `bootstrap.conf`: # Use `gnulib --import` to fetch gnulib modules. @@ -404,7 +404,7 @@ func_gnulib_tool () # `gnulib_modules' and others are cached in `gnulib-cache.m4': # Use `gnulib --update' to fetch gnulib modules. - gnulib_mode="--update" + gnulib_mode=--update fi # Add a sensible default libtool option to gnulib_tool_options. @@ -656,8 +656,8 @@ func_autoreconf () $require_macro_dir # aclocal and others put files in here # We ran these manually already, and autoreconf won't exec `:' - save_AUTOPOINT="$AUTOPOINT"; AUTOPOINT=true - save_LIBTOOLIZE="$LIBTOOLIZE"; LIBTOOLIZE=true + save_AUTOPOINT=$AUTOPOINT; AUTOPOINT=true + save_LIBTOOLIZE=$LIBTOOLIZE; LIBTOOLIZE=true _G_autoreconf_options= $opt_copy || func_append _G_autoreconf_options " --symlink" @@ -665,8 +665,8 @@ func_autoreconf () $opt_verbose && func_append _G_autoreconf_options " --verbose" func_show_eval "$AUTORECONF$_G_autoreconf_options --install" 'exit $?' - AUTOPOINT="$save_AUTOPOINT" - LIBTOOLIZE="$save_LIBTOOLIZE" + AUTOPOINT=$save_AUTOPOINT + LIBTOOLIZE=$save_LIBTOOLIZE } @@ -913,7 +913,7 @@ for tool in autoconf libtoolize autopoint; do printf '%s\n' "$buildreq" |func_grep_q '\''^[ ]*'$tool\'' || { func_extract_trace '$m' - _G_version="$func_extract_trace_result" + _G_version=$func_extract_trace_result test -n "$_G_version" && { func_append buildreq "\ '$tool' $_G_version http://www.gnu.org/s/'$b' @@ -973,7 +973,7 @@ func_require_automake_buildreq () test -n "$func_extract_trace_result" && { automake_version=`echo "$func_extract_trace_result" \ |$SED 's|[^0-9]*||; s| .*$||'` - test -n "$automake_version" || automake_version="-" + test -n "$automake_version" || automake_version=- func_append buildreq "\ automake $automake_version http://www.gnu.org/s/automake @@ -1044,7 +1044,7 @@ func_require_build_aux () test -n "$build_aux" || { func_extract_trace AC_CONFIG_AUX_DIR - build_aux="$func_extract_trace_result" + build_aux=$func_extract_trace_result func_check_configuration build_aux \ "AC_CONFIG_AUX_DIR([name of a directory for build scripts])" @@ -1132,7 +1132,7 @@ func_require_dotgitmodules () test true = "$GIT" || { # A gnulib entry in .gitmodules always takes precedence. - _G_path="`$GIT config --file .gitmodules submodule.gnulib.path 2>/dev/null`" + _G_path=`$GIT config --file .gitmodules submodule.gnulib.path 2>/dev/null` test -n "$_G_path" || { $require_vc_ignore_files @@ -1207,7 +1207,7 @@ func_require_gnulib_cache () $require_macro_dir test -n "$gnulib_cache" \ - || gnulib_cache="$macro_dir/gnulib-cache.m4" + || gnulib_cache=$macro_dir/gnulib-cache.m4 func_verbose "found \`$gnulib_cache'" @@ -1258,7 +1258,7 @@ func_require_gnulib_mk () $require_macro_dir func_extract_trace "gl_MAKEFILE_NAME" "$gnulib_cache" - gnulib_mk="$func_extract_trace_result" + gnulib_mk=$func_extract_trace_result test -n "$gnulib_mk" && func_verbose "gnulib_mk='$gnulib_mk'" } @@ -1285,7 +1285,7 @@ func_require_dotgitmodules_parameters () # `--gnulib-srcdir' if possible. test -n "$gnulib_path" \ || test ! -x "$opt_gnulib_srcdir/gnulib-tool" \ - || gnulib_path="$opt_gnulib_srcdir" + || gnulib_path=$opt_gnulib_srcdir } @@ -1383,7 +1383,7 @@ func_require_gnulib_tool () $require_gnulib_path test -n "$gnulib_tool" \ - || gnulib_tool="$gnulib_path/gnulib-tool" + || gnulib_tool=$gnulib_path/gnulib-tool test -x "$gnulib_tool" || { gnulib_tool=true @@ -1445,7 +1445,7 @@ func_require_macro_dir () # Sometimes this is stored in `configure.ac'. test -n "$macro_dir" || { func_extract_trace AC_CONFIG_MACRO_DIR - macro_dir="$func_extract_trace_result" + macro_dir=$func_extract_trace_result } # Otherwise we might find it in `Makefile.am'. @@ -1488,7 +1488,7 @@ func_require_makefile_am () $debug_cmd test -n "$makefile_am" \ - || makefile_am="Makefile.am" + || makefile_am=Makefile.am <"$makefile_am" @@ -1530,13 +1530,13 @@ func_require_package_bugreport () func_extract_trace AC_INIT - save_ifs="$IFS" + save_ifs=$IFS IFS=: set dummy $func_extract_trace_result - IFS="$save_ifs" + IFS=$save_ifs shift - test -n "$package_bugreport" || package_bugreport="$3" + test -n "$package_bugreport" || package_bugreport=$3 func_check_configuration package_bugreport \ "AC_INIT([$package_name], [$package_version], [bug-$package@gnu.org])" func_verbose "package_bugreport='$package_bugreport'" @@ -1556,13 +1556,13 @@ func_require_package_name () func_extract_trace AC_INIT - save_ifs="$IFS" + save_ifs=$IFS IFS=: set dummy $func_extract_trace_result - IFS="$save_ifs" + IFS=$save_ifs shift - test -n "$package_name" || package_name="$1" + test -n "$package_name" || package_name=$1 func_check_configuration package_name \ "AC_INIT([name of your package], [package version number])" func_verbose "package_name='$package_name'" @@ -1586,13 +1586,13 @@ func_require_package_version () func_extract_trace AC_INIT - save_ifs="$IFS" + save_ifs=$IFS IFS=: set dummy $func_extract_trace_result - IFS="$save_ifs" + IFS=$save_ifs shift - test -n "$package_version" || package_version="$2" + test -n "$package_version" || package_version=$2 test -n "$package_version" || { # The embedded echo is to squash whitespace before globbing. case " "`echo $gnulib_modules`" " in @@ -1629,7 +1629,7 @@ func_require_source_base () func_extract_trace "gl_SOURCE_BASE" "$gnulib_cache" - source_base="$func_extract_trace_result" + source_base=$func_extract_trace_result func_verbose "source_base='$source_base'" } @@ -1654,7 +1654,7 @@ func_require_vc_ignore_files () test -d .git && vc_ignore_files=.gitignore test -d CVS && vc_ignore_files="$vc_ignore_files .cvsignore" else - vc_ignore_files="$vc_ignore" + vc_ignore_files=$vc_ignore fi func_verbose "vc_ignore_files='$vc_ignore_files'" @@ -1830,7 +1830,7 @@ func_strrow () { $debug_cmd - func_strrow_linelen="$1"; shift + func_strrow_linelen=$1; shift _G_row= while test $# -gt 0; do @@ -1841,7 +1841,7 @@ func_strrow () done func_strrpad "$_G_row" $func_strrow_linelen " " - func_strrow_result="$func_strrpad_result" + func_strrow_result=$func_strrpad_result } @@ -1878,11 +1878,11 @@ func_strtable () $debug_cmd # Save the indent value, we'll need it for each row we render. - _G_indent="$1"; shift + _G_indent=$1; shift # Collect remaining numeric args into a list for reuse between # members of each row when we call func_strrow later. - _G_widths="$1"; shift + _G_widths=$1; shift while test 0 -lt `expr "$1" : '[1-9][0-9]*$'`; do func_append _G_widths " $1"; shift done @@ -1890,7 +1890,7 @@ func_strtable () # Extract the same number of positional parameters as there are # width elements - we'll do the header rows separately so that # we can insert a divider line. - _G_header="$_G_indent" + _G_header=$_G_indent for _G_width in $_G_widths; do func_append _G_header " $1 $_G_width"; shift done @@ -1914,7 +1914,7 @@ $_G_divider # The remaining rows are zipped between the width values we # unwound earlier just like the header row above. while test $# -gt 0; do - _G_row="$_G_indent" + _G_row=$_G_indent for _G_width in $_G_widths; do func_append _G_row " $1 $_G_width"; shift done @@ -1966,7 +1966,7 @@ func_warning () *) func_internal_error "invalid warning category \`$1'" ;; esac - _G_category="$1" + _G_category=$1 shift case " $opt_warning " in @@ -1984,16 +1984,16 @@ func_show_eval () { $debug_cmd - _G_cmd="$1" - _G_fail_exp="${2-:}" + _G_cmd=$1 + _G_fail_exp=${2-':'} - ${opt_silent-false} || { + ${opt_silent-'false'} || { func_quote_for_eval $_G_cmd eval func_truncate_cmd $func_quote_for_eval_result func_echo "running: $func_truncate_cmd_result" } - ${opt_dry_run-false} || { + ${opt_dry_run-'false'} || { eval "$_G_cmd" _G_status=$? test "$_G_status" -eq 0 || eval "(exit $_G_status); $_G_fail_exp" @@ -2016,7 +2016,7 @@ func_truncate_cmd () set dummy "$@"; shift while test $# -gt 0; do - _G_opt="$1"; shift + _G_opt=$1; shift test -n "$func_truncate_cmd_result" \ && func_append func_truncate_cmd_result ' ' @@ -2075,8 +2075,8 @@ func_sort_ver () # sort -V is not generally available { $debug_cmd - ver1="$1" - ver2="$2" + ver1=$1 + ver2=$2 # Split on '.' and compare each component. i=1 @@ -2157,9 +2157,9 @@ func_check_versions () func_check_versions_result=: while test $# -gt 0; do - _G_app="$1"; shift - _G_reqver="$1"; shift - _G_url="$1"; shift + _G_app=$1; shift + _G_reqver=$1; shift + _G_url=$1; shift # Honor $APP variables ($TAR, $AUTOCONF, etc.) _G_appvar=`echo $_G_app |tr '[a-z]' '[A-Z]'` @@ -2232,7 +2232,7 @@ func_update_po_files () # Mirror *.po files into this dir. # Usually contains *.s1 checksum files. - _G_ref_po_dir="$_G_po_dir/.reference" + _G_ref_po_dir=$_G_po_dir/.reference test -d $_G_ref_po_dir || mkdir $_G_ref_po_dir || return func_download_po_files $_G_ref_po_dir $_G_domain \ @@ -2246,8 +2246,8 @@ func_update_po_files () test "$_G_langs" = '*' && _G_langs=x for _G_po in $_G_langs; do case $_G_po in x) continue;; esac - _G_new_po="$_G_ref_po_dir/$_G_po.po" - _G_cksum_file="$_G_ref_po_dir/$_G_po.s1" + _G_new_po=$_G_ref_po_dir/$_G_po.po + _G_cksum_file=$_G_ref_po_dir/$_G_po.s1 if ! test -f "$_G_cksum_file" || ! test -f "$_G_po_dir/$_G_po.po" || ! $SHA1SUM -c --status "$_G_cksum_file" \ @@ -2327,17 +2327,17 @@ bootstrap_options_prep () warning_func=func_error # Option defaults: - opt_copy=${copy-false} + opt_copy=${copy-'false'} opt_dry_run=false opt_force=false - opt_gnulib_srcdir="$GNULIB_SRCDIR" + opt_gnulib_srcdir=$GNULIB_SRCDIR opt_skip_git=false opt_skip_po=false opt_warning= # Pass back the list of options we consumed. func_quote_for_eval ${1+"$@"} - bootstrap_options_prep_result="$func_quote_for_eval_result" + bootstrap_options_prep_result=$func_quote_for_eval_result } func_add_hook func_options_prep bootstrap_options_prep @@ -2352,7 +2352,7 @@ bootstrap_parse_options () # Perform our own loop to consume as many options as possible in # each iteration. while test $# -gt 0; do - _G_opt="$1" + _G_opt=$1 shift case $_G_opt in --dry-run|--dryrun|-n) @@ -2362,7 +2362,7 @@ bootstrap_parse_options () --gnulib-srcdir) test $# = 0 && func_missing_arg $_G_opt && break - opt_gnulib_srcdir="$1" + opt_gnulib_srcdir=$1 shift ;; @@ -2415,7 +2415,7 @@ bootstrap_parse_options () # save modified positional parameters for caller func_quote_for_eval ${1+"$@"} - bootstrap_parse_options_result="$func_quote_for_eval_result" + bootstrap_parse_options_result=$func_quote_for_eval_result } func_add_hook func_parse_options bootstrap_parse_options @@ -2429,7 +2429,7 @@ bootstrap_validate_options () $debug_cmd # Display all warnings if -W was not given. - test -n "$opt_warning" || opt_warning="$warning_categories" + test -n "$opt_warning" || opt_warning=$warning_categories # Validate options. test $# -gt 0 \ @@ -2437,7 +2437,7 @@ bootstrap_validate_options () # Pass back the list of unconsumed options left. func_quote_for_eval ${1+"$@"} - bootstrap_validate_options_result="$func_quote_for_eval_result" + bootstrap_validate_options_result=$func_quote_for_eval_result } diff --git a/bootstrap.conf b/bootstrap.conf index 6f0f0c3c..c3491b5b 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -77,13 +77,13 @@ gnulib_modules=' # Extra gnulib files that are not in modules, which override files of # the same name installed by other bootstrap tools. -gnulib_non_module_files="$gnulib_non_module_files"' +gnulib_non_module_files=$gnulib_non_module_files' doc/COPYINGv2 doc/fdl.texi ' # What ignore files to maintain. -vc_ignore=".gitignore" +vc_ignore=.gitignore # Running the installed `libtoolize' will trash the local (newer) libtool.m4 # among others. Don't use `:', since autoreconf can't exec it! @@ -128,10 +128,10 @@ func_reconfigure () # Also bootstrap any additional directories that were specified with # `reconfdirs' in the environment. - save_IFS="$IFS" + save_IFS=$IFS IFS=, for sub in $opt_reconf_dirs; do - IFS="$save_IFS" + IFS=$save_IFS my_autoreconf_options= $opt_copy || func_append my_autoreconf_options " --symlink" $opt_force && func_append my_autoreconf_options " --force" @@ -139,7 +139,7 @@ func_reconfigure () func_show_eval "$AUTORECONF$my_autoreconf_options --install $sub" \ 'exit $?' done - IFS="$save_IFS" + IFS=$save_IFS } @@ -164,7 +164,7 @@ libtool_options_prep () $debug_cmd # Extend the existing usage message - usage_message="$usage_message"' + usage_message=$usage_message' Libtool Specific Options: -r, --reconf-dirs=DIR1,DIR2,... limit the directories to be bootstrapped to @@ -177,7 +177,7 @@ Libtool Specific Options: # pass back the list of options we consumed func_quote_for_eval ${1+"$@"} - libtool_options_prep_result="$func_quote_for_eval_result" + libtool_options_prep_result=$func_quote_for_eval_result } func_add_hook func_options_prep libtool_options_prep @@ -192,7 +192,7 @@ libtool_parse_options () # this inner loop lets us handle `-r.' in a single iteration while test $# -gt 0; do - opt="$1" + opt=$1 shift case $opt in @@ -215,7 +215,7 @@ libtool_parse_options () # pass back the list of options we consumed func_quote_for_eval ${1+"$@"} - libtool_parse_options_result="$func_quote_for_eval_result" + libtool_parse_options_result=$func_quote_for_eval_result } func_add_hook func_parse_options libtool_parse_options @@ -231,20 +231,20 @@ libtool_validate_options () || opt_reconf_dirs=`echo $reconfdirs |$SED 's| *|,|g'` # validate $opt_reconf_dirs - save_IFS="$IFS" + save_IFS=$IFS IFS=, for reconfdir in $opt_reconf_dirs; do - IFS="$save_IFS" + IFS=$save_IFS test -d "$reconfdir" || { func_error "bad reconf directory \`$reconfdir': directory does not exist" exit_cmd=exit } done - IFS="$save_IFS" + IFS=$save_IFS # pass back the list of options we consumed func_quote_for_eval ${1+"$@"} - libtool_validate_options_result="$func_quote_for_eval_result" + libtool_validate_options_result=$func_quote_for_eval_result } func_add_hook func_validate_options libtool_validate_options @@ -302,13 +302,13 @@ libtool_build_prerequisites () func_extract_trace LT_CONFIG_LTDL_DIR - save_ifs="$IFS" + save_ifs=$IFS IFS=: set dummy $func_extract_trace_result - IFS="$save_ifs" + IFS=$save_ifs shift - ltdl_dir="$1" + ltdl_dir=$1 func_check_configuration ltdl_dir \ "LT_CONFIG_LTDL_DIR([name of your libltdl directory])" func_verbose "ltdl_dir='$ltdl_dir'" @@ -421,7 +421,7 @@ libtool_cleanup_empty_dirs () { $debug_cmd - my_gnulib_source="${source_base-lib}" + my_gnulib_source=${source_base-'lib'} if test -d "$my_gnulib_source"; then rm -f "$my_gnulib_source/.gitignore" "$my_gnulib_source/Makefile.am" || exit 1 rmdir "$my_gnulib_source" || exit 1 @@ -445,13 +445,13 @@ libtool_require_package_url () func_extract_trace AC_INIT - save_IFS="$IFS" + save_IFS=$IFS IFS=: set dummy $func_extract_trace_result - IFS="$save_IFS" + IFS=$save_IFS shift - test -n "$package_url " || package_url="$5" + test -n "$package_url " || package_url=$5 test -n "$package_url" || { # How to extract the parameters for `make bootstrap-deps' from # configure.ac. This is very specific to the way Libtool's diff --git a/build-aux/edit-readme-alpha b/build-aux/edit-readme-alpha index ee6ca6b9..b154974c 100755 --- a/build-aux/edit-readme-alpha +++ b/build-aux/edit-readme-alpha @@ -38,7 +38,7 @@ EXIT_FAILURE=1 # 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" +progpath=$0 # The name of this program: progname=`echo "$progpath" |sed 's|^.*/||'` diff --git a/build-aux/general.m4sh b/build-aux/general.m4sh index 44eccecd..1f44535f 100644 --- a/build-aux/general.m4sh +++ b/build-aux/general.m4sh @@ -39,7 +39,7 @@ m4_divert_pop([KILL])M4SH_IN_HEADER([dnl # 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" +progpath=$0 ]) M4SH_VERBATIM([[ @@ -70,8 +70,8 @@ lt_nl=' ' IFS=" $lt_nl" -dirname="s,/[^/]*$,," -basename="s,^.*/,," +dirname='s,/[^/]*$,,' +basename='s,^.*/,,' # func_dirname file append nondir_replacement # Compute the dirname of FILE. If nonempty, add APPEND to the result, @@ -80,9 +80,9 @@ func_dirname () { func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" + func_dirname_result=${3} else - func_dirname_result="$func_dirname_result${2}" + func_dirname_result=$func_dirname_result${2} fi } # func_dirname may be replaced by extended shell implementation @@ -111,9 +111,9 @@ 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}" + func_dirname_result=${3} else - func_dirname_result="$func_dirname_result${2}" + 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 @@ -290,24 +290,24 @@ case $progpath in *[\\/]*) progdir=$func_dirname_result progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; *) - save_IFS="$IFS" + save_IFS=$IFS IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do - IFS="$save_IFS" + IFS=$save_IFS test -x "$progdir/$progname" && break done - IFS="$save_IFS" + IFS=$save_IFS test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; esac # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' +Xsed="$SED -e 1s/^X//" sed_quote_subst='s/\([`"$\\]\)/\\\1/g' # Same as above, but do not quote variable references. @@ -420,21 +420,21 @@ func_grep () # Make sure the entire path to DIRECTORY-PATH is available. func_mkdir_p () { - my_directory_path="$1" + 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" ;; + -*) my_directory_path=./$my_directory_path ;; 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" + 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 @@ -444,15 +444,15 @@ func_mkdir_p () done my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` - save_mkdir_p_IFS="$IFS"; IFS=':' + save_mkdir_p_IFS=$IFS; IFS=: for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" + 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" + IFS=$save_mkdir_p_IFS # Bail out if we (or some other process) failed to create a directory. test -d "$my_directory_path" || \ @@ -467,11 +467,11 @@ func_mkdir_p () # given, STRING is the basename for that directory. func_mktempdir () { - my_template="${TMPDIR-/tmp}/${1-$progname}" + 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}-$$" + my_tmpdir=${my_template}-$$ else # If mktemp works, use that first and foremost @@ -479,7 +479,7 @@ func_mktempdir () if test ! -d "$my_tmpdir"; then # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + my_tmpdir=${my_template}-${RANDOM-0}$$ save_mktempdir_umask=`umask` umask 0077 @@ -508,7 +508,7 @@ func_quote_for_eval () *[\\\`\"\$]*) func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; *) - func_quote_for_eval_unquoted_result="$1" ;; + func_quote_for_eval_unquoted_result=$1 ;; esac case $func_quote_for_eval_unquoted_result in @@ -518,10 +518,10 @@ func_quote_for_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\" ;; *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" + func_quote_for_eval_result=$func_quote_for_eval_unquoted_result esac } @@ -536,7 +536,7 @@ func_quote_for_expand () my_arg=`$ECHO "$1" | $SED \ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; *) - my_arg="$1" ;; + my_arg=$1 ;; esac case $my_arg in @@ -545,11 +545,11 @@ func_quote_for_expand () # Many Bourne shells cannot handle close brackets correctly # in scan sets, so we specify it separately. *[\@<:@\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*@:>@*|"") - my_arg="\"$my_arg\"" + my_arg=\"$my_arg\" ;; esac - func_quote_for_expand_result="$my_arg" + func_quote_for_expand_result=$my_arg } @@ -559,8 +559,8 @@ func_quote_for_expand () # is given, then evaluate it. func_show_eval () { - my_cmd="$1" - my_fail_exp="${2-:}" + my_cmd=$1 + my_fail_exp=${2-':'} ${opt_silent-false} || { func_quote_for_expand "$my_cmd" @@ -583,8 +583,8 @@ func_show_eval () # is given, then evaluate it. Use the saved locale for evaluation. func_show_eval_locale () { - my_cmd="$1" - my_fail_exp="${2-:}" + my_cmd=$1 + my_fail_exp=${2-':'} ${opt_silent-false} || { func_quote_for_expand "$my_cmd" diff --git a/build-aux/getopt.m4sh b/build-aux/getopt.m4sh index b76694e6..568db29e 100644 --- a/build-aux/getopt.m4sh +++ b/build-aux/getopt.m4sh @@ -385,15 +385,15 @@ m4_define([_m4go_option], [ test [$]# = 0 && func_missing_arg $opt && break ])m4_n(m4_bmatch([$3], [\^], [ func_quote_for_eval "[$]1" - optarg="$func_quote_for_eval_result"], - [[?!;+@]], [ optarg="[$]1"]))[]dnl + optarg=$func_quote_for_eval_result], + [[?!;+@]], [ optarg=[$]1]))[]dnl m4_n(m4_bmatch([$3], [+], [ $1_num=`expr 1 + ${$1_num-0}` eval $1_${$1_num}=\"$optarg\"], [?], [m4_bmatch([$3], [@], [m4go_expand([m4go_optional_file_arg([$1])])], [m4go_expand([m4go_optional_arg([$1])])])], - [[!@]], [ $1="$optarg"], + [[!@]], [ $1=$optarg], [;], [ $1="${$1+[$]$1 }$optarg"], [~], [ $1=false], @@ -422,7 +422,7 @@ m4_define([m4go_optional_arg], [ if test [$]# -gt 0; then case $optarg in # (( -*) ;; - *) $1="$optarg"; shift ;; + *) $1=$optarg; shift ;; esac fi]) @@ -444,7 +444,7 @@ m4_define([m4go_optional_file_arg], [ if test [$]# -gt 0; then case $optarg in # (( -*) ;; - *) $1="$optarg" + *) $1=$optarg test -r "$optarg" || { func_error "$opt: cannot read file \`$optarg'." exit_cmd=exit @@ -465,7 +465,7 @@ m4_define([m4go_optional_file_arg], m4_define([m4go_printopts], [ # Option defaults: -debug_cmd="${debug_cmd-:}" +debug_cmd=${debug_cmd-':'} m4go_defaults # Parse options once, thoroughly. This comes as soon as possible in the @@ -473,7 +473,7 @@ m4go_defaults { # this just eases exit handling while test [$]# -gt 0; do - opt="[$]1" + opt=[$]1 shift case $opt in --debug|-x) debug_cmd='set -x' diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg index f6e80516..f2e61080 100755 --- a/build-aux/git-hooks/commit-msg +++ b/build-aux/git-hooks/commit-msg @@ -11,7 +11,7 @@ basename="$SED -e "'s|^.*/||' nl=' ' -progpath="$0" +progpath=$0 progname=`$ECHO "$progpath" |$basename` log_file=$1 diff --git a/build-aux/ltmain.m4sh b/build-aux/ltmain.m4sh index ee93a212..b0b2a628 100644 --- a/build-aux/ltmain.m4sh +++ b/build-aux/ltmain.m4sh @@ -132,14 +132,14 @@ m4_define([M4SH_IN_HEADER], [$1])dnl m4_include([getopt.m4sh]) M4SH_VERBATIM([[ -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' # Global variables. nonopt= preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" +lo2o=s/\\.lo\$/.${objext}/ +o2lo=s/\\.${objext}\$/.lo/ extracted_archives= extracted_serial=0 @@ -249,11 +249,11 @@ func_features () func_enable_tag () { # Global variable: - tagname="$1" + tagname=$1 re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" + sed_extractcf=/$re_begincf/,/$re_endcf/p # Validate tagname. case $tagname in @@ -389,7 +389,7 @@ M4SH_GETOPTS( [ # save first non-option argument if test "$[]#" -gt 0; then - nonopt="$opt" + nonopt=$opt shift fi @@ -425,7 +425,7 @@ M4SH_GETOPTS( fi # Change the help message to a mode-specific one. - generic_help="$help" + generic_help=$help help="Try \`$progname --help --mode=$opt_mode' for more information." } ]) @@ -501,7 +501,7 @@ 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 @@ -571,7 +571,7 @@ func_replace_sysroot () 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. @@ -699,7 +699,7 @@ func_convert_core_file_wine_to_w32 () { $debug_cmd - func_convert_core_file_wine_to_w32_result="$1" + 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 @@ -733,7 +733,7 @@ func_convert_core_path_wine_to_w32 () $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=: @@ -742,7 +742,7 @@ func_convert_core_path_wine_to_w32 () 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" + 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 @@ -814,7 +814,7 @@ func_convert_file_check () 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 @@ -839,7 +839,7 @@ func_convert_path_check () 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 } @@ -854,7 +854,7 @@ func_convert_path_front_back_pathsep () $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 @@ -911,7 +911,7 @@ func_to_tool_file () # 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 @@ -924,10 +924,10 @@ func_convert_file_msys_to_w32 () { $debug_cmd - func_to_host_file_result="$1" + 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" } @@ -941,7 +941,7 @@ func_convert_file_cygwin_to_w32 () { $debug_cmd - func_to_host_file_result="$1" + 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. @@ -959,10 +959,10 @@ func_convert_file_nix_to_w32 () { $debug_cmd - func_to_host_file_result="$1" + 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" } @@ -976,11 +976,11 @@ func_convert_file_msys_to_cygwin () { $debug_cmd - func_to_host_file_result="$1" + 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" } @@ -995,12 +995,12 @@ func_convert_file_nix_to_cygwin () { $debug_cmd - func_to_host_file_result="$1" + 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" } @@ -1038,7 +1038,7 @@ func_init_to_host_path_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 } @@ -1060,7 +1060,7 @@ func_to_host_path () # 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 @@ -1073,7 +1073,7 @@ func_convert_path_msys_to_w32 () { $debug_cmd - func_to_host_path_result="$1" + 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 ';.'; @@ -1081,7 +1081,7 @@ 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_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" @@ -1097,7 +1097,7 @@ func_convert_path_cygwin_to_w32 () { $debug_cmd - func_to_host_path_result="$1" + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -1118,13 +1118,13 @@ func_convert_path_nix_to_w32 () { $debug_cmd - func_to_host_path_result="$1" + 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" @@ -1140,14 +1140,14 @@ func_convert_path_msys_to_cygwin () { $debug_cmd - func_to_host_path_result="$1" + 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" @@ -1164,7 +1164,7 @@ func_convert_path_nix_to_cygwin () { $debug_cmd - func_to_host_path_result="$1" + 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 @@ -1173,7 +1173,7 @@ func_convert_path_nix_to_cygwin () 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" @@ -1189,7 +1189,7 @@ func_mode_compile () # 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 @@ -1202,12 +1202,12 @@ func_mode_compile () 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 ;; @@ -1246,12 +1246,12 @@ func_mode_compile () 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 @@ -1264,8 +1264,8 @@ func_mode_compile () # 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 ;; @@ -1286,7 +1286,7 @@ func_mode_compile () # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj="$func_basename_result" + libobj=$func_basename_result } ;; esac @@ -1344,8 +1344,8 @@ func_mode_compile () && $ECHO "X$libobj" | $GREP '[@:>@~#^*{};<>?"'"'"' &()|`$@<:@]' \ && func_warning "libobj name \`$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" + objname=$func_basename_result + xdir=$func_dirname_result lobj=${xdir}$objdir/$objname test -z "$base_compile" && \ @@ -1373,7 +1373,7 @@ func_mode_compile () # not support -o with -c if test "$compiler_c_o" = no; then output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" + lockfile=$output_obj.lock else output_obj= need_locks=no @@ -1756,7 +1756,7 @@ func_mode_execute () $debug_cmd # The first argument is the command name. - cmd="$nonopt" + cmd=$nonopt test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" @@ -1789,7 +1789,7 @@ func_mode_execute () fi func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" @@ -1803,7 +1803,7 @@ func_mode_execute () *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result ;; *) @@ -1814,7 +1814,7 @@ func_mode_execute () # 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 @@ -1826,7 +1826,7 @@ func_mode_execute () # 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= @@ -1839,12 +1839,12 @@ func_mode_execute () 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 @@ -1869,7 +1869,7 @@ func_mode_execute () done # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" + exec_cmd=\$cmd$args else # Display what would be done. if test -n "$shlibpath_var"; then @@ -2120,12 +2120,12 @@ func_mode_install () # Check to see that the destination is a directory. test -d "$dest" && isdir=yes if test "$isdir" = yes; then - destdir="$dest" + 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 @@ -2148,7 +2148,7 @@ func_mode_install () # 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= @@ -2190,7 +2190,7 @@ func_mode_install () fi func_dirname "$file" "/" "" - dir="$func_dirname_result" + dir=$func_dirname_result func_append dir "$objdir" if test -n "$relink_command"; then @@ -2221,21 +2221,21 @@ func_mode_install () # 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 ;; @@ -2257,14 +2257,14 @@ func_mode_install () 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. @@ -2276,11 +2276,11 @@ func_mode_install () # 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. @@ -2290,7 +2290,7 @@ func_mode_install () staticdest=$func_lo2o_result ;; *.$objext) - staticdest="$destfile" + staticdest=$destfile destfile= ;; *) @@ -2315,23 +2315,23 @@ func_mode_install () *) # 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 @@ -2368,7 +2368,7 @@ func_mode_install () 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 @@ -2384,8 +2384,8 @@ func_mode_install () if test "$finalize" = yes; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" + file=$func_basename_result + outputname=$tmpdir/$file # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` @@ -2399,7 +2399,7 @@ func_mode_install () $opt_dry_run || ${RM}r "$tmpdir" continue fi - file="$outputname" + file=$outputname else func_warning "cannot relink \`$file'" fi @@ -2438,10 +2438,10 @@ func_mode_install () 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 @@ -2477,15 +2477,15 @@ func_generate_dlsyms () { $debug_cmd - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-no} my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" + my_dlsyms=${my_outputname}S.c else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -2496,7 +2496,7 @@ func_generate_dlsyms () "") ;; *.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" @@ -2559,7 +2559,7 @@ extern \"C\" { # 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"' @@ -2588,20 +2588,20 @@ extern \"C\" { for dlprefile in $dlprefiles; do 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 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" @@ -2741,7 +2741,7 @@ static const void *lt_preloaded_setup() { func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -2784,7 +2784,7 @@ func_win32_libid () { $debug_cmd - win32_libid_type="unknown" + win32_libid_type=unknown win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -2951,7 +2951,7 @@ func_cygming_dll_for_implib_fallback () 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 } @@ -2961,8 +2961,8 @@ func_extract_an_archive () { $debug_cmd - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 if test "$lock_old_archive_extraction" = yes; then lockfile=$f_ex_an_ar_oldlib.lock until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do @@ -2988,21 +2988,21 @@ func_extract_archives () { $debug_cmd - my_gentop="$1"; shift + 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 @@ -3014,7 +3014,7 @@ func_extract_archives () 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" @@ -3064,7 +3064,7 @@ func_extract_archives () 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 } @@ -4414,7 +4414,7 @@ func_mode_link () 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. @@ -4463,7 +4463,7 @@ func_mode_link () # 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 @@ -4480,7 +4480,7 @@ func_mode_link () case $prev in bindir) - bindir="$arg" + bindir=$arg prev= continue ;; @@ -4525,14 +4525,14 @@ func_mode_link () esac ;; expsyms) - export_symbols="$arg" + export_symbols=$arg test -f "$arg" \ || func_fatal_error "symbol file \`$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex="$arg" + export_symbols_regex=$arg prev= continue ;; @@ -4550,7 +4550,7 @@ func_mode_link () continue ;; inst_prefix) - inst_prefix_dir="$arg" + inst_prefix_dir=$arg prev= continue ;; @@ -4581,11 +4581,11 @@ func_mode_link () # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result if test "$pic_object" != none; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then @@ -4607,23 +4607,23 @@ func_mode_link () # 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 # 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" + 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 @@ -4631,7 +4631,7 @@ func_mode_link () 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 @@ -4651,12 +4651,12 @@ func_mode_link () continue ;; precious_regex) - precious_files_regex="$arg" + precious_files_regex=$arg prev= continue ;; release) - release="-$arg" + release=-$arg prev= continue ;; @@ -4683,7 +4683,7 @@ func_mode_link () continue ;; shrext) - shrext_cmds="$arg" + shrext_cmds=$arg prev= continue ;; @@ -4723,7 +4723,7 @@ func_mode_link () esac fi # test -n "$prev" - prevarg="$arg" + prevarg=$arg case $arg in -all-static) @@ -4817,7 +4817,7 @@ func_mode_link () absdir=`cd "$dir" && pwd` test -z "$absdir" && \ func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" + dir=$absdir ;; esac case "$deplibs " in @@ -4921,7 +4921,7 @@ func_mode_link () ;; -multi_module) - single_module="${wl}-multi_module" + single_module=${wl}-multi_module continue ;; @@ -5041,14 +5041,14 @@ func_mode_link () 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 ;; @@ -5057,15 +5057,15 @@ func_mode_link () 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 ;; @@ -5088,7 +5088,7 @@ func_mode_link () # -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: @@ -5108,7 +5108,7 @@ func_mode_link () -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" @@ -5118,7 +5118,7 @@ func_mode_link () # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -5146,11 +5146,11 @@ func_mode_link () # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result if test "$pic_object" != none; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then @@ -5172,23 +5172,23 @@ func_mode_link () # 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 # 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" + 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 @@ -5196,7 +5196,7 @@ func_mode_link () 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 @@ -5239,7 +5239,7 @@ func_mode_link () # 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 @@ -5262,8 +5262,8 @@ func_mode_link () 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 @@ -5275,7 +5275,7 @@ func_mode_link () eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" 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. @@ -5365,18 +5365,18 @@ func_mode_link () 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" + libs=$deplibs deplibs= fi if test "$linkmode" = prog; then case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi @@ -5401,11 +5401,11 @@ func_mode_link () esac done done - libs="$dlprefiles" + libs=$dlprefiles fi if test "$pass" = dlopen; then # Collect dlpreopened libraries - save_deplibs="$deplibs" + save_deplibs=$deplibs deplibs= fi @@ -5444,7 +5444,7 @@ func_mode_link () 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 @@ -5476,12 +5476,12 @@ func_mode_link () 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 func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result lib=$ladir/$old_library if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" @@ -5650,7 +5650,7 @@ func_mode_link () || func_fatal_error "\`$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result dlname= dlopen= @@ -5722,7 +5722,7 @@ func_mode_link () linklib=$old_library else for l in $old_library $library_names; do - linklib="$l" + linklib=$l done fi if test -z "$linklib"; then @@ -5750,40 +5750,40 @@ func_mode_link () # 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 "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 ! -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" + 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 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 @@ -5958,10 +5958,10 @@ func_mode_link () # 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 @@ -6003,30 +6003,30 @@ func_mode_link () # 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*) 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 @@ -6055,12 +6055,12 @@ func_mode_link () case $hardcode_action in immediate | unsupported) if test "$hardcode_direct" = no; then - add="$dir/$linklib" + add=$dir/$linklib case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-unixware7*) add_dir=-L$dir ;; *-*-darwin* ) # if the lib is a (non-dlopened) module then we cannot # link against it, someone is ignoring the earlier warnings @@ -6073,22 +6073,22 @@ func_mode_link () 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 case $host in - *-*-sunos*) add_shlibpath="$dir" ;; + *-*-sunos*) add_shlibpath=$dir ;; esac - add_dir="-L$dir" - add="-l$name" + add_dir=-L$dir + add=-l$name elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6096,9 +6096,9 @@ func_mode_link () relink) if test "$hardcode_direct" = yes && test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" + add=$dir/$linklib elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + 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 @@ -6107,10 +6107,10 @@ func_mode_link () ;; esac fi - add="-l$name" + add=-l$name elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6152,26 +6152,26 @@ func_mode_link () # Finalize command for both is simple: just hardcode it. if test "$hardcode_direct" = yes && test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" + add=$libdir/$linklib elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" + add_dir=-L$libdir + add=-l$name elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add="-l$name" + add=-l$name elif test "$hardcode_automatic" = yes; then if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" + 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 @@ -6180,7 +6180,7 @@ func_mode_link () ;; esac fi - add="-l$name" + add=-l$name fi if test "$linkmode" = prog; then @@ -6196,7 +6196,7 @@ func_mode_link () # 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" + test -n "$old_library" && linklib=$old_library compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else @@ -6258,7 +6258,7 @@ func_mode_link () *) func_append temp_deplibs " $libdir";; esac done - dependency_libs="$temp_deplibs" + dependency_libs=$temp_deplibs fi func_append newlib_search_path " $absdir" @@ -6287,7 +6287,7 @@ func_mode_link () 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 @@ -6295,12 +6295,12 @@ func_mode_link () 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" + absdir=$dir fi ;; esac @@ -6314,7 +6314,7 @@ func_mode_link () depdepl=$tmp done if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" + 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}}'` @@ -6326,7 +6326,7 @@ func_mode_link () fi ;; *) - path="-L$absdir/$objdir" + path=-L$absdir/$objdir ;; esac else @@ -6336,7 +6336,7 @@ func_mode_link () test "$absdir" != "$libdir" && \ func_warning "\`$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi ;; esac @@ -6356,7 +6356,7 @@ func_mode_link () compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi - dependency_libs="$newdependency_libs" + dependency_libs=$newdependency_libs if test "$pass" = dlpreopen; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do @@ -6377,7 +6377,7 @@ func_mode_link () fi if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" + vars=deplibs else vars="compile_deplibs finalize_deplibs" fi @@ -6443,7 +6443,7 @@ func_mode_link () for i in $dependency_libs ; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i="" + i= ;; esac if test -n "$i" ; then @@ -6453,10 +6453,10 @@ func_mode_link () dependency_libs=$tmp_libs done # for pass if test "$linkmode" = prog; then - dlfiles="$newdlfiles" + dlfiles=$newdlfiles fi if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles fi case $linkmode in @@ -6487,7 +6487,7 @@ func_mode_link () # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs="$output" + oldlibs=$output func_append objs "$old_deplibs" ;; @@ -6536,7 +6536,7 @@ func_mode_link () test "$#" -gt 1 && \ func_warning "ignoring multiple \`-rpath's for a libtool library" - install_libdir="$1" + install_libdir=$1 oldlibs= if test -z "$rpath"; then @@ -6558,10 +6558,10 @@ func_mode_link () 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'" @@ -6572,9 +6572,9 @@ func_mode_link () 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 @@ -6587,27 +6587,27 @@ func_mode_link () darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_revision" + age=$number_minor + revision=$number_revision ;; freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" + 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 @@ -6653,7 +6653,7 @@ func_mode_link () # 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 @@ -6662,13 +6662,13 @@ func_mode_link () ;; freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; + major=.$current + versuffix=.$current.$revision ;; freebsd-elf) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current ;; irix | nonstopux) @@ -6683,7 +6683,7 @@ func_mode_link () 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 @@ -6692,25 +6692,25 @@ func_mode_link () 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 `.'. 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 @@ -6719,7 +6719,7 @@ func_mode_link () 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. @@ -6727,13 +6727,13 @@ func_mode_link () ;; qnx) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current ;; sunos) - major=".$current" - versuffix=".$current.$revision" + major=.$current + versuffix=.$current.$revision ;; windows) @@ -6741,7 +6741,7 @@ func_mode_link () # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) @@ -6759,13 +6759,13 @@ func_mode_link () verstring= ;; *) - verstring="0.0" + verstring=0.0 ;; esac if test "$need_version" = no; then versuffix= else - versuffix=".0.0" + versuffix=.0.0 fi fi @@ -6773,7 +6773,7 @@ func_mode_link () if test "$avoid_version" = yes && test "$need_version" = no; then major= versuffix= - verstring="" + verstring= fi # Check to see if the archive will have undefined symbols. @@ -6785,7 +6785,7 @@ func_mode_link () fi else # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + allow_undefined_flag=$no_undefined_flag fi fi @@ -6851,7 +6851,7 @@ func_mode_link () 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 @@ -6861,7 +6861,7 @@ func_mode_link () done # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" + old_dlprefiles=$dlprefiles dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -6910,9 +6910,9 @@ func_mode_link () # 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 @@ -6945,7 +6945,7 @@ EOF case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi @@ -6988,7 +6988,7 @@ EOF case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi @@ -7038,7 +7038,7 @@ EOF case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi @@ -7069,11 +7069,11 @@ EOF # 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/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; esac done @@ -7081,7 +7081,7 @@ EOF $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done @@ -7122,7 +7122,7 @@ EOF case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi @@ -7131,11 +7131,11 @@ EOF 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 @@ -7165,7 +7165,7 @@ EOF 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 @@ -7215,7 +7215,7 @@ EOF echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7233,7 +7233,7 @@ EOF 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" + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7279,7 +7279,7 @@ EOF *) 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= @@ -7297,15 +7297,15 @@ EOF # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + rpath=$finalize_rpath + test "$opt_mode" != relink && rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then func_replace_sysroot "$libdir" libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -7330,7 +7330,7 @@ EOF # 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 @@ -7344,8 +7344,8 @@ EOF test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + shlibpath=$finalize_shlibpath + test "$opt_mode" != relink && shlibpath=$compile_shlibpath$shlibpath if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -7355,19 +7355,19 @@ EOF 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 @@ -7381,7 +7381,7 @@ EOF 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 @@ -7397,7 +7397,7 @@ EOF # 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 @@ -7409,12 +7409,12 @@ EOF 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" + 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 @@ -7462,7 +7462,7 @@ EOF break fi done - IFS="$save_ifs" + IFS=$save_ifs if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' @@ -7471,8 +7471,8 @@ EOF 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 @@ -7499,7 +7499,7 @@ EOF ;; esac done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && @@ -7514,7 +7514,7 @@ EOF 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 @@ -7675,7 +7675,7 @@ EOF if ${skipped_export-false}; then func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -7690,9 +7690,9 @@ EOF 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" + IFS=$save_ifs $opt_silent || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" @@ -7710,7 +7710,7 @@ EOF 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"' @@ -7720,8 +7720,8 @@ EOF if ${skipped_export-false}; then if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi @@ -7774,7 +7774,7 @@ EOF # 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 @@ -7782,9 +7782,9 @@ EOF test "X$libobjs" = "X " && libobjs= fi - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" + IFS=$save_ifs eval cmd=\"$cmd\" $opt_silent || { func_quote_for_expand "$cmd" @@ -7803,7 +7803,7 @@ EOF exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs # Restore the uninstalled library and exit if test "$opt_mode" = relink; then @@ -7828,7 +7828,7 @@ EOF # If -module or -export-dynamic was specified, set the dlname. if test "$module" = yes || test "$export_dynamic" = yes; then # On all known operating systems, these are identical. - dlname="$soname" + dlname=$soname fi fi ;; @@ -7866,7 +7866,7 @@ EOF ;; *) libobj= - obj="$output" + obj=$output ;; esac @@ -7889,7 +7889,7 @@ EOF eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` else - gentop="$output_objdir/${obj}x" + gentop=$output_objdir/${obj}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -7898,12 +7898,12 @@ EOF fi # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + test "$build_libtool_libs" != yes && libobjs=$non_pic_objects # Create the old-style object. reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - output="$obj" + output=$obj func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -7930,7 +7930,7 @@ EOF if test -n "$pic_flag" || test "$pic_mode" != default; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output="$libobj" + output=$libobj func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -8010,7 +8010,7 @@ EOF *) func_append new_libs " $deplib" ;; esac done - compile_deplibs="$new_libs" + compile_deplibs=$new_libs func_append compile_command " $compile_deplibs" @@ -8034,7 +8034,7 @@ EOF 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 @@ -8074,10 +8074,10 @@ EOF # 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= @@ -8085,7 +8085,7 @@ EOF 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 @@ -8110,10 +8110,10 @@ EOF # 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 # Transform all the library objects into standard objects. @@ -8148,7 +8148,7 @@ EOF if test "$wrappers_required" = no; then # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" + link_command=$compile_command$compile_rpath # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -8198,7 +8198,7 @@ EOF if test "$no_install" = yes; then # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" + link_command=$compile_var$compile_command$compile_rpath # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -8217,14 +8217,14 @@ EOF 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" + 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" + 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 @@ -8232,8 +8232,8 @@ EOF relink_command= fi else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath fi fi @@ -8292,8 +8292,8 @@ EOF 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 @@ -8339,11 +8339,11 @@ EOF if test "$build_libtool_libs" = convenience; then oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" + addlibs=$convenience build_libtool_libs=no else if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" + oldobjs=$libobjs_save build_libtool_libs=no else oldobjs="$old_deplibs $non_pic_objects" @@ -8351,11 +8351,11 @@ EOF func_append oldobjs " $symfileobj" fi fi - addlibs="$old_convenience" + addlibs=$old_convenience fi if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -8369,7 +8369,7 @@ EOF # 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 @@ -8390,7 +8390,7 @@ EOF : 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 @@ -8399,7 +8399,7 @@ EOF for obj in $save_oldobjs do func_basename "$obj" - objbase="$func_basename_result" + objbase=$func_basename_result case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -8496,7 +8496,7 @@ EOF case $output in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" + test "$build_old_libs" = yes && old_library=$libname.$libext func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -8524,14 +8524,14 @@ EOF 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` test -z "$libdir" && \ @@ -8551,14 +8551,14 @@ EOF *) 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" + 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" @@ -8567,7 +8567,7 @@ EOF *) func_append newdlfiles " $lib" ;; esac done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -8577,7 +8577,7 @@ EOF # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name="$func_basename_result" + 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" @@ -8585,26 +8585,26 @@ EOF ;; 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 @@ -8696,14 +8696,14 @@ func_mode_uninstall () { $debug_cmd - RM="$nonopt" + RM=$nonopt files= rmforce= exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic for arg do @@ -8721,15 +8721,15 @@ func_mode_uninstall () for file in $files; do func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test "X$dir" = X.; then - odir="$objdir" + 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 "$opt_mode" = uninstall && odir=$dir # Remember odir for removal later, being careful to avoid duplicates if test "$opt_mode" = clean; then @@ -8751,7 +8751,7 @@ func_mode_uninstall () continue fi - rmfiles="$file" + rmfiles=$file case $name in *.la) @@ -8866,7 +8866,7 @@ func_mode_uninstall () func_mode_uninstall ${1+"$@"} test -z "$opt_mode" && { - help="$generic_help" + help=$generic_help func_fatal_help "you must specify a MODE" } diff --git a/build-aux/options-parser b/build-aux/options-parser index 7a3cf6df..4777d767 100644 --- a/build-aux/options-parser +++ b/build-aux/options-parser @@ -131,7 +131,7 @@ usage_message="\ " # Additional text appended to `usage_message' in response to `--help'. -long_help_message="" +long_help_message= # Help message printed before fatal option parsing errors. fatal_help='Try \`$progname --help'\'' for more information.' @@ -164,7 +164,7 @@ EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. # 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 bootstrap -debug_cmd="${debug_cmd-:}" +debug_cmd=${debug_cmd-":"} exit_cmd=: dirname="$SED -e "'s|/[^/]*$||' @@ -178,7 +178,7 @@ nl=' # 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" +progpath=$0 # The name of this program. progname=`echo "$progpath" |$basename` @@ -272,7 +272,7 @@ func_run_hooks () *) func_fatal_error "\`$1' does not support hook funcions.n" ;; esac - eval _G_hook_fns="\$$1_hooks"; shift + eval _G_hook_fns=\$$1_hooks; shift for _G_hook in $_G_hook_fns; do eval $_G_hook '"$@"' @@ -303,7 +303,7 @@ func_run_hooks () # $debug_cmd # # # Extend the existing usage message. -# usage_message="$usage_message"' +# usage_message=$usage_message' # -s, --silent don'\''t print informational messages # ' # @@ -376,7 +376,7 @@ 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_result=$func_run_hooks_result } @@ -638,7 +638,7 @@ func_quote_for_eval () *[\\\`\"\$]*) _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$_G_sed_quote_subst"` ;; *) - _G_unquoted_arg="$1" ;; + _G_unquoted_arg=$1 ;; esac case $_G_unquoted_arg in @@ -648,10 +648,10 @@ func_quote_for_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\" ;; *) - _G_quoted_arg="$_G_unquoted_arg" ;; + _G_quoted_arg=$_G_unquoted_arg ;; esac test -n "$func_quote_for_eval_result" \ && func_append func_quote_for_eval_result " " @@ -675,7 +675,7 @@ then func_split_equals_lhs=${1%%=*} func_split_equals_rhs=${1#*=} test "x$func_split_equals_lhs" = "x$1" \ - && func_split_equals_rhs="" + && func_split_equals_rhs= }' else # ...otherwise fall back to using expr, which is often a shell builtin. @@ -684,7 +684,7 @@ else $debug_cmd func_split_equals_lhs=`expr "x$1" : 'x\([^=]*)'` - func_split_equals_rhs="" + func_split_equals_rhs= test "x$func_split_equals_lhs" = "x$1" \ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` } @@ -60,6 +60,26 @@ sc_trailing_blank-non-rfc3676: halt='found trailing blank(s)' \ $(_sc_search_regexp) +# Avoid useless quotes around assignments with no shell metacharacters. +# Backtick and dollar expansions are not resplit on the RHS of an +# assignment, so those metachars are not listed in the prohibit regex, +# although @ is listed, since it most likely indicates that something +# will be spliced in before the shell executes, and it may need to be +# quoted if it contains any metacharacters after splicing. +define _sc_search_regexp_or_exclude + files=$$($(VC_LIST_EXCEPT)); \ + if test -n "$$files"; then \ + grep -nE "$$prohibit" $$files | grep -v '## exclude from $@' \ + && { msg="$$halt" $(_sc_say_and_exit) } || :; \ + else :; \ + fi || :; +endef + +sc_useless_quotes_in_assignment: + @prohibit='^[ ]*[A-Za-z_][A-Za-z0-9_]*="[^ !#&()*;<>?@~^{|}]*"$$' \ + halt='found spurious quotes around assignment value' \ + $(_sc_search_regexp_or_exclude) + # Avoid useless quotes around case arguments such as: # case "$foo" in ... exclude_file_name_regexp--sc_useless_quotes_in_case = ^cfg.mk$$ diff --git a/configure.ac b/configure.ac index 5c07723f..39d06f47 100644 --- a/configure.ac +++ b/configure.ac @@ -94,7 +94,7 @@ AM_SILENT_RULES([yes]) # You can set autobuild_mode at configure time to specify a "unique" # string for this build. : ${autobuild_mode=default} -AB_VERSION="AC_PACKAGE_VERSION" +AB_VERSION='AC_PACKAGE_VERSION' AB_INIT([$autobuild_mode]) diff --git a/doc/libtool.texi b/doc/libtool.texi index cdb0cd74..5e3053f1 100644 --- a/doc/libtool.texi +++ b/doc/libtool.texi @@ -4757,15 +4757,15 @@ LTDL_INIT # The lt_dladvise_init symbol was added with libtool-2.2 if test "x$with_included_ltdl" != "xyes"; then - save_CFLAGS="$CFLAGS" - save_LDFLAGS="$LDFLAGS" + save_CFLAGS=$CFLAGS + save_LDFLAGS=$LDFLAGS CFLAGS="$CFLAGS $LTDLINCL" LDFLAGS="$LDFLAGS $LIBLTDL" AC_CHECK_LIB([ltdl], [lt_dladvise_init], [], [AC_MSG_ERROR([installed libltdl is too old])]) - LDFLAGS="$save_LDFLAGS" - CFLAGS="$save_CFLAGS" + LDFLAGS=$save_LDFLAGS + CFLAGS=$save_CFLAGS fi @end example diff --git a/libtoolize.m4sh b/libtoolize.m4sh index be449732..1a50fca7 100644 --- a/libtoolize.m4sh +++ b/libtoolize.m4sh @@ -164,7 +164,7 @@ func_whisper () } # func_whisper_once msg_var -# Call func_whisper with the value of MSG_VAR, and then set MSG_VAR="" so +# Call func_whisper with the value of MSG_VAR, and then set MSG_VAR='' so # that subsequent calls will have no effect. func_whisper_once () { @@ -175,7 +175,7 @@ func_whisper_once () if test -n "$my_msg"; then func_whisper "$my_msg" - eval $1="" + eval $1= fi fi } @@ -321,7 +321,7 @@ func_included_files () { $debug_cmd - my_searchfile="$1" + my_searchfile=$1 my_include_regex= my_sed_include=' @@ -350,8 +350,8 @@ func_serial () { $debug_cmd - my_filename="$1" - my_macro_regex="$2" + my_filename=$1 + my_macro_regex=$2 my_sed_serial=' /^# serial [1-9][0-9.]*[ ]*'"$my_macro_regex"'[ ]*$/ { s,^# serial \([1-9][0-9.]*\).*$,\1, @@ -390,8 +390,8 @@ func_serial_max () { $debug_cmd - my_serial1="$1" - my_serial2="$2" + my_serial1=$1 + my_serial2=$2 my_sed_dot='s/\..*$//g' my_sed_rest='s/^[0-9][1-9]*\.*//' @@ -413,16 +413,16 @@ func_serial_max () && break test -z "$my_serial1_part" \ - && { func_serial_max_result="$2"; break; } + && { func_serial_max_result=$2; break; } test -z "$my_serial2_part" \ - && { func_serial_max_result="$1"; break; } + && { func_serial_max_result=$1; break; } test "$my_serial1_part" -gt "$my_serial2_part" \ - && { func_serial_max_result="$1"; break; } + && { func_serial_max_result=$1; break; } test "$my_serial2_part" -gt "$my_serial1_part" \ - && { func_serial_max_result="$2"; break; } + && { func_serial_max_result=$2; break; } my_serial1=`$ECHO "$my_serial1" | $SED "$my_sed_rest"` my_serial2=`$ECHO "$my_serial2" | $SED "$my_sed_rest"` @@ -440,10 +440,10 @@ func_serial_update_check () $require_ac_ltdl_dir $require_ac_macro_dir - my_srcfile="$1" - my_src_serial="$2" - my_destfile="$3" - my_dest_serial="$4" + my_srcfile=$1 + my_src_serial=$2 + my_destfile=$3 + my_dest_serial=$4 my_update_p=: if test -f "$my_destfile"; then @@ -467,7 +467,7 @@ func_serial_update_check () fi fi - func_serial_update_check_result="$my_update_p" + func_serial_update_check_result=$my_update_p } @@ -480,8 +480,8 @@ func_aclocal_update_check () my_filename=$1 - my_srcfile="$aclocaldir/$1" - my_destfile="aclocal.m4" + my_srcfile=$aclocaldir/$1 + my_destfile=aclocal.m4 case $my_filename in libtool.m4) @@ -508,7 +508,7 @@ func_aclocal_update_check () func_serial_update_check \ "$my_srcfile" "$my_src_serial" "$my_destfile" "$my_dest_serial" - func_aclocal_update_check_result="$func_serial_update_check_result" + func_aclocal_update_check_result=$func_serial_update_check_result } @@ -521,17 +521,17 @@ func_serial_update () { $debug_cmd - my_filename="$1" - my_srcdir="$2" - my_destdir="$3" - my_msg_var="$4" - my_macro_regex="$5" - my_old_macro_regex="$6" + my_filename=$1 + my_srcdir=$2 + my_destdir=$3 + my_msg_var=$4 + my_macro_regex=$5 + my_old_macro_regex=$6 my_serial_update_p=: my_return_status=1 - my_srcfile="$my_srcdir/$my_filename" - my_destfile="$my_destdir/$my_filename" + my_srcfile=$my_srcdir/$my_filename + my_destfile=$my_destdir/$my_filename test -f "$my_srcfile" || func_fatal_error "\`$my_srcfile' does not exist." @@ -549,7 +549,7 @@ func_serial_update () func_serial_update_check \ "$my_srcfile" "$my_src_serial" "$my_destfile" "$my_dest_serial" - my_serial_update_p="$func_serial_update_check_result" + my_serial_update_p=$func_serial_update_check_result fi if $my_serial_update_p || $opt_force; then @@ -597,14 +597,14 @@ func_keyword_update () { $debug_cmd - my_filename="$1" - my_srcdir="$2" - my_destdir="$3" - my_sed_script="$4" - my_msg_var="$5" + my_filename=$1 + my_srcdir=$2 + my_destdir=$3 + my_sed_script=$4 + my_msg_var=$5 - my_srcfile="$my_srcdir/$my_filename" - my_destfile="$my_destdir/$my_filename" + my_srcfile=$my_srcdir/$my_filename + my_destfile=$my_destdir/$my_filename my_keyword_update_p=: @@ -622,7 +622,7 @@ func_keyword_update () func_serial_update_check \ "$my_srcfile" "$my_src_serial" "$my_destfile" "$my_dest_serial" - my_keyword_update_p="$func_serial_update_check_result" + my_keyword_update_p=$func_serial_update_check_result fi if $my_keyword_update_p || $opt_force; then @@ -938,7 +938,7 @@ func_nonemptydir_p () { $debug_cmd - my_dirvar="$1" + my_dirvar=$1 my_dir=`eval echo "\\\$$my_dirvar"` # Is it a directory at all? @@ -1007,7 +1007,7 @@ func_check_macros () # Suggest using LTDL_INIT if appropriate: $opt_ltdl && if test x$seen_ltdl != x:; then case $ltdl_mode in - subproject) ltdl_init_args="" ;; + subproject) ltdl_init_args= ;; *) ltdl_init_args="([$ltdl_mode])" ;; esac func_echo "Remember to add \`LTDL_INIT$ltdl_init_args' to $configure_ac." @@ -1510,7 +1510,7 @@ func_require_aux_dir () $require_ltdl_dir $require_ltdl_mode - test subproject = "$ltdl_mode" && aux_dir="$ltdl_dir" + test subproject = "$ltdl_mode" && aux_dir=$ltdl_dir } } @@ -1672,7 +1672,7 @@ func_require_macro_dir () $require_ltdl_dir $require_ltdl_mode - test subproject = "$ltdl_mode" && macro_dir="$ltdl_dir/m4" + test subproject = "$ltdl_mode" && macro_dir=$ltdl_dir/m4 } # Use ./m4 as the last resort. @@ -1753,17 +1753,17 @@ func_require_seen_libtool () pkgmacro_files="@pkgmacro_files@" # Locations for important files: - prefix=@prefix@ - datadir=@datadir@ - pkgauxdir=@pkgauxdir@ - pkgltdldir=@pkgdatadir@ - aclocaldir=@aclocaldir@ + prefix="@prefix@" + datadir="@datadir@" + pkgauxdir="@pkgauxdir@" + pkgltdldir="@pkgdatadir@" + aclocaldir="@aclocaldir@" # Allow the user to override the master libtoolize repository: if test -n "$_lt_pkgdatadir"; then - pkgauxdir="$_lt_pkgdatadir/build-aux" - pkgltdldir="$_lt_pkgdatadir/libltdl" - aclocaldir="$_lt_pkgdatadir/m4" + pkgauxdir=$_lt_pkgdatadir/build-aux + pkgltdldir=$_lt_pkgdatadir/libltdl + aclocaldir=$_lt_pkgdatadir/m4 fi func_nonemptydir_p pkgauxdir func_nonemptydir_p pkgltdldir diff --git a/m4/libtool.m4 b/m4/libtool.m4 index ec00e816..eb2964c3 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -91,7 +91,7 @@ dnl Parse OPTIONS _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -213,10 +213,10 @@ can_build_shared=yes # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -276,7 +276,7 @@ no_glob_subst='s/\*/\\\*/g' m4_defun([_LT_PROG_LTMAIN], [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh ])# _LT_PROG_LTMAIN @@ -446,7 +446,7 @@ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], # Output comment and list of tags supported by the script m4_defun([_LT_LIBTOOL_TAGS], [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl +available_tags='_LT_TAGS'dnl ]) @@ -711,7 +711,7 @@ _LT_CONFIG_SAVE_COMMANDS([ setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" @@ -1009,7 +1009,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [lt_cv_ld_exported_symbols_list=yes], [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], @@ -1094,7 +1094,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined case $cc_basename in ifort*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; @@ -1146,7 +1146,7 @@ else _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi],[]) if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib fi ]) aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) @@ -1269,10 +1269,10 @@ ia64-*-hpux*) if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi @@ -1362,7 +1362,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) @@ -1370,7 +1370,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) AC_LANG_POP]) if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) @@ -1391,7 +1391,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -1407,7 +1407,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -1505,7 +1505,7 @@ AC_CACHE_CHECK([$1], [$2], [$2=no m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -1554,7 +1554,7 @@ AC_DEFUN([_LT_LINKER_OPTION], m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $3" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -1573,7 +1573,7 @@ AC_CACHE_CHECK([$1], [$2], fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) if test x"[$]$2" = xyes; then @@ -1597,7 +1597,7 @@ AC_DEFUN([LT_CMD_MAX_LEN], AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -1852,26 +1852,26 @@ else case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) # if libdl is installed we need to link against it AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) @@ -1879,17 +1879,17 @@ else *) AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], + [lt_cv_dlopen=shl_load], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], + [lt_cv_dlopen=dlopen], [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) ]) ]) ]) @@ -1906,13 +1906,13 @@ else case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" + save_CPPFLAGS=$CPPFLAGS test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" AC_CACHE_CHECK([whether a program can dlopen itself], @@ -1932,9 +1932,9 @@ else ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -2026,7 +2026,7 @@ m4_defun([_LT_COMPILER_FILE_LOCKS], m4_require([_LT_FILEUTILS_DEFAULTS])dnl _LT_COMPILER_C_O([$1]) -hard_links="nottested" +hard_links=nottested if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) @@ -2162,12 +2162,12 @@ m4_if([$1], [], [ if test "$GCC" = yes; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s,=\([[A-Za-z]]:\),\1,g' ;; + *) lt_sed_strip_eq='s,=/,/,g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -2195,16 +2195,16 @@ if test "$GCC" = yes; then fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_fooi = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -2227,7 +2227,7 @@ fi]) library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2335,7 +2335,7 @@ bsdi[[45]]*) cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -2408,7 +2408,7 @@ m4_if([$1], [],[ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -2722,7 +2722,7 @@ newsos6) openbsd*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. case $host_os in @@ -2748,7 +2748,7 @@ openbsd*) os2*) libname_spec='$name' - shrext_cmds=".dll" + shrext_cmds=.dll need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -2763,7 +2763,7 @@ osf3* | osf4* | osf5*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -2880,10 +2880,10 @@ if test "$GCC" = yes; then fi if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi _LT_DECL([], [variables_saved_for_relink], [1], @@ -2932,25 +2932,25 @@ AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in [[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -2973,11 +2973,11 @@ _LT_EOF break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then AC_MSG_RESULT($MAGIC_CMD) else @@ -3045,7 +3045,7 @@ if test "$GCC" = yes; then while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -3063,12 +3063,12 @@ else fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. @@ -3082,11 +3082,11 @@ AC_CACHE_VAL(lt_cv_path_LD, esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs else - lt_cv_path_LD="$LD" # Let the user override the test with a path. + lt_cv_path_LD=$LD # Let the user override the test with a path. fi]) -LD="$lt_cv_path_LD" +LD=$lt_cv_path_LD if test -n "$LD"; then AC_MSG_RESULT($LD) else @@ -3400,18 +3400,18 @@ AC_DEFUN([LT_PATH_NM], AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" + tmp_nm=$ac_dir/$lt_tmp_nm if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then # Check to see if the nm accepts a BSD-compat flag. # Adding the `sed 1q' prevents false positives on HP-UX, which says: @@ -3437,12 +3437,12 @@ else esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi]) if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -3460,7 +3460,7 @@ else fi AC_SUBST([DUMPBIN]) if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -3519,7 +3519,7 @@ cygwin* | mingw* | pw32* | cegcc*) ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -3564,11 +3564,11 @@ case $host in # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; *) - AC_CHECK_LIB(m, cos, LIBM="-lm") + AC_CHECK_LIB(m, cos, LIBM=-lm) ;; esac AC_SUBST([LIBM]) @@ -3801,7 +3801,7 @@ _LT_EOF mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then pipe_works=yes @@ -4564,7 +4564,7 @@ m4_if([$1], [CXX], [ fi ;; pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -4680,7 +4680,7 @@ dnl Note also adjust exclude_expsyms for C++ above. _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -4968,7 +4968,7 @@ _LT_EOF # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm @@ -5127,7 +5127,7 @@ _LT_EOF # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -5149,8 +5149,8 @@ _LT_EOF case $lt_outputfile in *.exe|*.EXE) ;; *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe ;; esac~ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then @@ -5165,7 +5165,7 @@ _LT_EOF # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -5312,7 +5312,7 @@ _LT_EOF # This should be the same for all languages, so no per-tag cache variable. AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" + [save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" AC_LINK_IFELSE( [AC_LANG_SOURCE( @@ -5326,7 +5326,7 @@ _LT_EOF end]])])], [lt_cv_irix_exported_symbol=yes], [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) + LDFLAGS=$save_LDFLAGS]) if test "$lt_cv_irix_exported_symbol" = yes; then _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' fi @@ -5731,7 +5731,7 @@ dnl [Compiler flag to generate thread safe objects]) # the compiler configuration to `libtool'. m4_defun([_LT_LANG_C_CONFIG], [m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" +lt_save_CC=$CC AC_LANG_PUSH(C) # Source file extension for C test sources. @@ -5805,7 +5805,7 @@ if test -n "$compiler"; then _LT_CONFIG($1) fi AC_LANG_POP -CC="$lt_save_CC" +CC=$lt_save_CC ])# _LT_LANG_C_CONFIG @@ -5932,7 +5932,7 @@ if test "$_lt_caught_CXX_error" != yes; then # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -5973,7 +5973,7 @@ if test "$_lt_caught_CXX_error" != yes; then # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no @@ -6032,7 +6032,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac shared_flag='-shared' if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + shared_flag=$shared_flag' ${wl}-G' fi else # not using gcc @@ -6126,7 +6126,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -6146,8 +6146,8 @@ if test "$_lt_caught_CXX_error" != yes; then case $lt_outputfile in *.exe|*.EXE) ;; *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe ;; esac~ func_to_tool_file "$lt_outputfile"~ @@ -6253,7 +6253,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -6318,7 +6318,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -6403,7 +6403,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -6486,7 +6486,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld @@ -6581,7 +6581,7 @@ if test "$_lt_caught_CXX_error" != yes; then if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -6642,7 +6642,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then @@ -6851,8 +6851,8 @@ if test "$_lt_caught_CXX_error" != yes; then AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7020,7 +7020,7 @@ if AC_TRY_EVAL(ac_compile); then # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)=${prev}${p} else _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" fi @@ -7030,7 +7030,7 @@ if AC_TRY_EVAL(ac_compile); then esac else if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" + _LT_TAGVAR(postdeps, $1)=${prev}${p} else _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" fi @@ -7049,13 +7049,13 @@ if AC_TRY_EVAL(ac_compile); then if test "$pre_test_object_deps_done" = no; then if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" + _LT_TAGVAR(predep_objects, $1)=$p else _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" fi else if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" + _LT_TAGVAR(postdep_objects, $1)=$p else _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" fi @@ -7221,7 +7221,7 @@ if test "$_lt_disable_F77" != yes; then _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} @@ -7260,8 +7260,8 @@ if test "$_lt_disable_F77" != yes; then test "$enable_shared" = yes || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7278,8 +7278,8 @@ if test "$_lt_disable_F77" != yes; then fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS fi # test "$_lt_disable_F77" != yes AC_LANG_POP @@ -7353,7 +7353,7 @@ if test "$_lt_disable_FC" != yes; then _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} @@ -7394,8 +7394,8 @@ if test "$_lt_disable_FC" != yes; then test "$enable_shared" = yes || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7459,7 +7459,7 @@ CC=${GCJ-"gcj"} CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. @@ -7530,7 +7530,7 @@ CC=${GOC-"gccgo"} CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # Go did not exist at the time GCC didn't implicitly link libc in. @@ -7583,7 +7583,7 @@ _LT_TAGVAR(objext, $1)=$objext lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +lt_simple_link_test_code=$lt_simple_compile_test_code # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -7593,7 +7593,7 @@ _LT_COMPILER_BOILERPLATE _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= @@ -7779,7 +7779,7 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], [AC_MSG_CHECKING([whether the shell understands some XSI constructs]) # Try some XSI features xsi_shell=no -( _lt_dummy="a/b/c" +( _lt_dummy=a/b/c test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ @@ -7845,19 +7845,19 @@ m4_defun([_LT_PROG_REPLACE_SHELLFNS], [if test x"$xsi_shell" = xyes; then _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; + */*) func_dirname_result=${1%/*}${2} ;; + * ) func_dirname_result=${3} ;; esac]) _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) + func_basename_result=${1##*/}]) _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; + */*) func_dirname_result=${1%/*}${2} ;; + * ) func_dirname_result=${3} ;; esac - func_basename_result="${1##*/}"]) + func_basename_result=${1##*/}]) _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are @@ -104,7 +104,7 @@ AC_SUBST([LTDLDEPS]) AC_SUBST([LTDLINCL]) # For backwards non-gettext consistent compatibility... -INCLTDL="$LTDLINCL" +INCLTDL=$LTDLINCL AC_SUBST([INCLTDL]) ])# _LTDL_CONVENIENCE @@ -147,10 +147,10 @@ dnl AC_DEFUN([AC_LIBLTDL_INSTALLABLE], []) # Code shared by LTDL_INSTALLABLE and LTDL_INIT([installable]). m4_defun([_LTDL_INSTALLABLE], [if test -f $prefix/lib/libltdl.la; then - lt_save_LDFLAGS="$LDFLAGS" + lt_save_LDFLAGS=$LDFLAGS LDFLAGS="-L$prefix/lib $LDFLAGS" AC_CHECK_LIB([ltdl], [lt_dlinit], [lt_lib_ltdl=yes]) - LDFLAGS="$lt_save_LDFLAGS" + LDFLAGS=$lt_save_LDFLAGS if test x"${lt_lib_ltdl-no}" = xyes; then if test x"$enable_ltdl_install" != xyes; then # Don't overwrite $prefix/lib/libltdl.la without --enable-ltdl-install @@ -166,7 +166,7 @@ fi # with --disable-ltdl-install, we will install the shipped libltdl. case $enable_ltdl_install in no) ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" + LIBLTDL=-lltdl LTDLDEPS= LTDLINCL= ;; @@ -183,7 +183,7 @@ AC_SUBST([LTDLDEPS]) AC_SUBST([LTDLINCL]) # For backwards non-gettext consistent compatibility... -INCLTDL="$LTDLINCL" +INCLTDL=$LTDLINCL AC_SUBST([INCLTDL]) ])# LTDL_INSTALLABLE @@ -197,8 +197,8 @@ m4_if(_LTDL_DIR, [], dnl if _LTDL_MODE was not set already, the default value is `subproject': [m4_case(m4_default(_LTDL_MODE, [subproject]), [subproject], [AC_CONFIG_SUBDIRS(_LTDL_DIR) - _LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"])], - [nonrecursive], [_LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"; lt_libobj_prefix="$lt_ltdl_dir/"])], + _LT_SHELL_INIT([lt_dlopen_dir=$lt_ltdl_dir])], + [nonrecursive], [_LT_SHELL_INIT([lt_dlopen_dir=$lt_ltdl_dir; lt_libobj_prefix=$lt_ltdl_dir/])], [recursive], [], [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])])dnl dnl Be careful not to expand twice: @@ -312,10 +312,10 @@ case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in *) with_included_ltdl=no LIBLTDL="-L$with_ltdl_lib -lltdl" LTDLDEPS= - LTDLINCL="-I$with_ltdl_include" + LTDLINCL=-I$with_ltdl_include ;; esac -INCLTDL="$LTDLINCL" +INCLTDL=$LTDLINCL # Report our decision... AC_MSG_CHECKING([where to find libltdl headers]) @@ -579,7 +579,7 @@ dnl AC_DEFUN([AC_LTDL_SHLIBEXT], []) AC_DEFUN([LT_SYS_MODULE_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl AC_CACHE_CHECK([which variable specifies run-time module search path], - [lt_cv_module_path_var], [lt_cv_module_path_var="$shlibpath_var"]) + [lt_cv_module_path_var], [lt_cv_module_path_var=$shlibpath_var]) if test -n "$lt_cv_module_path_var"; then m4_pattern_allow([LT_MODULE_PATH_VAR])dnl AC_DEFINE_UNQUOTED([LT_MODULE_PATH_VAR], ["$lt_cv_module_path_var"], @@ -599,14 +599,14 @@ AC_DEFUN([LT_SYS_DLSEARCH_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl AC_CACHE_CHECK([for the default library search path], [lt_cv_sys_dlsearch_path], - [lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"]) + [lt_cv_sys_dlsearch_path=$sys_lib_dlsearch_path_spec]) if test -n "$lt_cv_sys_dlsearch_path"; then sys_dlsearch_path= for dir in $lt_cv_sys_dlsearch_path; do if test -z "$sys_dlsearch_path"; then - sys_dlsearch_path="$dir" + sys_dlsearch_path=$dir else - sys_dlsearch_path="$sys_dlsearch_path$PATH_SEPARATOR$dir" + sys_dlsearch_path=$sys_dlsearch_path$PATH_SEPARATOR$dir fi done m4_pattern_allow([LT_DLSEARCH_PATH])dnl @@ -654,9 +654,9 @@ AC_SEARCH_LIBS([dlopen], [dl], [AC_DEFINE([HAVE_LIBDL], [1], [Define if you have the libdl library or equivalent.]) if test "$ac_cv_search_dlopen" != "none required" ; then - LIBADD_DLOPEN="-ldl" + LIBADD_DLOPEN=-ldl fi - libltdl_cv_lib_dl_dlopen="yes" + libltdl_cv_lib_dl_dlopen=yes LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"], [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if HAVE_DLFCN_H # include <dlfcn.h> @@ -664,19 +664,19 @@ AC_SEARCH_LIBS([dlopen], [dl], ]], [[dlopen(0, 0);]])], [AC_DEFINE([HAVE_LIBDL], [1], [Define if you have the libdl library or equivalent.]) - libltdl_cv_func_dlopen="yes" + libltdl_cv_func_dlopen=yes LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"], [AC_CHECK_LIB([svld], [dlopen], [AC_DEFINE([HAVE_LIBDL], [1], [Define if you have the libdl library or equivalent.]) - LIBADD_DLOPEN="-lsvld" libltdl_cv_func_dlopen="yes" + LIBADD_DLOPEN=-lsvld libltdl_cv_func_dlopen=yes LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"])])]) if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes then - lt_save_LIBS="$LIBS" + lt_save_LIBS=$LIBS LIBS="$LIBS $LIBADD_DLOPEN" AC_CHECK_FUNCS([dlerror]) - LIBS="$lt_save_LIBS" + LIBS=$lt_save_LIBS fi AC_SUBST([LIBADD_DLOPEN]) @@ -689,7 +689,7 @@ AC_CHECK_FUNC([shl_load], [AC_DEFINE([HAVE_SHL_LOAD], [1], [Define if you have the shl_load function.]) LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la" - LIBADD_SHL_LOAD="-ldld"])]) + LIBADD_SHL_LOAD=-ldld])]) AC_SUBST([LIBADD_SHL_LOAD]) case $host_os in @@ -795,12 +795,12 @@ if test x"$lt_cv_sys_symbol_underscore" = xyes; then AC_CACHE_CHECK([whether we have to add an underscore for dlsym], [libltdl_cv_need_uscore], [libltdl_cv_need_uscore=unknown - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$LIBS $LIBADD_DLOPEN" _LT_TRY_DLOPEN_SELF( [libltdl_cv_need_uscore=no], [libltdl_cv_need_uscore=yes], [], [libltdl_cv_need_uscore=cross]) - LIBS="$save_LIBS" + LIBS=$save_LIBS ]) fi fi diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index 301b0a35..8592c539 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -172,14 +172,14 @@ AC_ARG_ENABLE([shared], *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=${IFS}$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -226,14 +226,14 @@ AC_ARG_ENABLE([static], *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=${IFS}$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -280,14 +280,14 @@ AC_ARG_ENABLE([fast-install], *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=${IFS}$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -334,14 +334,14 @@ m4_define([_LT_WITH_PIC], *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=${IFS}$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [pic_mode=default]) diff --git a/tests/cwrapper.at b/tests/cwrapper.at index 0e5ecb79..cb89a408 100644 --- a/tests/cwrapper.at +++ b/tests/cwrapper.at @@ -83,7 +83,7 @@ done # Test run-time activation of wrapper debugging. # This is not part of the loop above, because we # need to check, not ignore, the output. -CFLAGS="$orig_CFLAGS" +CFLAGS=$orig_CFLAGS LIBTOOL=$orig_LIBTOOL AT_CHECK([$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c liba.c], @@ -178,7 +178,7 @@ done IFS=$save_IFS until $ECHO "PATH=$PATH" | grep 'PATH=.\{250\}'; do - PATH="$PATH$PATH_SEPARATOR$dirpath" + PATH=$PATH$PATH_SEPARATOR$dirpath done export PATH diff --git a/tests/defs.m4sh b/tests/defs.m4sh index c09657f3..4d66ceca 100644 --- a/tests/defs.m4sh +++ b/tests/defs.m4sh @@ -79,14 +79,14 @@ func_get_config () { $debug_cmd - my_varname_list="$1" - my_src="$2" - my_failp="false"; test -z "$3" || my_failp=: - my_regex="$4" + my_varname_list=$1 + my_src=$2 + my_failp=false; test -z "$3" || my_failp=: + my_regex=$4 my_exitp=false if test -z "$my_regex"; then - my_regex="^(" + my_regex='^(' my_build_regex=: else my_build_regex=false @@ -97,7 +97,7 @@ func_get_config () if $my_build_regex; then $my_first || my_regex="$my_regex|" my_first=false - my_regex="$my_regex$my_varname" + my_regex=$my_regex$my_varname fi eval $my_varname=NONE done @@ -151,7 +151,7 @@ func_cd () { $debug_cmd - my_dir="$1" + my_dir=$1 # Maybe we have a VPATH build, in which case, create a new subdir. func_mkdir_p "$my_dir" @@ -167,7 +167,7 @@ func_require () { $debug_cmd - my_prereq="$1"; shift + my_prereq=$1; shift my_files=${1+"$@"} for my_file in $my_files; do @@ -185,13 +185,13 @@ func_configure_nofail () my_args=${1+"$@"} func_dirname_and_basename "`pwd`" my_dir=$func_basename_result - my_testdir="$abs_srcdir/tests/$my_dir" + my_testdir=$abs_srcdir/tests/$my_dir conf_status=$EXIT_FAILURE test -n "$my_args" && my_args=" $my_args" - my_args="--srcdir="\""$my_testdir"\"" --prefix="\""$prefix"\""$my_args" - test -n "$host_alias" && my_args="$my_args --host=\"$host_alias\"" - test -n "$build_alias" && my_args="$my_args --build=\"$build_alias\"" + my_args=--srcdir=\"$my_testdir\"" "--prefix=\"$prefix\"$my_args + test -n "$host_alias" && my_args=$my_args" "--host=\"$host_alias\" + test -n "$build_alias" && my_args=$my_args" "--build=\"$build_alias\" func_msg "Configuring in $my_dir" @@ -225,8 +225,8 @@ func_check_static_shared () { $debug_cmd - my_staticp="$1" - my_sharedp="$2" + my_staticp=$1 + my_sharedp=$2 if func_grep "^build_old_libs=$staticp" libtool && func_grep "^build_libtool_libs=$sharedp" libtool; then : @@ -302,7 +302,7 @@ func_exec_check () { $debug_cmd - my_program="$1" + my_program=$1 if test -f "$my_program"; then : else @@ -319,13 +319,13 @@ func_exec () { $debug_cmd - my_program="$1" - my_exp_output="$2" + my_program=$1 + my_exp_output=$2 func_dirname_and_basename "`pwd`" my_dir=$func_basename_result test -n "$my_exp_output" \ - && my_exp_output="| $EGREP -e "\""$my_exp_output"\" + && my_exp_output="| $EGREP -e "\"$my_exp_output\" if eval $my_program $my_exp_output; then : else diff --git a/tests/lalib-syntax.at b/tests/lalib-syntax.at index 0f78ca8a..2eea98f1 100644 --- a/tests/lalib-syntax.at +++ b/tests/lalib-syntax.at @@ -103,7 +103,7 @@ libdir='/somewhere' AT_DATA([wrong-quotes.la], [[# wrong-quotes.la - a libtool library file # Generated by libtool -dlname="module.so" +dlname=module.so library_names='module.so module.so module.so' old_library='module.a' installed=no diff --git a/tests/libtoolize.at b/tests/libtoolize.at index 70ba9410..e112acf4 100644 --- a/tests/libtoolize.at +++ b/tests/libtoolize.at @@ -696,7 +696,7 @@ LT_AT_ACLOCAL([-I $abs_top_srcdir/m4]) : ${GREP="grep"} : ${SED="sed"} -basename="s,^.*/,," +basename="$SED -e s,^.*/,," # func_grep expression filename # Check whether EXPRESSION matches any line of FILENAME, without output. @@ -710,8 +710,8 @@ func_grep () # comment line must also match MACRO_REGEX, if given. func_serial () { - my_filename="$1" - my_macro_regex="$2" + my_filename=$1 + my_macro_regex=$2 my_sed_serial=' /^# serial [1-9][0-9.]*[ ]*'"$my_macro_regex"'[ ]*$/ { s,^# serial \([1-9][0-9.]*\).*$,\1, @@ -724,7 +724,7 @@ func_serial () my_serial= if test -z "$my_macro_regex" || test "$my_filename" = aclocal.m4 || - test "$my_macro_regex" = `echo "$my_filename" | $SED "$basename"` || + test "$my_macro_regex" = `echo "$my_filename" | $basename` || func_grep '^AC_DEFUN(\@<:@'"$my_macro_regex" "$my_filename" then my_serial=`$SED -e "$my_sed_serial" "$my_filename"` @@ -1003,7 +1003,7 @@ AT_SETUP([LIBTOOLIZE_OPTIONS]) _LT_CONFIGURE_AC -LIBTOOLIZE_OPTIONS="narf" +LIBTOOLIZE_OPTIONS=narf export LIBTOOLIZE_OPTIONS AT_DATA(experr, diff --git a/tests/lt_dlopenext.at b/tests/lt_dlopenext.at index 66311247..16b5b754 100644 --- a/tests/lt_dlopenext.at +++ b/tests/lt_dlopenext.at @@ -219,7 +219,7 @@ eval shared_ext=\"$shrext_cmds\" if test -n "$shared_ext"; then have_lafile="with without" else - have="with" + have=with fi if test "$shlibpath_var" = PATH; then diff --git a/tests/mdemo/configure.ac b/tests/mdemo/configure.ac index 02538430..ed9a152f 100644 --- a/tests/mdemo/configure.ac +++ b/tests/mdemo/configure.ac @@ -54,7 +54,7 @@ AC_SUBST([LIBLTDL]) LT_INIT([dlopen win32-dll]) AC_SUBST(LIBTOOL_DEPS) -STATIC="" +STATIC= test "X$enable_static" = Xyes && STATIC="-static" AC_SUBST([STATIC]) diff --git a/tests/mdemo2/configure.ac b/tests/mdemo2/configure.ac index 2c91e46c..23ad6df3 100644 --- a/tests/mdemo2/configure.ac +++ b/tests/mdemo2/configure.ac @@ -50,7 +50,7 @@ AC_PROG_CC LT_INIT([dlopen]) AC_SUBST(LIBTOOL_DEPS) -STATIC="" +STATIC= test "X$enable_static" = Xyes && STATIC="-static" AC_SUBST([STATIC]) diff --git a/tests/need_lib_prefix.at b/tests/need_lib_prefix.at index ea36da3a..02610f1d 100644 --- a/tests/need_lib_prefix.at +++ b/tests/need_lib_prefix.at @@ -151,7 +151,7 @@ AT_CHECK([case $LIBLTDL in #( esac], [], [ignore]) CPPFLAGS="$LTDLINCL $CPPFLAGS" -LDFLAGS="$LDFLAGS" +LDFLAGS=$LDFLAGS # Skip this test when libraries are not normally prefixed with lib. # E.g., for MSVC and OS/2. diff --git a/tests/no-executables.at b/tests/no-executables.at index bcc9cf24..02168524 100644 --- a/tests/no-executables.at +++ b/tests/no-executables.at @@ -51,7 +51,7 @@ lt_cv_archive_cmds_need_lc=no lt_cv_cc_needs_belf=no lt_cv_ld_exported_symbols_list=no lt_cv_prog_compiler_static_works=no -lt_cv_aix_libpath="/usr/lib:/lib" +lt_cv_aix_libpath=/usr/lib:/lib lt_cv_irix_exported_symbol=yes # Deal with AC_LIBTOOL_DLOPEN in one of two possible ways: diff --git a/tests/quote.test b/tests/quote.test index 1b986d11..8e76c24e 100755 --- a/tests/quote.test +++ b/tests/quote.test @@ -52,23 +52,23 @@ for mode in compile link install; do preargs="$CC -c" preflag= match_preflag= - flag="-DVAR=" - postargs="foo.c" + flag=-DVAR= + postargs=foo.c ;; link) preargs="$CC -o hell -g -O" preflag=-Wl, - match_preflag="$wl" - flag="-someflag=" - postargs="foo.o" + match_preflag=$wl + flag=-someflag= + postargs=foo.o ;; install) preargs="install -c" preflag= match_preflag= - flag="--something=" + flag=--something= postargs="hell /usr/local/bin/hell" ;; esac diff --git a/tests/suffix.test b/tests/suffix.test index b5c2a88c..aa1df675 100755 --- a/tests/suffix.test +++ b/tests/suffix.test @@ -26,7 +26,7 @@ # Extensions taken from the ones that Automake recognizes, plus Objective C, # and GNU Ada. Also test that multiple dots are handled correctly. extensions="C F S ada adb ads asm c c++ cc cpp cxx f f90 F90 f95 F95 f03 F03 for go m s sx ada.ada" -bad_names="foo." +bad_names=foo. . tests/defs || exit 1 |