mirror of
git://git.savannah.gnu.org/libtool.git
synced 2024-11-21 01:40:57 +08:00
syntax-check: fix violations and re-enable sc_prohibit_undesirable_word_seq.
* cfg.mk (local-checks-to-fix): Remove sc_prohibit_undesirable_word_seq from list of disabled checks. * doc/libtool.texi, build-aux/ltmain.m4sh, libltdl/m4/libtool.m4, libtoolize.m4sh: Replace all uses of "can not" with "cannot". Signed-off-by: Gary V. Vaughan <gary@gnu.org>
This commit is contained in:
Gary V. Vaughan
parent
e3a2b48d8e
commit
42c96694c1
@ -1316,7 +1316,7 @@ func_mode_compile ()
|
||||
case $arg in
|
||||
-shared)
|
||||
test "$build_libtool_libs" != yes && \
|
||||
func_fatal_configuration "can not build a shared library"
|
||||
func_fatal_configuration "cannot build a shared library"
|
||||
build_old_libs=no
|
||||
continue
|
||||
;;
|
||||
@ -4423,7 +4423,7 @@ func_mode_link ()
|
||||
case $arg in
|
||||
-shared)
|
||||
test "$build_libtool_libs" != yes && \
|
||||
func_fatal_configuration "can not build a shared library"
|
||||
func_fatal_configuration "cannot build a shared library"
|
||||
build_old_libs=no
|
||||
break
|
||||
;;
|
||||
@ -6062,7 +6062,7 @@ func_mode_link ()
|
||||
*-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
|
||||
*-*-unixware7*) add_dir="-L$dir" ;;
|
||||
*-*-darwin* )
|
||||
# if the lib is a (non-dlopened) module then we can not
|
||||
# if the lib is a (non-dlopened) module then we cannot
|
||||
# link against it, someone is ignoring the earlier warnings
|
||||
if /usr/bin/file -L $add 2> /dev/null |
|
||||
$GREP ": [^:]* bundle" >/dev/null ; then
|
||||
@ -6212,7 +6212,7 @@ func_mode_link ()
|
||||
# Just print a warning and add the library to dependency_libs so
|
||||
# that the program can be linked against the static library.
|
||||
echo
|
||||
$ECHO "*** Warning: This system can not link to static lib archive $lib."
|
||||
$ECHO "*** Warning: This system cannot link to static lib archive $lib."
|
||||
echo "*** I have the capability to make that library automatically link in when"
|
||||
echo "*** you link to this library. But I can only do this if you have a"
|
||||
echo "*** shared version of the library, which you do not appear to have."
|
||||
@ -8646,7 +8646,7 @@ library_names='$library_names'
|
||||
# The name of the static archive.
|
||||
old_library='$old_library'
|
||||
|
||||
# Linker flags that can not go in dependency_libs.
|
||||
# Linker flags that cannot go in dependency_libs.
|
||||
inherited_linker_flags='$new_inherited_linker_flags'
|
||||
|
||||
# Libraries that this one depends upon.
|
||||
|
||||
1
cfg.mk
1
cfg.mk
@ -40,7 +40,6 @@ VC_LIST_ALWAYS_EXCLUDE_REGEX = ^mail/
|
||||
local-checks-to-fix = \
|
||||
sc_prohibit_always-defined_macros \
|
||||
sc_prohibit_always_true_header_tests \
|
||||
sc_prohibit_undesirable_word_seq \
|
||||
sc_require_config_h \
|
||||
sc_require_config_h_first \
|
||||
sc_space_tab \
|
||||
|
||||
@ -1710,7 +1710,7 @@ expected installation path established during @code{libtool --mode=link}.
|
||||
|
||||
Thus, end-users need change nothing, and @command{automake}-style
|
||||
@code{make install DESTDIR=/tmp} will Just Work(tm) most of the time.
|
||||
For systems where fast installation can not be turned on, relinking
|
||||
For systems where fast installation cannot be turned on, relinking
|
||||
may be needed. In this case, a @samp{DESTDIR} install will fail.
|
||||
|
||||
Currently it is not generally possible to install into a temporary
|
||||
@ -6855,7 +6855,7 @@ line (such as @samp{@var{dir}/lib@var{name}.a}) when
|
||||
@end defvar
|
||||
|
||||
@defvar hardcode_direct_absolute
|
||||
Some architectures hardcode "absolute" library directories that can not
|
||||
Some architectures hardcode "absolute" library directories that cannot
|
||||
be overridden by @code{shlibpath_var} when @code{hardcode_direct} is
|
||||
@samp{yes}. In that case set @code{hardcode_direct_absolute} to
|
||||
@samp{yes}, or otherwise @samp{no}.
|
||||
|
||||
@ -947,7 +947,7 @@ func_nonemptydir_p ()
|
||||
|
||||
# check that the directories contents can be ls'ed
|
||||
test -n "`{ cd $my_dir && ls; } 2>/dev/null`" \
|
||||
|| func_fatal_error "can not list files: \`$my_dir'"
|
||||
|| func_fatal_error "cannot list files: \`$my_dir'"
|
||||
}
|
||||
|
||||
|
||||
@ -1354,7 +1354,7 @@ func_require_ac_aux_dir ()
|
||||
case $ac_aux_dir in
|
||||
*\$*)
|
||||
func_fatal_error "\
|
||||
can not expand unknown variable in AC_CONFIG_AUX_DIR argument."
|
||||
cannot expand unknown variable in AC_CONFIG_AUX_DIR argument."
|
||||
;;
|
||||
esac
|
||||
}
|
||||
@ -1382,7 +1382,7 @@ func_require_ac_ltdl_dir ()
|
||||
case $ac_ltdl_dir in
|
||||
*\$*)
|
||||
func_fatal_error "\
|
||||
can not expand unknown variable in LT_CONFIG_LTDL_DIR argument."
|
||||
cannot expand unknown variable in LT_CONFIG_LTDL_DIR argument."
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@ -1431,7 +1431,7 @@ func_require_ac_ltdl_options ()
|
||||
case $ac_ltdl_options in
|
||||
*\$*)
|
||||
func_fatal_error "\
|
||||
can not expand unknown variable in LTDL_INIT argument."
|
||||
cannot expand unknown variable in LTDL_INIT argument."
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
8
m4/libtool.m4
vendored
8
m4/libtool.m4
vendored
@ -2280,7 +2280,7 @@ aix[[4-9]]*)
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
# AIX (on Power*) has no versioning support, so currently we can not hardcode correct
|
||||
# AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
|
||||
# soname into executable. Probably we can add versioning support to
|
||||
# collect2, so additional links can be useful in future.
|
||||
if test "$aix_use_runtimelinking" = yes; then
|
||||
@ -4897,7 +4897,7 @@ _LT_EOF
|
||||
_LT_TAGVAR(ld_shlibs, $1)=no
|
||||
cat <<_LT_EOF 1>&2
|
||||
|
||||
*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
|
||||
*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
|
||||
*** reliably create shared libraries on SCO systems. Therefore, libtool
|
||||
*** is disabling shared libraries support. We urge you to upgrade GNU
|
||||
*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
|
||||
@ -5539,7 +5539,7 @@ _LT_EOF
|
||||
;;
|
||||
|
||||
sysv5* | sco3.2v5* | sco5v6*)
|
||||
# Note: We can NOT use -z defs as we might desire, because we do not
|
||||
# Note: We CANNOT use -z defs as we might desire, because we do not
|
||||
# link with -lc, and that would cause any symbols used from libc to
|
||||
# always be unresolved, which means just about no library would
|
||||
# ever link correctly. If we're not using GNU ld we use -z text
|
||||
@ -6791,7 +6791,7 @@ if test "$_lt_caught_CXX_error" != yes; then
|
||||
;;
|
||||
|
||||
sysv5* | sco3.2v5* | sco5v6*)
|
||||
# Note: We can NOT use -z defs as we might desire, because we do not
|
||||
# Note: We CANNOT use -z defs as we might desire, because we do not
|
||||
# link with -lc, and that would cause any symbols used from libc to
|
||||
# always be unresolved, which means just about no library would
|
||||
# ever link correctly. If we're not using GNU ld we use -z text
|
||||
|
||||
Loading…
Reference in New Issue
Block a user