[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Libtool branch, master, updated. v2.4.2-382-ge87a65f
|
From: |
Gary V. Vaughan |
|
Subject: |
[SCM] GNU Libtool branch, master, updated. v2.4.2-382-ge87a65f |
|
Date: |
Fri, 23 Aug 2013 05:06:15 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".
The branch, master has been updated
via e87a65fa0cc132dd195e0c42f110f8e9b49638e1 (commit)
via 5151a7a167ef9c4afc259a843f1aa39063d36f91 (commit)
from 8a8dfaec78790ab3193c2751b3188925339fdacb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e87a65fa0cc132dd195e0c42f110f8e9b49638e1
Author: Gary V. Vaughan <address@hidden>
Date: Fri Aug 23 11:12:57 2013 +0700
maint: correct many abuses of the word "which".
* HACKING, NEWS, TODO, bootstrap, bootstrap.conf,
build-aux/ltmain.in, cfg.mk, configure.ac, doc/libtool.texi,
doc/notes.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/doc/bootstrap.texi, libltdl/libltdl/lt_system.h,
libltdl/loaders/loadlibrary.c, libltdl/lt__strl.c,
libltdl/lt_dlloader.c, libltdl/ltdl.c, libtoolize.in,
m4/libtool.m4, m4/ltdl.m4, m4/ltsugar.m4, m4/lt~obsolete.m4,
tests/exceptions.at, tests/need_lib_prefix.at, tests/static.at:
Use "which" correctly, or replace with "that", "where" or "what"
as appropriate.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit 5151a7a167ef9c4afc259a843f1aa39063d36f91
Author: Brook Moses <address@hidden>
Date: Fri Aug 23 10:23:33 2013 +0700
libtool: improve comments for _LT_ENABLE_LOCK implementation.
* m4/libtool.m4 (_LT_ENABLE_LOCK): enhance comments to explain
why the code looks odd with 32bit flags in the 64bit section and
vice versa.
Signed-off-by: Gary V. Vaughan <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
HACKING | 2 +-
NEWS | 4 +-
TODO | 8 +++---
bootstrap | 26 +++++++++---------
bootstrap.conf | 2 +-
build-aux/ltmain.in | 22 ++++++++--------
cfg.mk | 4 +-
configure.ac | 2 +-
doc/libtool.texi | 56 ++++++++++++++++++++--------------------
doc/notes.texi | 4 +-
gl/build-aux/bootstrap.in | 14 +++++-----
gl/build-aux/extract-trace | 6 ++--
gl/build-aux/funclib.sh | 6 ++--
gl/doc/bootstrap.texi | 6 ++--
libltdl/libltdl/lt_system.h | 2 +-
libltdl/loaders/loadlibrary.c | 4 +-
libltdl/lt__strl.c | 8 +++---
libltdl/lt_dlloader.c | 2 +-
libltdl/ltdl.c | 2 +-
libtoolize.in | 2 +-
m4/libtool.m4 | 50 +++++++++++++++++++++---------------
m4/ltdl.m4 | 4 +-
m4/ltsugar.m4 | 2 +-
m4/lt~obsolete.m4 | 2 +-
tests/exceptions.at | 2 +-
tests/need_lib_prefix.at | 2 +-
tests/static.at | 2 +-
27 files changed, 127 insertions(+), 119 deletions(-)
diff --git a/HACKING b/HACKING
index f8c95ec..e263aa3 100644
--- a/HACKING
+++ b/HACKING
@@ -21,7 +21,7 @@ and is not part of a release distribution.
and in the test case you write.
* The correct response to most actual bugs is to write a new test case
- which demonstrates the bug. Then fix the bug, re-run the test suite,
+ that demonstrates the bug. Then fix the bug, re-run the test suite,
and check everything in.
* Some files in the libtool package are not owned by libtool. These
diff --git a/NEWS b/NEWS
index 514768b..e872922 100644
--- a/NEWS
+++ b/NEWS
@@ -38,7 +38,7 @@ NEWS - list of user-visible changes between releases of GNU
Libtool
- Fix a long-standing latent bug in autom4te include path for autotests
with VPATH builds.
- - Fix a long-standing latent bug in libtoolize which could delete lines
+ - Fix a long-standing latent bug in libtoolize that could delete lines
from libltdl/Makefile.am in recursive mode due to underquoting in a
sed script.
- Fix a long-standing bug in libtoolize, by outputting the 'putting
@@ -58,7 +58,7 @@ NEWS - list of user-visible changes between releases of GNU
Libtool
- Correctly recognize import libraries when Microsoft dumpbin is used
as the name lister and extend the dumpbin wrapper to find symbols
in import libraries using the -headers option of dumpbin. Also fix a
- bug in the dumpbin wrapper which could lead to broken symbol listings
+ bug in the dumpbin wrapper that could lead to broken symbol listings
in some corner cases.
- Use the improved Microsoft dumpbin support to mend preloading of
import libraries for Microsoft Visual C/C++.
diff --git a/TODO b/TODO
index 87a977b..ab09f42 100644
--- a/TODO
+++ b/TODO
@@ -63,7 +63,7 @@ GNU Libtool
* Fix -dlopen "self" on AIX. Reported by Gary Kumfert <address@hidden>.
* Fix denial of service if using installed 'libtool' on a different mount point
- together with a compiler which does not understand '-c -o'.
+ together with a compiler that does not understand '-c -o'.
Reported by Marcin Siennicki.
* Look at better -no-undefined support, maybe along the idea of
@@ -83,7 +83,7 @@ GNU Libtool
-> report 'file not found'
if it cannot be loaded (e.g. due to missing dependencies)
-> report dlerror
- open question: which error should be reported if all dlloaders fail
+ open question: what error should be reported if all dlloaders fail
or if a specific module type can only be loaded by one of them, how report
its dlerror?
Also report dlerror() for dlclose and dlsym if available
- Make sure that the dependency_libs of a dlpreopened module won't be loaded.
@@ -200,7 +200,7 @@ GNU Libtool
* The definitions for LT_SYS_MODULE_EXT, LT_SYS_MODULE_PATH and
LT_SYS_DLSEARCH_PATH should not rely on the _LT_SYS_DYNAMIC_LINKER
- macro. This involves moving the code which sets the variables
+ macro. This involves moving the code that sets the variables
library_names_spec, shlibpath_var and sys_lib_dlsearch_path_spec from
into a separate macro, and AC_REQUIRING the newly extracted macro in the
respective ltdl.m4 macros.
@@ -247,7 +247,7 @@ GNU Libtool
time.
* Figure out how to use data items in dlls with win32.
- The difficult part is compiling each object which will be linked with an
+ The difficult part is compiling each object that will be linked with an
import lib differently than if it will be linked with a static lib. This
will almost definitely require that automake pass some hints about linkage
in to each object compilation line.
diff --git a/bootstrap b/bootstrap
index 8232a44..2a70cb5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -9,7 +9,7 @@
# Source required external libraries:
# Set a version string for this script.
-scriptversion=2012-10-21.11; # UTC
+scriptversion=2013-08-22.10; # UTC
# General shell script boiler plate, and helper functions.
# Written by Gary V. Vaughan, 2004
@@ -177,7 +177,7 @@ sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
+# that contains forward slashes, into one that contains
# (escaped) backslashes. A very naive implementation.
sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
@@ -935,7 +935,7 @@ func_relative_path ()
# i) func_quote_for_eval_result
# double-quoted, suitable for a subsequent eval
# ii) func_quote_for_eval_unquoted_result
-# has just all characters which are still active within double
+# has all characters that are still active within double
# quotes backslashified.
func_quote_for_eval ()
{
@@ -1795,7 +1795,7 @@ test -z "$progpath" && . `echo "$0" |${SED-sed}
's|[^/]*$||'`/funclib.sh
test extract-trace = "$progname" && . `echo "$0" |${SED-sed}
's|[^/]*$||'`/options-parser
# Set a version string.
-scriptversion=2012-10-07.10; # UTC
+scriptversion=2013-08-22.10; # UTC
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -1838,7 +1838,7 @@ scriptversion=2012-10-07.10; # UTC
# func_autoconf_configure MAYBE-CONFIGURE-FILE
# --------------------------------------------
# Ensure that MAYBE-CONFIGURE-FILE is the name of a file in the current
-# directory which contains an uncommented call to AC_INIT.
+# directory that contains an uncommented call to AC_INIT.
func_autoconf_configure ()
{
$debug_cmd
@@ -1961,7 +1961,7 @@ func_tool_version_output ()
# require_configure_ac
# --------------------
# Ensure that there is a 'configure.ac' or 'configure.in' file in the
-# current directory which contains an uncommented call to AC_INIT, and
+# current directory that contains an uncommented call to AC_INIT, and
# that '$configure_ac' contains its name.
require_configure_ac=func_require_configure_ac
func_require_configure_ac ()
@@ -2203,7 +2203,7 @@ test extract-trace = "$progname" && func_main "$@"
# End:
# Set a version string for *this* script.
-scriptversion=2013-01-20.16; # UTC
+scriptversion=2013-08-22.10; # UTC
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -2372,7 +2372,7 @@ gnulib_tool_options="
"
# bootstrap removes any macro-files that are not included by aclocal.m4,
-# except for files listed in this variable which are always kept.
+# except for files listed in this variable that are always kept.
gnulib_precious="
gnulib-tool.m4
"
@@ -2417,8 +2417,8 @@ copy=false
# Set this to ".cvsignore .gitignore" in 'bootstrap.conf' if you want
# those files to be generated in directories like 'lib/', 'm4/', and 'po/',
-# or set it to "auto" to make this script select which to use based
-# on which version control system (if any) is used in the source directory.
+# or set it to "auto" to make this script select what to use based
+# on what version control system (if any) is used in the source directory.
# Or set it to "none" to ignore VCS ignore files entirely. Default is
# "auto".
vc_ignore=
@@ -2431,7 +2431,7 @@ vc_ignore=
# After 'bootstrap.conf' has been sourced, execution proceeds by calling
# 'func_bootstrap'. Wherever a function is decorated with
# 'func_hookable func_name', you will find a matching 'func_run_hooks
-# func_name' which executes all functions added with 'func_add_hook
+# func_name', which executes all functions added with 'func_add_hook
# func_name my_func'.
#
# You might notice that many of these functions begin with a series of
@@ -2916,7 +2916,7 @@ $2"
# the usual portability constraints of this script, that may seem a very
# demanding requirement, but it should be ok. Ignore any failure,
# which is fine, since this is only a convenience to help developers
-# avoid the relatively unusual case in which a symlinked-to .m4 file is
+# avoid the relatively unusual case where a symlinked-to .m4 file is
# git-removed from gnulib between successive runs of this script.
func_clean_dangling_symlinks ()
{
@@ -3952,7 +3952,7 @@ func_require_patch ()
$debug_cmd
test -n "$PATCH" || {
- # Find a patch program, preferring gpatch which is usually better
+ # Find a patch program, preferring gpatch, which is usually better
# than the vendor patch.
func_find_tool PATCH gpatch patch
}
diff --git a/bootstrap.conf b/bootstrap.conf
index 664dd07..2001ccb 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -271,7 +271,7 @@ func_add_hook func_fini
libtool_readme_release_package_substitutions
# ------------------------
# Autoheader valiantly tries to prevent needless reconfigurations by
# not changing the timestamp of config-h.in unless the file contents
-# are updated. Unfortunately config-h.in depends on aclocal.m4 which
+# are updated. Unfortunately config-h.in depends on aclocal.m4, which
# *is* updated, so running 'libtoolize --ltdl=. && configure && make'
# causes autoheader to be called... undesireable for users that do not
# have it! Fudge the timestamp to prevent that:
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index 2d7acdd..f22ac05 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -3104,8 +3104,8 @@ func_cygming_dll_for_implib_fallback_core ()
/./p' |
# we now have a list, one entry per line, of the stringified
# contents of the appropriate section of all members of the
- # archive which possess that section. Heuristic: eliminate
- # all those which have a first or second character that is
+ # archive that possess that section. Heuristic: eliminate
+ # all those that have a first or second character that is
# a '.' (that is, objdump's representation of an unprintable
# character.) This should work for all archives with less than
# 0x302f exports -- but will fail for DLLs whose name actually
@@ -3268,7 +3268,7 @@ func_extract_archives ()
#
# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
# variable will take. If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
+# will assume that the directory where it is stored is
# the $objdir directory. This is a cygwin/mingw-specific
# behavior.
func_emit_wrapper ()
@@ -3336,9 +3336,9 @@ _LTECHO_EOF'
# Very basic option parsing. These options are (a) specific to
# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
+# /script/ and the wrapper /executable/ that is used only on
# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
+# (application programs are unlikely to have options that match
# this pattern).
#
# There are only two supported options: --lt-debug and
@@ -4535,12 +4535,12 @@ func_mode_link ()
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
# It is impossible to link a dll without this setting, and
# we shouldn't force the makefile maintainer to figure out
- # which system we are compiling for in order to pass an extra
+ # what system we are compiling for in order to pass an extra
# flag for every libtool invocation.
# allow_undefined=no
# FIXME: Unfortunately, there are problems with the above when trying
- # to make a dll which has undefined symbols, in which case not
+ # to make a dll that has undefined symbols, in which case not
# even a static library is built. For now, we need to specify
# -no-undefined on the libtool link line when we can be certain
# that all symbols are satisfied, otherwise we get a static library.
@@ -6765,7 +6765,7 @@ func_mode_link ()
# use the current revision as the major version
# and those that subtract age and use age as
# a minor version. But, then there is irix
- # which has an extra 1 added just for fun
+ # that has an extra 1 added just for fun
#
case $version_type in
# correct linux to gnu/linux during the next big refactor
@@ -7674,7 +7674,7 @@ EOF
# The given exports_symbols file has to be filtered, so filter it.
func_verbose "filter symbol list for '$libname.la' to tag DATA
exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots of
- # 's' commands which not all seds can handle. GNU sed should be fine
+ # 's' commands, which not all seds can handle. GNU sed should be fine
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
@@ -7923,7 +7923,7 @@ EOF
# The given exports_symbols file has to be filtered, so filter it.
func_verbose "filter symbol list for '$libname.la' to tag DATA
exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots
of
- # 's' commands which not all seds can handle. GNU sed should be
fine
+ # 's' commands, which not all seds can handle. GNU sed should be
fine
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
@@ -9075,7 +9075,7 @@ exit $exit_status
# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries. Given conflicting
+# where we disable both kinds of libraries. Given conflicting
# choices, we go for a static library, that is the most portable,
# since we can't tell whether shared libraries were disabled because
# the user asked for that or because the platform doesn't support
diff --git a/cfg.mk b/cfg.mk
index 79ebe61..652b821 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -55,10 +55,10 @@ local-checks-to-skip = \
# GPL_version: checks for GPLv3, which we don't use
# cast_of_x_alloc_return_value:
-# We support C++ compilation which does require casting here.
+# We support C++ compilation, which does require casting here.
# prohibit_always-defined_macros:
# we have our own argz and dirent, which use the same macros but
-# which are not always-defined in our case.
+# are not always-defined in our case.
# prohibit_always_true_header_tests:
# we have our own argz and dirent, which are not *always* true,
# so the guards cannot be removed in our case.
diff --git a/configure.ac b/configure.ac
index 6c22a0c..a9e6aee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,7 @@ AC_SUBST([AUTOTEST], ['$(AUTOM4TE) --language=autotest'])
## Display a configure time version banner. ##
## ---------------------------------------- ##
-# This is a sanity check so we can see which version is used in bug reports.
+# This is a sanity check so we can see what version is used in bug reports.
AS_BOX([Configuring AC_PACKAGE_TARNAME AC_PACKAGE_VERSION])
echo
diff --git a/doc/libtool.texi b/doc/libtool.texi
index c06ddaa..557a19d 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -654,7 +654,7 @@ also that we need to add @option{-lm} to the link command
line because
libtool}).
Another complication in building shared libraries is that we need to
-specify the path to the directory in which they (eventually) will be
+specify the path to the directory wher they will (eventually) be
installed (in this case, @file{/usr/local/lib})@footnote{If you don't
specify an @code{rpath}, then libtool builds a libtool convenience
archive, not a shared library (@pxref{Static libraries}).}:
@@ -1321,7 +1321,7 @@ Print libtool version information and exit.
@end table
The current @command{libtool} implementation is done with a shell script
-that needs to be invoked by the shell which @command{configure} chose for
+that needs to be invoked by the shell that @command{configure} chose for
configuring @command{libtool} (@pxref{config.status Invocation, , The
Autoconf Manual, autoconf, The Autoconf Manual}). This shell is set in
the she-bang (@samp{#!}) line of the @command{libtool} script. Using a
@@ -1538,7 +1538,7 @@ to keep those files created with @code{gcc
-ftest-coverage} for example.
@item -release @var{release}
Specify that the library was generated by release @var{release} of your
-package, so that users can easily tell which versions are newer than
+package, so that users can easily tell what versions are newer than
others. Be warned that no two releases of your package will be binary
compatible if you use this flag. If you want binary compatibility, use
the @option{-version-info} flag instead (@pxref{Versioning}).
@@ -1714,7 +1714,7 @@ 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
-staging area that contains needed third-party libraries which are
+staging area that contains needed third-party libraries that are
not yet visible at their final location.
@end table
@@ -1775,7 +1775,7 @@ The remaining @var{mode-args} are either flags for the
deletion program
This chapter describes how to integrate libtool with your packages so
that your users can install hassle-free shared libraries.
-There are several ways in which Libtool may be integrated in your
+There are several ways that Libtool may be integrated in your
package, described in the following sections. Typically, the Libtool
macro files as well as @file{ltmain.sh} are copied into your package
using @command{libtoolize} and @command{aclocal} after setting up the
@@ -1873,7 +1873,7 @@ machine, if any.
@end defmac
@defmac LT_LIB_DLLOAD
-This is the macro used by @samp{libltdl} to determine which dlloaders
+This is the macro used by @samp{libltdl} to determine what dlloaders
to use on this machine, if any. Several shell variables are set (and
@samp{AC_SUBST}ed) depending on the dlload interfaces are available on
this machine. @samp{LT_DLLOADERS} contains a list of libtool
@@ -2799,7 +2799,7 @@ we should use the C++ compiler instead.
@item
C++ compilers will link some Standard C++ library in by default, but
-libtool does not know which are these libraries, so it cannot even run
+libtool does not know what these libraries are, so it cannot even run
the inter-library dependence analyzer to check how to link it in.
Therefore, running @command{ld} to link a C++ program or library is deemed
to fail.
@@ -2837,7 +2837,7 @@ correspondence between language names and tags names.
@item Windows Resource @tab RC
@end multitable
address@hidden tries to automatically infer which tag to use from
address@hidden tries to automatically infer what tag to use from
the compiler command being used to compile or link. If it can't infer
a tag, then it defaults to the configuration for the @code{C} language.
@@ -3054,7 +3054,7 @@ may also be replaced by other libraries using it.
@section Managing release information
Often, people want to encode the name of the package release into the
-shared library so that it is obvious to the user which package their
+shared library so that it is obvious to the user what package their
programs are linked against. This convention is used especially on
GNU/Linux:
@@ -3294,7 +3294,7 @@ By definition, every shared library system provides a way
for
executables to depend on libraries, so that symbol resolution is
deferred until runtime.
-An @dfn{inter-library dependency} is one in which a library depends on
+An @dfn{inter-library dependency} is where a library depends on
other libraries. For example, if the libtool library @file{libhello}
uses the @code{cos} function, then it has an inter-library dependency
on @file{libm}, the math library that implements @code{cos}.
@@ -3832,7 +3832,7 @@ Note that libltdl is not well tested in a multithreaded
environment,
though the intention is that it should work (@pxref{Thread Safety
in libltdl, , Using libltdl in a multi threaded environment}). It was
reported that GNU/Linux's glibc 2.0's @code{dlopen} with
address@hidden (which libltdl uses by default) is not thread-safe,
address@hidden (that libltdl uses by default) is not thread-safe,
but this problem is supposed to be fixed in glibc 2.1. On the other
hand, @samp{RTLD_NOW} was reported to introduce problems in
multi-threaded applications on address@hidden Working around these problems
@@ -3959,7 +3959,7 @@ transparently.
@deftypefun lt_dlhandle lt_dlopenadvise (const char address@hidden,
@w{lt_dladvise @var{advise}})
The same as @code{lt_dlopen}, except that it also requires an additional
-argument which may contain additional hints to the underlying system
+argument that may contain additional hints to the underlying system
module loader. The @var{advise} parameter is opaque and can only be
accessed with the functions documented below.
@@ -4662,7 +4662,7 @@ to include libltdl in the distribution of your package,
for the
convenience of users of your package that don't have libtool or
libltdl installed, or if you are using features of a very new version
of libltdl that you don't expect your users to have yet. In such
-cases, you must decide which flavor of libltdl you want to use: a
+cases, you must decide what flavor of libltdl you want to use: a
convenience library or an installable libtool library.
The most simplistic way to add @code{libltdl} to your package is to
@@ -5244,7 +5244,7 @@ works properly.
@pindex demo-hardcode.test
On all systems with shared libraries, the location of the library can be
encoded in executables that are linked against it @pxref{Linking
-executables}. This test checks the conditions under which your system
+executables}. This test checks under what conditions your system
linker hardcodes the library location, and guarantees that they
correspond to libtool's own notion of how your linker behaves.
@@ -5595,7 +5595,7 @@ a normal program. When the test is invoked in this way,
it produces
output that may be useful in determining what the problem is.
The new, Autotest-based test suite produces as output a file
address@hidden/testsuite.log} which contains information about failed
address@hidden/testsuite.log} that contains information about failed
tests.
You can pass options to the test suite through the @command{make}
@@ -5695,7 +5695,7 @@ This page usually describes how to install shared
libraries.
@item output from @kbd{ls -l /lib /usr/lib}
This shows the naming convention for shared libraries on the system,
-including which names should be symbolic links.
+including what names should be symbolic links.
@item any additional documentation
Some systems have special documentation on how to build and install
@@ -5762,7 +5762,7 @@ future.
@item pass_all
@vindex pass_all
will pass everything without any checking. This may work on platforms
-in which code is position-independent by default and inter-library
+where code is position-independent by default and inter-library
dependencies are properly supported by the dynamic linker, for example,
on DEC OSF/1 3 and 4.
@@ -5931,7 +5931,7 @@ objects.
@node Multiple dependencies
@subsection Multiple dependencies
-On most modern platforms the order in which dependent libraries are listed
+On most modern platforms the order where dependent libraries are listed
has no effect on object generation. In theory, there are platforms
that require libraries that provide missing symbols to other libraries
to be listed after those libraries whose symbols they provide.
@@ -5964,8 +5964,8 @@ use the @code{ar ts} command, instead.
Most build systems support the ability to compile libraries and applications
on one platform for use on a different platform, provided a compiler capable
of generating the appropriate output is available. In such cross compiling
-scenarios, the platform on which the libraries or applications are compiled
-is called the @dfn{build platform}, while the platform on which the libraries
+scenarios, the platform where the libraries or applications are compiled
+is called the @dfn{build platform}, while the platform where the libraries
or applications are intended to be used or executed is called the
@dfn{host platform}.
@ref{GNU Build System,, The GNU Build System, automake, The Automake Manual},
@@ -5986,7 +5986,7 @@ to the differences between the two platforms.
In addition to cases where the host platform and build platform are extremely
similar (e.g. @samp{i586-pc-linux-gnu} and @samp{i686-pc-linux-gnu}), there is
-another case in which cross-compiled host applications may be executed on the
+another case where cross-compiled host applications may be executed on the
build platform. This is possible when the build platform supports an emulation
or API-enhanced environment for the host platform. One example of this
situation would be if the build platform were MinGW, and the host platform were
@@ -6212,7 +6212,7 @@ required. @xref{LT_CYGPATH}.
@uref{http://www.winehq.org/, Wine} provides an interpretation environment for
-some Unix platforms in which Windows applications can be executed. It provides
+some Unix platforms where Windows applications can be executed. It provides
a mapping between the Unix file system and a virtual Windows file system used
by the Windows programs. For the file name conversion to work, Wine must be
installed and properly configured on the build platform, and the
@@ -6247,7 +6247,7 @@ coexist within the same Windows instance. Each
installation will have separate
names and paths to Cygwin form. Each installation's @command{cygpath} utility
automatically deduces the appropriate @file{/etc/fstab} file. Since each
@address@hidden/etc/fstab} mount table may specify different mappings, it
-matters which @command{cygpath} is used.
+matters what @command{cygpath} is used.
Note that @command{cygpath} is a Cygwin application; to execute this tool from
Unix requires a working and properly configured Wine installation, as well
@@ -6450,7 +6450,7 @@ of contemporary GNU tools. It should be noted that the
GNU auto-export
feature is turned off when an explicit @code{__declspec(dllexport)} is
seen. The GNU tools do this to not make more symbols visible for projects
that have already taken the trouble to decorate symbols. There is no
-similar way to limit which symbols are visible in the code when Libtool
+similar way to limit what symbols are visible in the code when Libtool
is using Microsoft tools. In order to limit symbol visibility in that
case you need to use one of the options @option{-export-symbols} or
@option{-export-symbols-regex}.
@@ -6465,10 +6465,10 @@ When the objects that form the library are built, there
are generally
two copies built for each object. One copy is used when linking the DLL
and one copy is used for the static library. On Windows systems, a pair
of defines are commonly used to discriminate how the interface symbols
-should be decorated. The first define is @samp{-DDLL_EXPORT} which is
+should be decorated. The first define is @samp{-DDLL_EXPORT}, which is
automatically provided by Libtool when @command{libtool} builds the copy
of the object that is destined for the DLL. The second define is
address@hidden (or similar) which is often added by the package
address@hidden (or similar), which is often added by the package
providing the library and is used when building the library, but not
when consuming the library.
@@ -7032,7 +7032,7 @@ Commands to create a reloadable object. Set
@code{reload_cmds} to
@end defvar
@defvar runpath_var
-The environment variable that tells the linker which directories to
+The environment variable that tells the linker what directories to
hardcode in the resulting executable.
@end defvar
@@ -7088,7 +7088,7 @@ If the toolchain is not native to the build platform
(e.g.@: if you are using
MSYS to drive the scripting, but are using the MinGW native Windows compiler)
this variable describes how to convert file names from the format used by the
build platform to the format used by host platform. Normally set to
address@hidden, libtool will autodetect most cases in which
address@hidden, libtool will autodetect most cases where
other values should be used. On rare occasions, it may be necessary to
override
the autodetected value (@pxref{Cygwin to MinGW Cross}).
@end defvar
diff --git a/doc/notes.texi b/doc/notes.texi
index 57fc6d5..a99bbbd 100644
--- a/doc/notes.texi
+++ b/doc/notes.texi
@@ -4,8 +4,8 @@
You currently need GNU make to build the Libtool package itself.
@item
-On AIX there are two different styles of shared linking, one in which symbols
-are bound at link-time and one in which symbols are bound at runtime only,
+On AIX there are two different styles of shared linking, one where symbols
+are bound at link-time and one where symbols are bound at runtime only,
similar to address@hidden In case of doubt use @code{LDFLAGS=-Wl,-brtl} for
the latter style.
@item
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 8af0c89..ce50d7e 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -13,7 +13,7 @@
. `echo "$0" |${SED-sed} 's|[^/]*$||'`"extract-trace"
# Set a version string for *this* script.
-scriptversion=2013-01-20.16; # UTC
+scriptversion=2013-08-22.10; # UTC
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -182,7 +182,7 @@ gnulib_tool_options="
"
# bootstrap removes any macro-files that are not included by aclocal.m4,
-# except for files listed in this variable which are always kept.
+# except for files listed in this variable that are always kept.
gnulib_precious="
gnulib-tool.m4
"
@@ -227,8 +227,8 @@ copy=false
# Set this to ".cvsignore .gitignore" in 'bootstrap.conf' if you want
# those files to be generated in directories like 'lib/', 'm4/', and 'po/',
-# or set it to "auto" to make this script select which to use based
-# on which version control system (if any) is used in the source directory.
+# or set it to "auto" to make this script select what to use based
+# on what version control system (if any) is used in the source directory.
# Or set it to "none" to ignore VCS ignore files entirely. Default is
# "auto".
vc_ignore=
@@ -241,7 +241,7 @@ vc_ignore=
# After 'bootstrap.conf' has been sourced, execution proceeds by calling
# 'func_bootstrap'. Wherever a function is decorated with
# 'func_hookable func_name', you will find a matching 'func_run_hooks
-# func_name' which executes all functions added with 'func_add_hook
+# func_name', which executes all functions added with 'func_add_hook
# func_name my_func'.
#
# You might notice that many of these functions begin with a series of
@@ -726,7 +726,7 @@ $2"
# the usual portability constraints of this script, that may seem a very
# demanding requirement, but it should be ok. Ignore any failure,
# which is fine, since this is only a convenience to help developers
-# avoid the relatively unusual case in which a symlinked-to .m4 file is
+# avoid the relatively unusual case where a symlinked-to .m4 file is
# git-removed from gnulib between successive runs of this script.
func_clean_dangling_symlinks ()
{
@@ -1762,7 +1762,7 @@ func_require_patch ()
$debug_cmd
test -n "$PATCH" || {
- # Find a patch program, preferring gpatch which is usually better
+ # Find a patch program, preferring gpatch, which is usually better
# than the vendor patch.
func_find_tool PATCH gpatch patch
}
diff --git a/gl/build-aux/extract-trace b/gl/build-aux/extract-trace
index 1aa8d67..5e42ea7 100755
--- a/gl/build-aux/extract-trace
+++ b/gl/build-aux/extract-trace
@@ -12,7 +12,7 @@ test -z "$progpath" && . `echo "$0" |${SED-sed}
's|[^/]*$||'`/funclib.sh
test extract-trace = "$progname" && . `echo "$0" |${SED-sed}
's|[^/]*$||'`/options-parser
# Set a version string.
-scriptversion=2012-10-07.10; # UTC
+scriptversion=2013-08-22.10; # UTC
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -55,7 +55,7 @@ scriptversion=2012-10-07.10; # UTC
# func_autoconf_configure MAYBE-CONFIGURE-FILE
# --------------------------------------------
# Ensure that MAYBE-CONFIGURE-FILE is the name of a file in the current
-# directory which contains an uncommented call to AC_INIT.
+# directory that contains an uncommented call to AC_INIT.
func_autoconf_configure ()
{
$debug_cmd
@@ -178,7 +178,7 @@ func_tool_version_output ()
# require_configure_ac
# --------------------
# Ensure that there is a 'configure.ac' or 'configure.in' file in the
-# current directory which contains an uncommented call to AC_INIT, and
+# current directory that contains an uncommented call to AC_INIT, and
# that '$configure_ac' contains its name.
require_configure_ac=func_require_configure_ac
func_require_configure_ac ()
diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh
index 8a212d1..3594107 100644
--- a/gl/build-aux/funclib.sh
+++ b/gl/build-aux/funclib.sh
@@ -1,5 +1,5 @@
# Set a version string for this script.
-scriptversion=2012-10-21.11; # UTC
+scriptversion=2013-08-22.10; # UTC
# General shell script boiler plate, and helper functions.
# Written by Gary V. Vaughan, 2004
@@ -167,7 +167,7 @@ sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
+# that contains forward slashes, into one that contains
# (escaped) backslashes. A very naive implementation.
sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
@@ -925,7 +925,7 @@ func_relative_path ()
# i) func_quote_for_eval_result
# double-quoted, suitable for a subsequent eval
# ii) func_quote_for_eval_unquoted_result
-# has just all characters which are still active within double
+# has all characters that are still active within double
# quotes backslashified.
func_quote_for_eval ()
{
diff --git a/gl/doc/bootstrap.texi b/gl/doc/bootstrap.texi
index dc824fa..a457931 100755
--- a/gl/doc/bootstrap.texi
+++ b/gl/doc/bootstrap.texi
@@ -58,7 +58,7 @@ package.
@cnindex buildreq
@item buildreq
-A newline-delimited list of triples of @strong{programs} (which must
+A newline-delimited list of triples of @strong{programs} (that must
accept the option @option{--version} without hanging or failing), the
@strong{minimum version required} (or just `-' in the version field if
any version will be sufficient) and @strong{homepage URL (to
@@ -223,7 +223,7 @@ gnulib_tool_options='
@item gnulib_precious
Normally, @command{bootstrap} removes any macro-files that are not
included by @file{aclocal.m4} before it returns, except for files listed
-in this variable which are always kept.
+in this variable that are always kept.
@smallexample
gnulib_precious='
@@ -311,7 +311,7 @@ further effect.
Set this to @samp{.cvsignore .gitignore} if you want both of those files
to be generated in directories such as @file{lib/}, @file{m4/}, and
@file{po/}, or set it to @samp{auto} to make @command{bootstrap} select
-which to use based on which version control system (if any) is used in
+what to use based on what version control system (if any) is used in
the source directory. Or set it to @samp{none} to disregard VCS ignore
files entirely. Default is @samp{auto}.
diff --git a/libltdl/libltdl/lt_system.h b/libltdl/libltdl/lt_system.h
index 0bda35c..34ac718 100644
--- a/libltdl/libltdl/lt_system.h
+++ b/libltdl/libltdl/lt_system.h
@@ -61,7 +61,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
# define LT_END_C_DECLS /* empty */
#endif
-/* LT_STMT_START/END are used to create macros which expand to a
+/* LT_STMT_START/END are used to create macros that expand to a
a single compound statement in a portable way. */
#if defined __GNUC__ && !defined __STRICT_ANSI__ && !defined __cplusplus
# define LT_STMT_START (void)(
diff --git a/libltdl/loaders/loadlibrary.c b/libltdl/loaders/loadlibrary.c
index ff6d25e..2800fe6 100644
--- a/libltdl/loaders/loadlibrary.c
+++ b/libltdl/loaders/loadlibrary.c
@@ -306,7 +306,7 @@ loadlibraryerror (const char *default_errmsg)
return len ? error_message : default_errmsg;
}
-/* A function called through the getthreaderrormode variable which checks
+/* A function called through the getthreaderrormode variable that checks
if the system supports GetThreadErrorMode (or GetErrorMode) and arranges
for it or a fallback implementation to be called directly in the future.
The selected version is then called. */
@@ -339,7 +339,7 @@ fallback_getthreaderrormode (void)
return (DWORD) SetErrorMode (SEM_FAILCRITICALERRORS);
}
-/* A function called through the setthreaderrormode variable which checks
+/* A function called through the setthreaderrormode variable that checks
if the system supports SetThreadErrorMode and arranges for it or a
fallback implementation to be called directly in the future.
The selected version is then called. */
diff --git a/libltdl/lt__strl.c b/libltdl/lt__strl.c
index 065566d..f84247b 100644
--- a/libltdl/lt__strl.c
+++ b/libltdl/lt__strl.c
@@ -36,9 +36,9 @@ or obtained by writing to the Free Software Foundation, Inc.,
/*
lt_strlcat appends the NULL-terminated string src to the end of dst.
It will append at most dstsize - strlen(dst) - 1 bytes,
- NULL-terminating the result. The total length of the string which
+ NULL-terminating the result. The total length of the string that
would have been created given sufficient buffer size (may be longer
- than dstsize) is returned. This function substitutes for strlcat()
+ than dstsize) is returned. This function substitutes for strlcat(),
which is available under NetBSD, FreeBSD and Solaris 9.
Buffer overflow can be checked as follows:
@@ -84,9 +84,9 @@ lt_strlcat(char *dst, const char *src, const size_t dstsize)
/*
lt_strlcpy copies up to dstsize - 1 characters from the NULL-terminated
string src to dst, NULL-terminating the result. The total length of
- the string which would have been created given sufficient buffer
+ the string that would have been created given sufficient buffer
size (may be longer than dstsize) is returned. This function
- substitutes for strlcpy() which is available under OpenBSD, FreeBSD
+ substitutes for strlcpy(), which is available under OpenBSD, FreeBSD
and Solaris 9.
Buffer overflow can be checked as follows:
diff --git a/libltdl/lt_dlloader.c b/libltdl/lt_dlloader.c
index f1b95d5..661e01f 100644
--- a/libltdl/lt_dlloader.c
+++ b/libltdl/lt_dlloader.c
@@ -166,7 +166,7 @@ lt_dlloader_remove (const char *name)
return 0;
}
- /* Fail if there are any open modules which use this loader. */
+ /* Fail if there are any open modules that use this loader. */
iface = lt_dlinterface_register (id_string, NULL);
while ((handle = lt_dlhandle_iterate (iface, handle)))
{
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 82dc013..43c4e62 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -306,7 +306,7 @@ lt_dlexit (void)
++errors;
}
/* Make sure that the handle pointed to by 'cur' still
exists.
- lt_dlclose recursively closes dependent libraries
which removes
+ lt_dlclose recursively closes dependent libraries,
which removes
them from the linked list. One of these might be the
one
pointed to by 'cur'. */
if (cur)
diff --git a/libtoolize.in b/libtoolize.in
index e004cfa..3e2ec7c 100644
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -1207,7 +1207,7 @@ func_check_macros ()
# func_autoconf_configure MAYBE-CONFIGURE-FILE
# --------------------------------------------
# Ensure that MAYBE-CONFIGURE-FILE is the name of a file in the current
-# directory which contains an uncommented call to AC_INIT.
+# directory that contains an uncommented call to AC_INIT.
func_autoconf_configure ()
{
$debug_cmd
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 08fb2a5..8f97c5c 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -177,7 +177,7 @@ m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
m4_require([_LT_WITH_SYSROOT])dnl
_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes INIT.
if test -n "\${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
@@ -703,7 +703,7 @@ m4_defun([_LT_CONFIG],
_LT_CONFIG_SAVE_COMMANDS([
m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
m4_if(_LT_TAG, [C], [
- # See if we are running on zsh, and set the options which allow our
+ # See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes.
if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
@@ -1162,8 +1162,8 @@ m4_define([_LT_SHELL_INIT],
# -----------------------
# Find how we can fake an echo command that does not interpret backslash.
# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
m4_defun([_LT_PROG_ECHO_BACKSLASH],
[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
@@ -1246,7 +1246,7 @@ esac
AC_MSG_RESULT([${lt_sysroot:-no}])
_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
+[dependent libraries, and where our libraries should be installed.])])
# _LT_ENABLE_LOCK
# ---------------
@@ -1260,7 +1260,8 @@ test no = "$enable_libtool_lock" ||
enable_libtool_lock=yes
# libtool support.
case $host in
ia64-*-hpux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set mode
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.$ac_objext` in
@@ -1275,7 +1276,8 @@ ia64-*-hpux*)
rm -rf conftest*
;;
*-*-irix6*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
if test yes = "$lt_cv_prog_gnu_ld"; then
@@ -1309,7 +1311,12 @@ ia64-*-hpux*)
x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
+ # situations where additional linker options are needed (such as when
+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+ # vice versa); the common cases where no linker options are needed do
+ # not appear in the list.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
@@ -1383,7 +1390,8 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
fi
;;
*-*solaris*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
@@ -2076,7 +2084,7 @@ _LT_DECL([], [objdir], [0],
[The name of the directory that contains temporary libtool files])dnl
m4_pattern_allow([LT_OBJDIR])dnl
AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
- [Define to the sub-directory in which libtool stores uninstalled libraries.])
+ [Define to the sub-directory where libtool stores uninstalled libraries.])
])# _LT_CHECK_OBJDIR
@@ -2913,7 +2921,7 @@ _LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
# _LT_PATH_TOOL_PREFIX(TOOL)
# --------------------------
-# find a file program which can recognize shared library
+# find a file program that can recognize shared library
AC_DEFUN([_LT_PATH_TOOL_PREFIX],
[m4_require([_LT_DECL_EGREP])dnl
AC_MSG_CHECKING([for $1])
@@ -2983,7 +2991,7 @@ dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
# _LT_PATH_MAGIC
# --------------
-# find a file program which can recognize a shared library
+# find a file program that can recognize a shared library
m4_defun([_LT_PATH_MAGIC],
[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -3019,7 +3027,7 @@ if test yes = "$GCC"; then
AC_MSG_CHECKING([for ld used by $CC])
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -3164,7 +3172,7 @@ lt_cv_deplibs_check_method='unknown'
# 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
+# that responds to the $file_magic_cmd with a given extended regex.
# If you have 'file' or equivalent on your system and you're not sure
# whether 'pass_all' will *always* work, you probably want this one.
@@ -3489,8 +3497,8 @@ lt_cv_sharedlib_from_linklib_cmd,
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
+ # two different shell functions defined in ltmain.sh;
+ # decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
*--identify-strict*)
lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -4080,7 +4088,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
ecpc* )
- # old Intel C++ for x86_64 which still supported -KPIC.
+ # old Intel C++ for x86_64, which still supported -KPIC.
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -4388,7 +4396,7 @@ m4_if([$1], [CXX], [
linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
+ # old Intel for x86_64, which still supported -KPIC.
ecc*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4539,7 +4547,7 @@ m4_if([$1], [CXX], [
fi
])
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -5817,7 +5825,7 @@ if test -n "$compiler"; then
LT_SYS_DLOPEN_SELF
_LT_CMD_STRIPLIB
- # Report which library types will actually be built
+ # Report what library types will actually be built
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
@@ -7841,7 +7849,7 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into
spaces])dnl
# _LT_PATH_CONVERSION_FUNCTIONS
# -----------------------------
-# Determine which file name conversion functions should be used by
+# Determine what file name conversion functions should be used by
# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
# for certain cross-compile configurations and native mingw.
m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index 7251813..1df7a41 100644
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -551,7 +551,7 @@ dnl AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [])
# -----------------
AC_DEFUN([LT_SYS_MODULE_EXT],
[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
-AC_CACHE_CHECK([which extension is used for runtime loadable modules],
+AC_CACHE_CHECK([what extension is used for runtime loadable modules],
[libltdl_cv_shlibext],
[
module=yes
@@ -581,7 +581,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],
+AC_CACHE_CHECK([what variable specifies run-time module search path],
[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
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
index 8956a21..7cbc638 100644
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@@ -34,7 +34,7 @@ m4_define([_lt_join],
# ------------
# Manipulate m4 lists.
# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# Autoconf-2.59, which quotes differently.
m4_define([lt_car], [[$1]])
m4_define([lt_cdr],
[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
index 555d41c..59461e4 100644
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@@ -12,7 +12,7 @@
# These exist entirely to fool aclocal when bootstrapping libtool.
#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
# which have later been changed to m4_define as they aren't part of the
# exported API, or moved to Autoconf or Automake where they belong.
#
diff --git a/tests/exceptions.at b/tests/exceptions.at
index d540e67..3eda9ef 100644
--- a/tests/exceptions.at
+++ b/tests/exceptions.at
@@ -39,7 +39,7 @@ CPPFLAGS="$LTDLINCL $CPPFLAGS"
# Win32 (and cygwin) notes
# ------------------------
# When using C++ and Win32 DLLs, data types used in the DLL's interface
-# which are other-than-POD, must have vtables, typeinfo, and other
+# that are other-than-POD, must have vtables, typeinfo, and other
# elements resolved when the client is linked. This includes exception
# classes. Therefore, the exception class "modexc" thrown by the
# dynamically-loaded module must be defined in a separate DLL, to which
diff --git a/tests/need_lib_prefix.at b/tests/need_lib_prefix.at
index 930e7d8..2102d6d 100644
--- a/tests/need_lib_prefix.at
+++ b/tests/need_lib_prefix.at
@@ -26,7 +26,7 @@ AT_SETUP([enforced lib prefix])
AT_KEYWORDS([libltdl libtool])
# Originally written to simulate a failure visible on systems
-# which need a library prefix like 'lib', such as BeOS. Currently
+# that need a library prefix like 'lib', such as BeOS. Currently
# the prefix is hardcoded as 'lib', so systems that require a
# different prefix skips the test.
diff --git a/tests/static.at b/tests/static.at
index e95c333..42eedd5 100644
--- a/tests/static.at
+++ b/tests/static.at
@@ -55,7 +55,7 @@
# - should -Bstatic/-Bdynamic be mixable with -static or -static-libtool-libs?
# Semantics could be as follows:
-# - '-static'/'-static-libtool-libs' set the default which is the initial
+# - '-static'/'-static-libtool-libs' set the default, which is the initial
# value, then '-Bstatic'/'-Bdynamic' override that
# - '-Bdefault' resets to the default value given by the other switches.
hooks/post-receive
--
GNU Libtool
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Libtool branch, master, updated. v2.4.2-382-ge87a65f,
Gary V. Vaughan <=