mirror/libtool
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/libtool.git synced 2026-01-26 15:39:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

syntax-check: fix violations, in m4sh files, of sc_prohibit_test_const_follows_var.

Browse Source 
* build-aux/general.m4sh, build-aux/ltmain.m4sh, libtoolize.m4sh:
Swap operands and remove resulting spurious characters.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
This commit is contained in:
Gary V. Vaughan 2012-09-21 22:47:16 +07:00
parent a89ab9eef6
commit e059dd2b01
3 changed files with 294 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build-aux/general.m4sh
View File

@ -45,7 +45,7 @@ progpath=$0
M4SH_VERBATIM([[
: ${CP="cp -f"}
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
test set = "${ECHO+set}" || ECHO=${as_echo-'printf %s\n'}
: ${EGREP="@EGREP@"}
: ${FGREP="@FGREP@"}
: ${GREP="@GREP@"}
@ -311,7 +311,7 @@ func_normal_abspath ()
-e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
while :; do
# Processed it all yet?
if test "$func_normal_abspath_tpath" = / ; then
if test / = "$func_normal_abspath_tpath" ; then
# If we ascended to the root using ".." the result may be empty now.
if test -z "$func_normal_abspath_result" ; then
func_normal_abspath_result=/
@ -374,7 +374,7 @@ func_relative_path ()
*)
func_dirname $func_relative_path_tlibdir
func_relative_path_tlibdir=$func_dirname_result
if test "x$func_relative_path_tlibdir" = x ; then
if test -z "$func_relative_path_tlibdir" ; then
# Have to descend all the way to the root!
func_relative_path_result=../$func_relative_path_result
func_relative_path_tcancelled=$func_relative_path_tbindir
@ -389,7 +389,7 @@ func_relative_path ()
func_stripname '' '/' "$func_relative_path_result"
func_relative_path_result=$func_stripname_result
func_stripname '/' '/' "$func_relative_path_tcancelled"
if test "x$func_stripname_result" != x ; then
if test -n "$func_stripname_result" ; then
func_append func_relative_path_result "/$func_stripname_result"
fi
@ -545,7 +545,7 @@ func_mkdir_p ()
my_directory_path=$1
my_dir_list=
if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
if test -n "$my_directory_path" && test : != "$opt_dry_run"; then
# Protect directory names starting with `-'
case $my_directory_path in
@ -591,7 +591,7 @@ func_mktempdir ()
{
my_template=${TMPDIR-/tmp}/${1-$progname}
if test "$opt_dry_run" = ":"; then
if test : = "$opt_dry_run"; then
# Return a directory name, but don't create it in dry-run mode
my_tmpdir=$my_template-$$
else
@ -692,7 +692,7 @@ func_show_eval ()
if ${opt_dry_run-false}; then :; else
eval "$my_cmd"
my_status=$?
if test "$my_status" -eq 0; then :; else
if test 0 -eq "$my_status"; then :; else
eval "(exit $my_status); $my_fail_exp"
fi
fi
@ -718,7 +718,7 @@ func_show_eval_locale ()
$my_cmd"
my_status=$?
eval "$lt_safe_locale"
if test "$my_status" -eq 0; then :; else
if test 0 -eq "$my_status"; then :; else
eval "(exit $my_status); $my_fail_exp"
fi
fi

554
build-aux/ltmain.m4sh
View File

File diff suppressed because it is too large Load Diff

18
libtoolize.m4sh
View File

@ -365,7 +365,7 @@ func_serial ()
my_filebase=$func_basename_result
for my_file in `func_included_files "$my_filename"`; do
if test -z "$my_macro_regex" ||
test "$my_filename" = aclocal.m4 ||
test aclocal.m4 = "$my_filename" ||
test "X$my_macro_regex" = "X$my_filebase" ||
func_grep '^AC_DEFUN(\@<:@'"$my_macro_regex" "$my_file"
then
@ -446,7 +446,7 @@ func_serial_update_check ()
my_update_p=:
if test -f "$my_destfile"; then
test "X$my_src_serial" = "X0" && {
test 0 = "$my_src_serial" && {
func_warning "no serial number on \`$my_srcfile', not copying."
return
}
@ -489,9 +489,9 @@ func_aclocal_update_check ()
# Strictly, this libtoolize ought not to have to deal with ancient
# serial formats, but we accept them here to be complete:
test "X$my_src_serial" = "X0" &&
test 0 = "$my_src_serial" &&
my_src_serial=`func_serial "$my_srcfile" 'A[CM]_PROG_LIBTOOL'`
test "X$my_dest_serial" = "X0" &&
test 0 = "$my_dest_serial" &&
my_dest_serial=`func_serial "$my_destfile" 'A[CM]_PROG_LIBTOOL'`
;;
ltdl.m4)
@ -540,10 +540,10 @@ func_serial_update ()
# Strictly, this libtoolize ought not to have to deal with ancient
# serial formats, but we accept them here to be complete:
test "X$my_src_serial" = "X0" &&
test 0 = "$my_src_serial" &&
my_src_serial=`func_serial "$my_srcfile" "$my_old_macro_regex"`
test "X$my_dest_serial" = "X0" &&
test 0 = "$my_dest_serial" &&
my_dest_serial=`func_serial "$my_destfile" "$my_old_macro_regex"`
func_serial_update_check \
@ -1020,7 +1020,7 @@ func_check_macros ()
# For nonrecursive mode, warn about continued use of Makefile.inc:
# FIXME: Remove in 2013
# (along with last minute rename in func_install_pkgltdl_files)
if test "x$ltdl_mode" = "xnonrecursive"; then
if test nonrecursive = "$ltdl_mode"; then
if func_grep "^-\?include $ltdl_dir/Makefile.inc\$" Makefile.am;
then
func_error "Use of \`include $ltdl_dir/Makefile.inc' is deprecated!"
@ -1030,7 +1030,7 @@ func_check_macros ()
fi
# Suggest modern idioms for storing autoconf macros:
$ac_config_macro_dir_advised || if test -z "$ac_macro_dir" || test "x$macro_dir" = x.; then
$ac_config_macro_dir_advised || if test -z "$ac_macro_dir" || test . = "$macro_dir"; then
func_echo "Consider adding \`AC_CONFIG_MACRO_DIR([m4])' to $configure_ac and"
func_echo "rerunning $progname, to keep the correct libtool macros in-tree."
ac_config_macro_dir_advised=:
@ -1085,7 +1085,7 @@ func_autoconf_configure ()
test -n "$_G_ac_init"
_G_status=$?
test "$_G_status" -ne 0 \
test 0 -ne "$_G_status" \
&& func_verbose "\`$1' not using Autoconf"
(exit $_G_status)