mirror/libtool
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/libtool.git synced 2026-01-27 01:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

syntax-check: fix violations and implement sc_old_style_quoting.

Browse Source 
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
This commit is contained in:
Gary V. Vaughan 2012-10-21 23:41:07 +07:00
parent 67759e9fb7
commit d98a30fbce
51 changed files with 1549 additions and 1540 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
HACKING
View File

@ -42,7 +42,7 @@ and is not part of a release distribution.
+ missing
+ texinfo.tex
The ones that are important for a release can be updated by ensuring
gnulib is up-to-date, and running `bootstrap` to recheck the links are
gnulib is up-to-date, and running 'bootstrap' to recheck the links are
correct.
* Changes other than bug fixes must be mentioned in NEWS
@ -52,8 +52,8 @@ and is not part of a release distribution.
=============
* When writing tests, make sure the link invocation (first argument to
AT_CHECK) is on a single line so that `testsuite -x' displays the
whole thing. You can use m4_do or `[... ]dnl' to wrap long lines.
AT_CHECK) is on a single line so that 'testsuite -x' displays the
whole thing. You can use m4_do or '[... ]dnl' to wrap long lines.
* Use
make -k check
@ -65,11 +65,11 @@ and is not part of a release distribution.
* The new Autotest testsuite uses keywords to denote test features:
autoconf needs Autoconf
automake needs Automake
libltdl exercises the `libltdl' library
libtool exercises the `libtool' script
libtoolize exercises the `libtoolize' script
libltdl exercises the 'libltdl' library
libtool exercises the 'libtool' script
libtoolize exercises the 'libtoolize' script
recursive runs the suite recursively, with a modified
`libtool' script and with `-k libtool'
'libtool' script and with '-k libtool'
CXX F77 FC GCJ exercises a language other than C
@ -77,16 +77,16 @@ and is not part of a release distribution.
=========
* We've adopted the convention that exported Autoconf macros should be
named with a leading `LT_' and be documented in the libtool manual.
Internal macros begin with `_LT_' if they are visible to aclocal, or
potentially part of an AC_DEFUN/AC_REQUIRE path, or else `_lt_' if
named with a leading 'LT_' and be documented in the libtool manual.
Internal macros begin with '_LT_' if they are visible to aclocal, or
potentially part of an AC_DEFUN/AC_REQUIRE path, or else '_lt_' if
they are very low level. This convention was only introduced just
before libtool-2.0, so there may still be exceptions in the existing
code. But all new code should use it.
* All shell variables used internally by libtool's Autoconf macros
should be named with the a leading `lt_' (not that they cannot clash
with the `_lt_' macro namespace).
should be named with the a leading 'lt_' (not that they cannot clash
with the '_lt_' macro namespace).
5. Using git
@ -127,18 +127,18 @@ and is not part of a release distribution.
a linear history.
6. Editing `.am' Files
6. Editing '.am' Files
======================
* Always use $(...) and not ${...}
* Use `:', not `true'. Use `exit 1', not `false'.
* Use ':', not 'true'. Use 'exit 1', not 'false'.
* Use `##' comments liberally. Comment anything even remotely unusual.
* Use '##' comments liberally. Comment anything even remotely unusual.
* Never use basename or dirname. Instead use sed.
* Do not use `cd' within back-quotes, use `$(lt__cd)' instead.
* Do not use 'cd' within back-quotes, use '$(lt__cd)' instead.
Otherwise the directory name may be printed, depending on CDPATH.
* In general, if a loop is required, it should be silent. Then the body
@ -150,18 +150,18 @@ and is not part of a release distribution.
libltdl modes to function correctly, the thing we need to ensure
*before the client runs libtoolize*, is that the subpackage case is
correct (because all files may be symlinked there). All others can
and will be fixed in the `libtoolize --ltdl --(non)recursive' stage.
and will be fixed in the 'libtoolize --ltdl --(non)recursive' stage.
7. Editing `.m4' Files
7. Editing '.m4' Files
======================
* Be careful with both `echo' and `$ECHO'. As the latter may be one of
* Be careful with both 'echo' and '$ECHO'. As the latter may be one of
print -r --
printf %s\n
func_fallback_echo
it may not have more than one argument and its value may not be
eval'ed. However, the argument may start with a `-' and contain
eval'ed. However, the argument may start with a '-' and contain
backslashes. As a rule of thumb, use
echo .. for literal (constant) strings without leading
hyphen and no backslashes within,
@ -189,7 +189,7 @@ and is not part of a release distribution.
top to bottom...
* But first, outside of the stack, there is a convenience header that
defines the internal interfaces (as evidenced by the `lt__' prefix to
defines the internal interfaces (as evidenced by the 'lt__' prefix to
the filename!) shared between implementation files in the stack, that
are however not exported to libltdl clients:
@ -210,7 +210,7 @@ and is not part of a release distribution.
`------'
* The next layer is comprised of the subsystems of the exported libltdl
API, which are implemented by files that are named with a leading `lt_'
API, which are implemented by files that are named with a leading 'lt_'
(single underscore!):
,------------v---------------.
@ -251,7 +251,7 @@ and is not part of a release distribution.
#include <libltdl/lt_system.h>
This layer's interface is defined by files that are usually named with
a leading `lt__':
a leading 'lt__':
,--------------v-------------v------------v--------v---------.
| lt__dirent.h | lt__alloc.h | lt__strl.h | argz.h | slist.h |
@ -372,7 +372,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
9.4. GPL with self extracting version and Libtool exception clause
Although the libtool script is generated from `ltmain.in' according
Although the libtool script is generated from 'ltmain.in' according
to the rules in the preceding subsection, it also needs the Libtool
exception clause so that it can be redistributed by other projects
that use libtool:

14
Makefile.am
View File

@ -43,7 +43,7 @@ noinst_LTLIBRARIES =
lib_LTLIBRARIES =
EXTRA_LTLIBRARIES =
# Using `cd' in backquotes may print the directory name, use this instead:
# Using 'cd' in backquotes may print the directory name, use this instead:
lt__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
git_version_gen = '$(SHELL)' '$(aux_dir)/git-version-gen' '.tarball-version'
@ -70,9 +70,9 @@ CLEANFILES += libtool libtoolize
## If a file is named several times below, and especially if it
## is a distributed file created during Libtool bootstrap, we
## put it in a variable in accordance with the DRY principle.
## Use `$(srcdir)' for the benefit of non-GNU makes: referring
## Use '$(srcdir)' for the benefit of non-GNU makes: referring
## to them by their variable makes sure they appear as targets
## and dependencies with `$(srcdir)' consistently.
## and dependencies with '$(srcdir)' consistently.
configure_ac = $(srcdir)/configure.ac
config_status = $(top_builddir)/config.status
extract_trace = $(srcdir)/$(aux_dir)/extract-trace
@ -142,7 +142,7 @@ $(ltversion_m4): $(ltversion_in) $(dotversion)
## would rerun configure on every invocation, so now we manually
## check the version numbers from the build rule when necessary.
## !WARNING! If you edit this rule to change the contents of ltmain.sh,
## you must `touch $(aux_dir)/ltmain.in' from the
## you must 'touch $(aux_dir)/ltmain.in' from the
## shell if you need ltmain.sh to be regenerated. Ideally, we
## should make this rule depend on Makefile but that will break
## distcheck (at least) by rebuilding ltmain.sh in the source
@ -194,9 +194,9 @@ $(lt_Makefile_am): $(ltdl_mk)
$(AM_V_at)chmod a-w '$@'
## Document the make macros that are needed to build bootstrap-deps
## dependencies when called from `bootstrap' (developer's machine),
## dependencies when called from 'bootstrap' (developer's machine),
## where the Makefile.am is fed to make in its raw format before
## `configure' has found the correct values (on the build machine).
## 'configure' has found the correct values (on the build machine).
bootstrap_files = \
$(lt_Makefile_am) \
$(ltmain_sh) \
@ -205,7 +205,7 @@ bootstrap_files = \
.PHONY: bootstrap-deps bootstrap-deps-prep
bootstrap-deps: bootstrap-deps-prep $(bootstrap_files)
bootstrap-deps-prep:
## The following variables are substituted by `bootstrap-dep-preps'
## The following variables are substituted by 'bootstrap-dep-preps'
@exit_cmd=:; \
test -z '$(srcdir)' \
&& echo "ERROR: don't call $(MAKE) with srcdir unset." \

170
NEWS
View File

@ -7,19 +7,19 @@ NEWS - list of user-visible changes between releases of GNU Libtool
- Moved to gnulib release infrastructure.
- M4 is now used for scanning the M4 macros in your configure.ac that
`libtoolize' looks at to determine what files you want, and where you
'libtoolize' looks at to determine what files you want, and where you
would like them installed. This means that you can compose your
version number or any other argument that Libtoolize needs to know at
M4 time using git-version-gen from gnulib, for example.
- Invoking `libtoolize --ltdl' no longer maintains a separate autoconf
- Invoking 'libtoolize --ltdl' no longer maintains a separate autoconf
macro directory in the libltdl tree, but automatically adjusts the
installed libltdl configuration files to share whatever macro
directory is declared by the parent project. (Note: if you were
already sharing a macro directory with AC_CONFIG_MACRO_DIR(ltdl/m4)
or similar, that still works as does any other directory choice).
- Invoking `libtoolize --ltdl' no longer maintains a separate auxiliary
- Invoking 'libtoolize --ltdl' no longer maintains a separate auxiliary
scripts directory in the libltdl tree, but automatically adjusts the
installed libltdl configuration files to share whatever auxiliary
scripts directory is declared by the parent project. (Note: if you
@ -41,18 +41,18 @@ NEWS - list of user-visible changes between releases of GNU Libtool
- Fix a long-standing latent bug in libtoolize which 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
auxiliary files in' header with `libtoolize --ltdl --subproject'.
- Fix a long-standing bug in libtoolize, by outputting the 'putting
auxiliary files in' header with 'libtoolize --ltdl --subproject'.
- Fix a long-standing bug in libtoolize subproject installation, by not
installing a set of autoconf macro files into the parent project if
there is no configure.ac present to use them.
- The libtoolize subproject mode selector is now named `--subproject'
and is equivalent to the implied `--subproject' mode when no other
mode is selected; `--standalone' never worked, and is no longer
- The libtoolize subproject mode selector is now named '--subproject'
and is equivalent to the implied '--subproject' mode when no other
mode is selected; '--standalone' never worked, and is no longer
accepted.
- Libtool and libtoolize no longer choke on paths with a comma in them.
- In the case where $SHELL does not have the same enhanced features
(e.g. the ability to parse `var+=append') as $CONFIG_SHELL, libtool
(e.g. the ability to parse 'var+=append') as $CONFIG_SHELL, libtool
will now correctly fallback to using only vanilla shell features
instead of failing with a parse at startup.
- Correctly recognize import libraries when Microsoft dumpbin is used
@ -64,13 +64,13 @@ NEWS - list of user-visible changes between releases of GNU Libtool
** Important incompatible changes:
- GNU M4 is required to run libtoolize in a directory with a
`configure.ac' (or `configure.in') that needs tracing to determine
'configure.ac' (or 'configure.in') that needs tracing to determine
what modes and directories have been specified.
- The use of the idiosyncratically named `Makefile.inc' in nonrecursive
- The use of the idiosyncratically named 'Makefile.inc' in nonrecursive
libltdl builds is deprecated, although it will be supported for one
more year or until the next release, whichever takes longer. Please
upgrade to the more standard naming of `ltdl.mk' in keeping with other
upgrade to the more standard naming of 'ltdl.mk' in keeping with other
GNU projects.
- libtoolize now behaves consistenty in respect of multiple directory
@ -139,7 +139,7 @@ New in 2.4 2010-09-22: git version 2.2.11a, Libtool team:
- On non-cygwin Windows systems, we now lookup potential library
file names without regard to file name case.
- The old testsuite now uses the `parallel-tests' Automake test driver
- The old testsuite now uses the 'parallel-tests' Automake test driver
now for more concurrency and better test logging. For this, tests are
run in verbose mode by default now.
@ -163,7 +163,7 @@ New in 2.4 2010-09-22: git version 2.2.11a, Libtool team:
* Bug fixes:
- The `check-interactive' and `check-noninteractive' convenience make
- The 'check-interactive' and 'check-noninteractive' convenience make
targets now also work for the old testsuite.
- Warnings from Autoconf v2.67-36-g1e604ec about incomplete programs
passed to AC_*_IFELSE tests have been fixed.
@ -196,8 +196,8 @@ New in 2.2.7b 2010-05-20: git version 2.2.7a, Libtool team:
- New libtool command line flag --no-verbose, which disables only
the extra "verbose" output messages and has no effect on the
default informational messages.
- New convenience make targets `check-noninteractive' to avoid long testsuite
runs on Windows with popup windows in the middle, and `check-interactive'
- New convenience make targets 'check-noninteractive' to avoid long testsuite
runs on Windows with popup windows in the middle, and 'check-interactive'
for the complement set of tests.
- New link mode flag -bindir to specify the location for installed PE DLLs.
- Wrapper scripts and wrapper executables for programs linked against
@ -230,7 +230,7 @@ New in 2.2.7b 2010-05-20: git version 2.2.7a, Libtool team:
* Bug fixes:
- Fix 2.2.6 regression that prevented using the libltdl macros together
with Autoconf 2.59 (`possibly undefined macro: LT_LIBEXT').
with Autoconf 2.59 ('possibly undefined macro: LT_LIBEXT').
- Fix 2.2.4 regression that caused arguments with special characters
to be mangled by the compile wrapper for uninstalled programs on MinGW.
- libtool command line flag --verbose now also enables explicit
@ -244,7 +244,7 @@ New in 2.2.7b 2010-05-20: git version 2.2.7a, Libtool team:
- Fix long standing bug that caused compiler checks for Fortran and
C++ compilers to run twice.
- Link mode works around a parallel build failure on Darwin 9.6.0 due
to the `ar' `flock'ing an archive upon extraction, by protecting the
to the 'ar' 'flock'ing an archive upon extraction, by protecting the
extraction of convenience archives with a lock.
- The Libtool macro files do not contain instances of __oline__ any more,
easing merges for configure scripts that are added to version control.
@ -316,13 +316,13 @@ New in 2.2.4: 2008-05-04: git version 2.2.3a, Libtool team:
copied, unless --force is passed.
- No longer reports that lt~obsolete.m4 needs to be added to aclocal.m4
when it is already there.
- When `aclocal' copied the libtool macros directly into `aclocal.m4'
- When 'aclocal' copied the libtool macros directly into 'aclocal.m4'
(i.e. AC_CONFIG_MACRO_DIR is not being used), libtoolize no longer
reports that all macros need to be added to `aclocal.m4', and
reports that all macros need to be added to 'aclocal.m4', and
diagnoses only the macro files that are missing or not up-to-date.
- libtoolize now advises use of AC_CONFIG_MACRO_DIR to keep matching
libtool macros in-tree where appropriate.
- libtoolize now advises use of `ACLOCAL_AMFLAGS = -I m4' (or
- libtoolize now advises use of 'ACLOCAL_AMFLAGS = -I m4' (or
equivalent) where appropriate, and errors out when ACLOCAL_AMFLAGS
names a different directory to AC_CONFIG_MACRO_DIR.
@ -340,10 +340,10 @@ New in 2.2.2: 2008-04-01: CVS version 2.2.1a, Libtool team:
* Bug fixes:
- Fix 2.2 regression in libltdl that causes memory corruption upon
repeated `lt_dlinit(); lt_dlexit()'.
repeated 'lt_dlinit(); lt_dlexit()'.
- Fix 2.2 regression in libltdl that skipped the dlopen loader if
the system also supports other loaders (e.g., Cygwin, HP-UX).
- Fix 2.2 regression in that `libtool --mode=execute CMD ARGS' does not
- Fix 2.2 regression in that 'libtool --mode=execute CMD ARGS' does not
transform ARGS that do not look like shell or C wrappers of libtool
programs.
- Fix 2.2 regression that kept cross-compiling to w32 from working.
@ -387,9 +387,9 @@ New in 2.1b: 2008-02-01; CVS version 2.1a, Libtool team:
1.9b.
- The macro LT_WITH_LTDL has been renamed to LTDL_INIT.
- Fixed a branch-1-5/HEAD regression to only link uninstalled libraries
statically with `-static'. In order to compensate for this, there
is a new link flag `-static-libtool-libs' to provide the previous
`-static' semantics.
statically with '-static'. In order to compensate for this, there
is a new link flag '-static-libtool-libs' to provide the previous
'-static' semantics.
* New features:
@ -397,7 +397,7 @@ New in 2.1b: 2008-02-01; CVS version 2.1a, Libtool team:
Automake installed, in order to be usable in another package. This
lifts the restrictions introduced in 1.9b.
- Default convenience or installable libltdl builds can optionally
be declared using new `convenience' or `installable' options to the
be declared using new 'convenience' or 'installable' options to the
LTDL_INIT macro (as an alternative to individual LTDL_CONVENIENCE
or LTDL_INSTALLABLE invocations).
- New configure-time options to allow libltdl parent project builder
@ -407,7 +407,7 @@ New in 2.1b: 2008-02-01; CVS version 2.1a, Libtool team:
- New LT_CONFIG_LTDL_DIR macro to specify a different directory name
for a convenience libltdl.
- libtoolize has been completely overhauled.
- `libtoolize --install' now also installs `install-sh'.
- 'libtoolize --install' now also installs 'install-sh'.
- New libtoolize options: --non-recursive, --recursive, --subproject.
These options control the way libltdl is installed into a package by
libtoolize. The new recursive and non-recursive build modes for
@ -428,7 +428,7 @@ New in 2.1b: 2008-02-01; CVS version 2.1a, Libtool team:
- The new lt_dladvise_init/lt_dladvise_destroy based APIs also allow
caller requests for a filename extension search with lt_dladvise_ext,
and for marking a module unloadable with lt_dladvise_resident.
- Allow shell special characters like `$' in source file names, but
- Allow shell special characters like '$' in source file names, but
not in object names, to enhance GCJ support.
- An entire new Autotest-based testsuite in addition to the old one.
Both testsuites have been made more useful for testing
@ -437,7 +437,7 @@ New in 2.1b: 2008-02-01; CVS version 2.1a, Libtool team:
- In 1.9b, a new variable inherited_linker_flags has been added to the
libtool library files. This variable takes flags that should be
used by dependent libraries and programs, but that do not fit into
`dependency_libs' for both clarity and backward-compatibility.
'dependency_libs' for both clarity and backward-compatibility.
* Changes in supported systems or compilers:
@ -453,7 +453,7 @@ New in 2.1b: 2008-02-01; CVS version 2.1a, Libtool team:
- Initial Support for FC (modern Fortran).
- Support for Portland Group compiler, the Sun compiler suite on GNU/Linux,
and initial support for the IBM compiler suite on GNU/Linux/ppc.
- Support for linux-dietlibc (`diet' as well as `diet-dyn', separately).
- Support for linux-dietlibc ('diet' as well as 'diet-dyn', separately).
- Building libltdl with a C++ compiler has been undusted.
- On (AIX?,) HP-UX, and OpenBSD, hardcoding has been changed to prefer
rpath over absolute dependent library names. This fixes DESTDIR
@ -473,8 +473,8 @@ New in 2.1b: 2008-02-01; CVS version 2.1a, Libtool team:
exceeded.
- Improve linking with C++ libraries on Solaris with Sun compiler.
- Fix installation of libraries that are required by installation
commands such as `ln' or `rm'.
- More robust parsing of mangled `.la' files inside libltdl, fixing a
commands such as 'ln' or 'rm'.
- More robust parsing of mangled '.la' files inside libltdl, fixing a
possible overrun and a crash due to memory exhaustion.
- Fix compile command line for gcj on MinGW.
- Some configure variables have been renamed to fix caching:
@ -500,9 +500,9 @@ New in 1.9d: 2004-10-03; CVS version 1.9c, Libtool team:
* When compiling C glue code with $LTCC, libtool now saves the setting of
$compiler_flags from the C tag, and passes those flags to $LTCC.
* libtool no longer dies when concurrently creating directories with
`make -j' on multi-processor hosts.
'make -j' on multi-processor hosts.
* Return type, and name parameter of lt_dlloader_remove are no longer
`const'.
'const'.
* Name parameter of lt_dlloader_find is no longer 'const'.
* The API for the slist ADT has been updated: slist_new has been replaced
by slist_box; slist_unbox and slist_sort are new; the footprint of
@ -537,18 +537,18 @@ New in 1.9b: 2004-08-29; CVS version 1.5a, Libtool team:
default. Use new --install option to get the old behaviour.
* libtoolize no longer supports the --ltdl-tar option.
* libtool script is now created by config.status. Instead of interrogating
`./libtool' from configure.ac after calling AC_PROG_LIBTOOL, use the
'./libtool' from configure.ac after calling AC_PROG_LIBTOOL, use the
variable names directly.
* libltdl is no longer a self-contained package, and shares configury with
the top level directory now.
* Shared objects (.lo) are no longer created when `-static' is passed in
* Shared objects (.lo) are no longer created when '-static' is passed in
compile mode.
* New compile mode option `-shared' prevents creation of static objects (.o).
* New link mode option `-shared' creates only shared libraries at link time.
* New compile mode option '-shared' prevents creation of static objects (.o).
* New link mode option '-shared' creates only shared libraries at link time.
* If you configure libtool with --disable-shared (or if libtool does not
support shared libraries on your platform) trying to build a library using
`-shared' is a fatal error.
* New link mode option `-weak' tells libtool when not to propogate dependency
'-shared' is a fatal error.
* New link mode option '-weak' tells libtool when not to propogate dependency
libraries from dlpreopened modules.
* libtoolize installs libtool.m4, (ltdl.m4 if used,) and various supporting
m4 definitions to AC_CONFIG_MACRO_DIR.
@ -606,10 +606,10 @@ New in 1.5.2: 2004-01-25; CVS version 1.5.0a, Libtool team:
* lt_dlrealloc is an official part of the libltdl API.
* --tag, --silent and --debug options are preserved and reused when libtool
calls itself for relinking etc.
* `-pthread' and similar options are honoured when linking shared libraries.
* '-pthread' and similar options are honoured when linking shared libraries.
* -no-suppress in compile mode shows compiler output for both PIC and non-PIC
object compilation.
* New link mode option `-precious-files-regex' to prevent accidental removal
* New link mode option '-precious-files-regex' to prevent accidental removal
of files you want to keep, such as test coverage data, from the temporary
output directory.
* Directories specified in /etc/ld.so.conf are no longer hardcoded on GNU/Linux.
@ -641,7 +641,7 @@ New in 1.4d: 2002-01-07; CVS version 1.4c, Libtool team:
* Help strings display correctly again.
* Better error messages when library linking fails.
* Better error messages from libltdl when loading fails.
* Better search path management in libltdl with `lt_dlinsertsearchdir' call.
* Better search path management in libltdl with 'lt_dlinsertsearchdir' call.
* Support /lib/w32api in recent cygwin releases.
* Support cross compilation to mingw.
* Support for .rc files (Windows resource compiler).
@ -676,7 +676,7 @@ New in 1.4b: 2001-07-09; CVS version 1.4a, Libtool team:
* Full support for C++ compiler.
* Support for GNU gcj compiler.
* libltdl can now load all modules in a given path according to user
supplied criteria with `lt_dlforeachfile' call.
supplied criteria with 'lt_dlforeachfile' call.
* Improved support for AIX ia64, djgpp, HPUX, hurd, OpenBSD, sco3.2*.
* Internal mutex handling no longer has namespace clashes on NCR MP-RAS.
* New pdemo and tagdemo tests.
@ -732,7 +732,7 @@ New in 1.3b: 1999-07-02; CVS version 1.3a, Libtool team:
* Allow linking shared libraries against static ones
on FreeBSD, GNU/Linux, GNU Hurd and Solaris
* Support for linking DLLs on Win32
* New `clean' mode to delete uninstalled files.
* New 'clean' mode to delete uninstalled files.
* New demos and tests
* Various bugfixes
@ -750,7 +750,7 @@ New in 1.3.4: 1999-12-08, CVS version 1.3.3a, Libtool team:
* Many fine bugfixes.
New in 1.3.3: 1999-07-02, CVS version 1.3.2a, Libtool team:
* New `-dlpreopen force' flag to ensure that
* New '-dlpreopen force' flag to ensure that
lt_preloaded_symbols is always defined.
* Work around self-dlclose bug in FreeBSD 3.1.
* Expand convenience libraries when creating reloadable objects.
@ -775,7 +775,7 @@ New in 1.3.1: 1999-05-21, CVS version 1.3.0a, Libtool team:
* Many AIX 4.3.2 test failures have gone.
* Pass unknown -L arguments through to the linker (for -LANG:* support).
* Close a security hole with mode 777 directory during libltdl installation.
* Fixed the infamous ``ifelse'' bug in libtool.m4
* Fixed the infamous 'ifelse' bug in libtool.m4
New in 1.3: 1999-04-29, Libtool team:
* This is just a summary of the changes since 1.2.
@ -870,11 +870,11 @@ New in 1.2d: 1998-12-16; CVS version 1.2c, Libtool team:
* New option -export-symbols to control symbol exporting when possible.
* Fixed -export-dynamic problem with C++ programs in egcs 1.1.
* New dlpreopen structure.
* libtool now supports `-c -o' and subdirectories in sources and
* libtool now supports '-c -o' and subdirectories in sources and
target object names even in platforms whose compilers do not support
this. In this case, file locking occurs to avoid problems with
parallel builds.
* New `echo' variant that should fix most problems with long command
* New 'echo' variant that should fix most problems with long command
lines and broken printf programs.
* Support for DG/UX, UnixWare 7.x and FreeBSD 3.0, and improved
support for Microsoft Windows
@ -896,11 +896,11 @@ New in 1.2b - 1998-07-01, Gordon Matzigkeit:
New in 1.2a - 1998-04-19, Gordon Matzigkeit:
* Bug fixes.
* ltconfig accepts an `--output' option to specify the name of the
* ltconfig accepts an '--output' option to specify the name of the
generated libtool.
* New `--debug' flag to turn on shell script tracing for libtool,
* New '--debug' flag to turn on shell script tracing for libtool,
libtoolize, and ltconfig.
* Added `libtool --config' to print out all configuration variables.
* Added 'libtool --config' to print out all configuration variables.
* Support for *-*-hpux11*.
New in 1.2 - 1998-03-20, Gordon Matzigkeit:
@ -911,35 +911,35 @@ New in 1.2 - 1998-03-20, Gordon Matzigkeit:
New in 1.1 - 1998-03-08, Gordon Matzigkeit:
* Bug fixes.
* http://www.profitpress.com/libtool/ is libtool's homepage.
* `AM_PROG_LIBTOOL' supports turning shared or static libraries off
with the `--enable-shared=PKGS' and `--enable-static=PKGS' configure
* 'AM_PROG_LIBTOOL' supports turning shared or static libraries off
with the '--enable-shared=PKGS' and '--enable-static=PKGS' configure
flags. See (libtool)AM_PROG_LIBTOOL.
* Use the `AM_DISABLE_SHARED' or `AM_DISABLE_STATIC' macros if you
wish to modify the default behaviour of `AM_PROG_LIBTOOL' for your
* Use the 'AM_DISABLE_SHARED' or 'AM_DISABLE_STATIC' macros if you
wish to modify the default behaviour of 'AM_PROG_LIBTOOL' for your
package.
* New rules for `AM_PROG_LD' to use gcc's `-print-prog-name' flag in
* New rules for 'AM_PROG_LD' to use gcc's '-print-prog-name' flag in
order to find ld, if possible.
* Suppress duplicate compiler output during `compile' mode.
* Deleted `dlname' mode. Dlopen applications should only use the
* Suppress duplicate compiler output during 'compile' mode.
* Deleted 'dlname' mode. Dlopen applications should only use the
runtime search method described in (libtool)Finding the dlname.
* Experimental support for dynamically loaded modules, even on
static-only platforms, via new `-dlopen' and `-dlpreopen' link
static-only platforms, via new '-dlopen' and '-dlpreopen' link
flags.
* `compile' mode honours the `-static' flag to prevent libtool
* 'compile' mode honours the '-static' flag to prevent libtool
from building PIC objects.
* New `execute' mode to support debugging uninstalled libtool
* New 'execute' mode to support debugging uninstalled libtool
libraries and executables.
* `-allow-undefined' is now the default. You can use `-no-undefined'
* '-allow-undefined' is now the default. You can use '-no-undefined'
to declare that a shared library is completely self-contained.
* Inter-library dependencies are automatically handled when linking
against an uninstalled `.la' file.
* New `-all-static' flag to prevent any dynamic linking. The regular
`-static' flag now just prevents dynamic linking of libtool libraries.
* New `-release' flag to encode release numbers into libtool
against an uninstalled '.la' file.
* New '-all-static' flag to prevent any dynamic linking. The regular
'-static' flag now just prevents dynamic linking of libtool libraries.
* New '-release' flag to encode release numbers into libtool
libraries. This breaks binary compatibility, but is useful for
libraries whose interfaces change very frequently. See
(libtool)Versioning.
* The `-rpath' flag can be used to hardcode absolute directories when
* The '-rpath' flag can be used to hardcode absolute directories when
linking executables using libtool.
* New robust quoting code to handle any metacharacters passed in
arguments to libtool commands.
@ -947,11 +947,11 @@ New in 1.1 - 1998-03-08, Gordon Matzigkeit:
can now be built with all working versions of GCC on AIX.
* Shell script speed optimizations for old and buggy /bin/sh systems,
such as HP-UX 9 and SunOS 4.1.4.
* Maybe use `_libs' as a temporary libtool directory instead of `.libs'
* Maybe use '_libs' as a temporary libtool directory instead of '.libs'
in order to cope with MS-DOS filenames.
* Portability fixes for Windows NT.
* Refuse to create libtool libraries that don't begin with `lib'.
This allows us to correctly handle OSes that don't have the `lib'
* Refuse to create libtool libraries that don't begin with 'lib'.
This allows us to correctly handle OSes that don't have the 'lib'
prefix by default, such as OS/2.
* Support for *-*-amigaos*, *-*-os2*, *-*-sysv4.2uw2*, and *-*-uts4*.
@ -962,14 +962,14 @@ New in 1.0 - 1997-07-08, Gordon Matzigkeit:
necessarily configure GCC to use it.
* Automake support for Libtool now uses the LTLIBRARIES primary. See
the Automake documentation for more information.
* Added new `--disable-static' flag to disable building static
* Added new '--disable-static' flag to disable building static
libraries on platforms that have shared libs.
* New `-allow-undefined' link flag to build shared libs that contain
* New '-allow-undefined' link flag to build shared libs that contain
references to unresolved symbols.
* Removed all support for creating static-only libraries.
* Basic support for dynamically loaded modules: new `-export-dynamic'
linking flag and corresponding `dlname' mode.
* New `--features' flag to display configured libtool attributes.
* Basic support for dynamically loaded modules: new '-export-dynamic'
linking flag and corresponding 'dlname' mode.
* New '--features' flag to display configured libtool attributes.
* Added support for installing libtool objects, both in absolute and
relative directories.
* Support *-*-linux-gnu* as an alias for *-*-linux*.
@ -985,7 +985,7 @@ New in 0.8 - 1997-01-26, Gordon Matzigkeit:
* Bug fixes, and more documentation.
* Basic support for other language compilers (C++, Fortran, and
preprocessed assembler).
* Libtool is now more persistent when linking with the `-static'
* Libtool is now more persistent when linking with the '-static'
flag fails.
* New test for hardcoding system linkers, to verify that libtool
neither creates incorrect binaries, nor takes unnecessary
@ -999,13 +999,13 @@ New in 0.7 - 1996-12-08, Gordon Matzigkeit:
* Completely rewritten documentation for the new paradigm.
* Sane handling of broken system linkers, such as the ones on AIX
and HP-UX.
* configure mode is now a separate program, `ltconfig'
* configure mode is now a separate program, 'ltconfig'
* The libinfo helper script has been incorporated into the main
libtool program.
* Automatic mode guessing, based on the command line.
* Full support for Automake 1.2 (including ansi2knr features).
* Support to create reloadable objects using link mode.
* Support for new `-static' linking flag.
* Support for new '-static' linking flag.
* Support for stripping libraries during installation.
* Library version information is now passed on the command line, not
through a version file.
@ -1029,9 +1029,9 @@ New in 0.5:
New in 0.4:
* Bug fixes and new regression tests
* On unsupported configurations, ``libtool configure'' demotes OBJTYPES to
`standard' instead of aborting
* Added new object type, `t', for tcov(1) support
* On unsupported configurations, 'libtool configure' demotes OBJTYPES to
'standard' instead of aborting
* Added new object type, 't', for tcov(1) support
* Support for *-*-aix3*, *-*-aix4*, *-*-hpux10*, *-*-osf3*, and *-*-solaris2*
New in 0.3:
@ -1042,7 +1042,7 @@ New in 0.3:
* Support for --no-whole-archive when needed by GNU ld (from Ulrich Drepper)
* Implementation of --enable-linktype, --enable-profile, --enable-shared,
--enable-static in gm_PROG_LIBTOOL macro
* New `libtoolize' program (modeled after GNU gettext's `gettextize') to help
* New 'libtoolize' program (modeled after GNU gettext's 'gettextize') to help
conversion to libtool
* New ABOUT-LIBS document for inclusion with libtool-supported packages
@ -1052,7 +1052,7 @@ New in 0.2:
* Reimplemented the config file so that it corresponds more closely to the
variables listed in (libtool)Porting Libtool.
* Reimplemented the shared library version scheme. See (libtool)Versioning.
* Replaced `--config-file' and `--version-file' options with `--confdir'
* Replaced '--config-file' and '--version-file' options with '--confdir'
* Added new install-libs and install-progs modes
New in 0.1:

2
PORTING
View File

@ -1,5 +1,5 @@
In order to port libtool to a new platform, start by reading the node
`New ports' in the info document (i.e., the libtool manual).
'New ports' in the info document (i.e., the libtool manual).
If you find that any porting documentation is missing, please
complain! :-) Complaints with patches and improvements to the

58
README
View File

@ -26,11 +26,11 @@ for a list of platforms that Libtool already supports.
Please try it on all the platforms you have access to:
* If it builds and passes the test suite (`gmake check'), please send
* If it builds and passes the test suite ('gmake check'), please send
a short note to the libtool mailing list <libtool@gnu.org> with a
subject line including the string `[PLATFORM]', and containing the
details from the end of `./libtool --help' in the body.
* Otherwise, see `Reporting Bugs' below for how to help us fix any
subject line including the string '[PLATFORM]', and containing the
details from the end of './libtool --help' in the body.
* Otherwise, see 'Reporting Bugs' below for how to help us fix any
problems you discover.
To use Libtool, add the new generic library building commands to your
@ -45,19 +45,19 @@ If this distribution doesn't work for you, before you report the
problem, at least try upgrading to the latest released version first,
and see whether the issue persists. If you feel able, you can also
check whether the issue has been fixed in the development sources for
the next release (see `Obtaining the Latest Sources' below).
the next release (see 'Obtaining the Latest Sources' below).
Once you've determined that your bug is still not fixed in the latest
version, please send a full report to <bug-libtool@gnu.org>, including:
1. the information from the end of the help message given by
`./libtool --help', and the verbose output of any failed tests
(see `The Test Suites' immediately below);
'./libtool --help', and the verbose output of any failed tests
(see 'The Test Suites' immediately below);
2. complete instructions for how to reproduce your bug, along with
the results you were expecting, and how they differ from what you
actually see;
3. a workaround or full fix for the bug, if you have it;
4. a copy of `tests/testsuite.log' if you are experiencing failures
4. a copy of 'tests/testsuite.log' if you are experiencing failures
in the Autotest testsuite.
5. new test cases for the testsuite that demonstrate the bug are
especially welcome, and will help to ensure that future releases
@ -70,7 +70,7 @@ new platform, please send email to the mailing list <libtool@gnu.org>.
Please note that if you send us an non-trivial code for inclusion in a
future release, we may ask you for a copyright assignment (for brief
details see the `Copyright Assignment' section on our `Contributing'
details see the 'Copyright Assignment' section on our 'Contributing'
webpage <http://www.gnu.org/software/libtool/contribute.html>).
@ -78,7 +78,7 @@ webpage <http://www.gnu.org/software/libtool/contribute.html>).
==================
Libtool comes with two integrated sets of tests to check that your build
is sane. You can run both test suites like this, assuming that `gmake'
is sane. You can run both test suites like this, assuming that 'gmake'
refers to GNU make:
gmake -k check
@ -111,9 +111,9 @@ can explore the state of the directory to help with debugging.
If you wish to report a test group failure to the libtool list, you need
to send the verbose output of the FAILing group, along with the
information from the end of `$(top_builddir)/libtool --help' to the bug
information from the end of '$(top_builddir)/libtool --help' to the bug
report mailing list, <bug-libtool@gnu.org> with a subject line that
includes the string `[TEST FAILURE]'. The file test-suite.log contains
includes the string '[TEST FAILURE]'. The file test-suite.log contains
the verbose output from all failed tests.
In order to enable debug shell tracing, you can set VERBOSE=debug when
@ -128,9 +128,9 @@ but simple help may also be obtained through:
gmake check-local TESTSUITEFLAGS='--help'
For verbose output, add the flag `-v', for running only a subset of the
For verbose output, add the flag '-v', for running only a subset of the
independent tests, merely specify them by number or by keyword, both of
which are displayed with the `--list' flag. For example, the `libtool'
which are displayed with the '--list' flag. For example, the 'libtool'
keyword is used for the tests that exercise only this script. So it is
possible to test an installed script, possibly from a different Libtool
release, with:
@ -141,7 +141,7 @@ release, with:
Some tests, like the one exercising max_cmd_len limits, make use of this
to invoke the testsuite recursively on a subset of tests. For these
tests, the variable INNER_TESTSUITEFLAGS may be used. It will be
expanded right after the `-k libtool', without separating whitespace, so
expanded right after the '-k libtool', without separating whitespace, so
that further limiting of the recursive set of tests is possible. For
example, to run only the template tests within the max_cmd_len, use:
@ -149,7 +149,7 @@ example, to run only the template tests within the max_cmd_len, use:
INNER_TESTSUITEFLAGS=',template -v -x'"
If you wish to report test failures to the libtool list, you need to
send the file `tests/testsuite.log' to the bug report mailing list,
send the file 'tests/testsuite.log' to the bug report mailing list,
<bug-libtool@gnu.org>.
@ -158,7 +158,7 @@ send the file `tests/testsuite.log' to the bug report mailing list,
* With the exception of ancient releases, all official GNU Libtool
releases have a detached GPG signature file. With this you can verify
that the corresponding file (i.e. without the `.sig' suffix) is the
that the corresponding file (i.e. without the '.sig' suffix) is the
same file that was released by the owner of it's GPG key ID. First,
be sure to download both the .sig file and the corresponding release,
then run a command like this:
@ -170,7 +170,7 @@ send the file `tests/testsuite.log' to the bug report mailing list,
gpg --keyserver keys.gnupg.net --recv-keys 2983D606
and then rerun the `gpg --verify' command.
and then rerun the 'gpg --verify' command.
* Official stable releases of GNU Libtool, along with these detached
signature files are available from:
@ -243,9 +243,9 @@ send the file `tests/testsuite.log' to the bug report mailing list,
- Autoconf 2.59 or later
- Automake 1.9.6 or later
* The `bootstrap' script sets up the source directory for you to hack,
* The 'bootstrap' script sets up the source directory for you to hack,
though it may take quite some time to run. If you don't intend to
re-run the test suite, you can speed up the `bootstrap' step by an
re-run the test suite, you can speed up the 'bootstrap' step by an
order of magnitude if you call it like this instead:
reconfdirs='. libltdl' ./bootstrap
@ -276,18 +276,18 @@ third number, so:
Version numbers are chosen to make it easy for users to decide two
things:
Q: How `developed' is this release?
Q: How 'developed' is this release?
A: The higher the number, the better!
Q: How `stable' is this release?
A: - If the <minor-number> is even, it is a stable release, `2.0'.
Q: How 'stable' is this release?
A: - If the <minor-number> is even, it is a stable release, '2.0'.
- If the <minor-number> is odd, it is a development version with
new features compared to the last stable release, `2.1a'.
- If it has an `odd'[1] letter after the version number, it is a
snapshot direct from CVS, `2.1a'.
- If it has an `even'[1] letter after the version number, it is an
alpha quality release, `2.1b'.
new features compared to the last stable release, '2.1a'.
- If it has an 'odd'[1] letter after the version number, it is a
snapshot direct from CVS, '2.1a'.
- If it has an 'even'[1] letter after the version number, it is an
alpha quality release, '2.1b'.
- If it has three numbers in the version, it is a patch release,
fixing bugs from the stable release (with no new features), `2.0.1'.
fixing bugs from the stable release (with no new features), '2.0.1'.
[1] We always increment the letter in the repository before *and* after
making a release tarball. This means that "odd" letters

22
TODO
View File

@ -19,7 +19,7 @@ GNU Libtool
* Work out what to do when the dynamic linker loads needed dependencies.
* We could have an option to hardcode paths into libraries, as well as
binaries: `... -Wl,-soname -Wl,/tmp/libtest.so.0 ...'. This is not
binaries: '... -Wl,-soname -Wl,/tmp/libtest.so.0 ...'. This is not
possible on all platforms, and is in part obviated by the ability of
linking libtool libraries specified with -lname, but it might still
be desirable.
@ -48,7 +48,7 @@ GNU Libtool
most packages that use pkg-config also use libtool, I think this
would be a good way to reduce maintainer and developer dependencies.
* Have libtoolize install `install-sh' if a newer version is available,
* Have libtoolize install 'install-sh' if a newer version is available,
and/or Automake is not used.
* Allow to specify linking some dependent libraries statically and some
@ -62,8 +62,8 @@ GNU Libtool
* Fix -dlopen "self" on AIX. Reported by Gary Kumfert <kumfert@llnl.gov>.
* Fix denial of service if using installed `libtool' on a different mount point
together with a compiler which does not understand `-c -o'.
* Fix denial of service if using installed 'libtool' on a different mount point
together with a compiler which does not understand '-c -o'.
Reported by Marcin Siennicki.
* Look at better -no-undefined support, maybe along the idea of
@ -80,7 +80,7 @@ GNU Libtool
* Fix the following bugs in libltdl:
- error reporting of tryall_dlopen():
if the file actually doesn't exist (stat() fails or it wasn't dlpreopened)
-> report `file not found'
-> 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
@ -113,10 +113,10 @@ GNU Libtool
------------------
* Need to finalize the documentation, and give a specification of
`.la' files so that people can depend on their format. This would be
'.la' files so that people can depend on their format. This would be
a good thing to put before the maintainance notes.
* Document the installed `libtool' and its limitations clearly (maybe implement
* Document the installed 'libtool' and its limitations clearly (maybe implement
--disable-script-install as well). Or, even better, remove its limitations.
* Platform notes redo.
@ -162,11 +162,11 @@ GNU Libtool
static libraries, we should probably create a .al out of .lo objects
and also a .a out of .o objects. The .al would only be used to create
shared libraries, whereas the .a would be used for creating static
libraries and programs. We could also explicitly support `empty'
libraries and programs. We could also explicitly support 'empty'
convenience libraries, that behave as macros that expand to a set of
-Rs, -Ls and -ls switches.
* Audit use of object names so we can allow `$' not only within
* Audit use of object names so we can allow '$' not only within
source file names. Necessary especially for java.
* We could introduce a mechanism to allow for soname rewriting, to
@ -188,7 +188,7 @@ GNU Libtool
* Audit the GCJ tag section in libtool.m4.
* Add caching mechanism. Look at `libtool-cache' from Robert Ögren.
* Add caching mechanism. Look at 'libtool-cache' from Robert Ögren.
2.4. libtool autoconf macros
@ -243,7 +243,7 @@ GNU Libtool
* Arrange that EXEEXT suffixes are stripped from wrapper script names
only when needed, and that a timestamp file or a wrapper program is
created with the EXEEXT suffix, so that `make' doesn't build it every
created with the EXEEXT suffix, so that 'make' doesn't build it every
time.
* Figure out how to use data items in dlls with win32.

460
bootstrap
View File

File diff suppressed because it is too large Load Diff

20
bootstrap.conf
View File

@ -91,8 +91,8 @@ gnulib_non_module_files=$gnulib_non_module_files'
# What ignore files to maintain.
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!
# Running the installed 'libtoolize' will trash the local (newer) libtool.m4
# among others. Don't use ':', since autoreconf can't exec it!
LIBTOOLIZE=true
# List of file droppings from old releases of Libtool.
@ -112,8 +112,8 @@ libtool_obsolete_files="
# func_reconfigure
# ------------------
# In addition to needing to autoreconf two directories, Libtool provides
# `libtoolize' and doesn't use `autopoint', so we can use a somewhat
# simpler `func_reconfigure' implementation than bootstrap's version.
# 'libtoolize' and doesn't use 'autopoint', so we can use a somewhat
# simpler 'func_reconfigure' implementation than bootstrap's version.
func_reconfigure ()
{
$debug_cmd
@ -231,7 +231,7 @@ libtool_force_changelog ()
{
$debug_cmd
echo "Autogenerated by \`make dist'" > ChangeLog || exit 1
echo "Autogenerated by 'make dist'" > ChangeLog || exit 1
}
func_add_hook func_gnulib_tool libtool_force_changelog
@ -249,7 +249,7 @@ libtool_readme_release_package_substitutions ()
my_readme=README-release
test -f "$my_readme" \
|| func_fatal_error "error: \`$my_readme' does not exist"
|| func_fatal_error "error: '$my_readme' does not exist"
# Perform substitutions to a temporary file
$SED -e "\
@ -291,9 +291,9 @@ func_add_hook func_fini libtool_cleanup
# libtool_check_for_bogus_macros
# ------------------------------
# Try to catch the case where `aclocal' pulls installed libtool macro
# Try to catch the case where 'aclocal' pulls installed libtool macro
# file contents from another version of libtool into the current package
# `aclocal.m4'.
# 'aclocal.m4'.
libtool_check_for_bogus_macros ()
{
$debug_cmd
@ -373,7 +373,7 @@ libtool_require_package_url ()
test -n "$package_url " || package_url=$5
test -n "$package_url" || {
# How to extract the parameters for `make bootstrap-deps' from
# How to extract the parameters for 'make bootstrap-deps' from
# configure.ac. This is very specific to the way Libtool's
# configure.ac layout.
sed_extract_package_url='s|#.*$||; s|^dnl .*$||; s| dnl .*$||;
@ -388,7 +388,7 @@ libtool_require_package_url ()
}
test -n "$package_url" \
|| func_fatal_error "unable to determine \`package_url' from \`$configure_ac'."
|| func_fatal_error "unable to determine 'package_url' from '$configure_ac'."
func_verbose "package_url='$package_url'"

12
build-aux/edit-readme-alpha
View File

@ -24,10 +24,10 @@
####
# We used to maintain separate (but extremely similiar!) README and
# README.alpha files, and had `make dist' include the right one in a
# distribution based on the contests of `$(VERSION)'.
# README.alpha files, and had 'make dist' include the right one in a
# distribution based on the contests of '$(VERSION)'.
#
# Now, we have `make dist' call this script to tweak the first paragraph
# Now, we have 'make dist' call this script to tweak the first paragraph
# of README in situ, to be more suitable for an alpha quality release.
EXIT_SUCCESS=0
@ -56,9 +56,9 @@ func_fatal_error ()
for file in "$@"; do
# Assume that read-only README indicates that we are running inside
# the latter part of a `make distcheck'.
# the latter part of a 'make distcheck'.
test -w "$file" || {
echo "$progname: not editing non-writeable \`$file' (distcheck?)" >&2
echo "$progname: not editing non-writeable '$file' (distcheck?)" >&2
continue
}
@ -73,7 +73,7 @@ for file in "$@"; do
|wc -l |sed 's|^ *||'`
test 3 = "$matched" \
|| func_fatal_error "$file format has changed, please fix \`$0'"
|| func_fatal_error "$file format has changed, please fix '$0'"
# Don't leave file droppings.
trap 'x=$?; rm $file.T; exit $x' 1 2 13 15

6
build-aux/git-hooks/commit-msg
View File

@ -72,7 +72,7 @@ fn_check_msg ()
grep "$CAB_re" "$log_file" 2>/dev/null \
|while read CAB; do
test 0 -eq `expr "$CAB" : ".*$email_re"` && {
echo "Malformed or missing email in \`$CAB'"
echo "Malformed or missing email in '$CAB'"
return_status=1
}
done
@ -89,14 +89,14 @@ fn_check_msg ()
# Make sure Copyright-paperwork-exempt line is valid.
if grep "$CPR_re[Nn]" "$log_file" >/dev/null 2>&1; then
$ECHO "\
\`Copyright-paperwork-exempt: No' is redundant, please remove."
'Copyright-paperwork-exempt: No' is redundant, please remove."
return_status=1
else
not_yes=`grep "$CPR_re" "$log_file" 2>/dev/null \
|grep -v "${CPR_re}Yes\$"`
test -n "$not_yes" && {
$ECHO "\`Copyright-paperwork-exempt' setting must be \`Yes'."
$ECHO "'Copyright-paperwork-exempt' setting must be 'Yes'."
return_status=1
}
fi

328
build-aux/ltmain.in
View File

File diff suppressed because it is too large Load Diff

39
cfg.mk
View File

@ -73,16 +73,23 @@ sc_libtool_m4_cc_basename:
@sed -n '/case \$$cc_basename in/,/esac/ { \
/^[ ]*[a-zA-Z][a-zA-Z0-9+]*[^*][ ]*)/p; \
}' '$(srcdir)/$(macro_dir)/libtool.m4' | grep . && { \
msg="\$$cc_basename matches should include a trailing \`*'." \
msg="\$$cc_basename matches should include a trailing '*'." \
$(_sc_say_and_exit) } || :
# Check for old-style `quoting'.
exclude_file_name_regexp--sc_old_style_quoting = (^bootstrap|^cfg.mk|\.texi)$$
sc_old_style_quoting:
@prohibit="^[^\`]*[^=]\`[^'\`]*[a-zA-Z0-9][^'\`]*'[^\`]*[^\\\`]$$" \
halt="quote 'like this' not \`like this' in comments and output" \
$(_sc_search_regexp)
# Check for uses of Xsed without corresponding echo "X
exclude_file_name_regexp--sc_prohibit_Xsed_without_X = ^cfg.mk$$
sc_prohibit_Xsed_without_X:
@files=$$($(VC_LIST_EXCEPT)); \
if test -n "$$files"; then \
grep -nE '\$$Xsed' $$files | grep -vE '(func_echo_all|\$$ECHO) \\*"X' && { \
msg='occurrences of `$$Xsed'\'' without `$$ECHO "X'\'' on the same line' \
msg="occurrences of '\$$Xsed' without '\$$ECHO "\""X' on the same line" \
$(_sc_say_and_exit) } || :; \
else :; \
fi || :
@ -90,19 +97,19 @@ sc_prohibit_Xsed_without_X:
# Use a consistent dirname and basename idiom.
sc_prohibit_bare_basename:
@prohibit='\|[ ]*\$$(base|dir)name' \
halt='use `|$$SED "$$basename"'\'' instead of `|$$basename'\' \
halt='use '\''|$$SED "$$basename"'\'' instead of '\''|$$basename'\' \
$(_sc_search_regexp)
sc_prohibit_basename_with_dollar_sed:
@prohibit='(base|dir)name="?(\$$SED|sed)[ "]' \
halt='use `basename='\''s|^.*/||'\'' instead of `basename="$$SED...' \
halt='use '\''basename='\''s|^.*/||'\'' instead of '\''basename="$$SED...' \
$(_sc_search_regexp)
# Check for using `[' instead of `test'.
# Check for using '[' instead of 'test'.
exclude_file_name_regexp--sc_prohibit_bracket_as_test = ^cfg.mk$$
sc_prohibit_bracket_as_test:
@prohibit='if[ ]+\[' \
halt="use \`if test' instead of \`if ['" \
halt="use 'if test' instead of 'if ['" \
$(_sc_search_regexp)
# Check for quotes within backquotes within quotes "`"bar"`"
@ -134,7 +141,7 @@ sc_prohibit_set_dummy_without_shift:
/\n.*shift/D; \
p; \
}' | grep -n . && { \
msg="use \`shift' after \`set dummy'" \
msg="use 'shift' after 'set dummy'" \
$(_sc_say_and_exit) } || :; \
else :; \
fi || :
@ -143,7 +150,7 @@ sc_prohibit_set_dummy_without_shift:
exclude_file_name_regexp--sc_prohibit_set_minus_minus = ^cfg.mk$$
sc_prohibit_set_minus_minus:
@prohibit='set[ ]+--[ ]+' \
halt="use \`set dummy ...' instead of \`set -- ...'" \
halt="use 'set dummy ...' instead of 'set -- ...'" \
$(_sc_search_regexp)
# Make sure there is no spurious whitespace before trailing semi-colons
@ -156,45 +163,45 @@ sc_prohibit_space_semicolon:
exclude_file_name_regexp--sc_prohibit_test_X = ^cfg.mk$$
sc_prohibit_test_X:
@prohibit='test[ ]+(![ ])?(-.[ ]+)?[Xx]["'\'']' \
halt='use `test "X..."'\'' instead of `test X"'\' \
halt='use '\''test "X..."'\'' instead of '\''test X"'\' \
$(_sc_search_regexp)
# Check for bad binary operators.
sc_prohibit_test_binary_operators:
@prohibit='if[ ]+["'\'']?\$$[^ ]+[ ]+(=|-[lg][te]|-eq|-ne)' \
halt="Use \`if test \$$something =' instead of \`if \$$something ='" \
halt="Use 'if test \$$something =' instead of 'if \$$something ='" \
$(_sc_search_regexp)
# Check for using test $... instead of test "$...
exclude_file_name_regexp--sc_prohibit_test_dollar = ^cfg.mk$$
sc_prohibit_test_dollar:
@prohibit='test[ ]+(![ ])?(-.[ ]+)?X?\$$[^?#]' \
halt='use `test "$$..."'\'' instead of `test $$'\' \
halt='use '\''test "$$..."'\'' instead of '\''test $$'\' \
$(_sc_search_regexp)
# Never use test -e.
exclude_file_name_regexp--sc_prohibit_test_minus_e = ^cfg.mk$$
sc_prohibit_test_minus_e:
@prohibit='test[ ]+(![ ])?-e' \
halt="use \`test -f' instead of \`test -e'" \
halt="use 'test -f' instead of 'test -e'" \
$(_sc_search_regexp)
# Check for bad unary operators.
sc_prohibit_test_unary_operators:
@prohibit='if[ ]+-[a-z]' \
halt="use \`if test -X' instead of \`if -X'" \
halt="use 'if test -X' instead of 'if -X'" \
$(_sc_search_regexp)
# Don't add noisy characters on the front of the left operand of a test
# to prevent arguments being passed inadvertently (e.g. LHS is `-z'),
# to prevent arguments being passed inadvertently (e.g. LHS is '-z'),
# when the other operand is a constant -- just swap them, and remove the
# spurious leading `x'.
# spurious leading 'x'.
sc_prohibit_test_const_follows_var:
@var='[ ]+"[^$$"]*\$$[0-9A-Za-z_][^"]*"' \
op='[ ]+(!?=|-[lgn][et]|-eq)' \
const='[ ]+[^-$$][^$$; ]*' \
prohibit='test'$$var$$op$$const'[ ]*(&&|\|\||;|\\?$$)' \
halt='use `test a = "$$b"'\'' instead of `test "x$$b" = xa'\' \
halt='use '\''test a = "$$b"'\'' instead of '\''test "x$$b" = xa'\' \
$(_sc_search_regexp)
# Check for opening brace on next line in shell function definition.

8
doc/libtool.texi
View File

@ -1056,14 +1056,14 @@ Libraries have been installed in:
/usr/local/lib
To link against installed libraries in a given directory, LIBDIR,
you must use the `-LLIBDIR' flag during linking.
you must use the '-LLIBDIR' flag during linking.
You will also need to do one of the following:
- add LIBDIR to the `LD_LIBRARY_PATH' environment variable
- add LIBDIR to the 'LD_LIBRARY_PATH' environment variable
during execution
- add LIBDIR to the `LD_RUN_PATH' environment variable
- add LIBDIR to the 'LD_RUN_PATH' environment variable
during linking
- use the `-RLIBDIR' linker flag
- use the '-RLIBDIR' linker flag
See any operating system documentation about shared libraries for
more information, such as the ld and ld.so manual pages.

312
gl/build-aux/bootstrap.in
View File

@ -47,7 +47,7 @@ scriptversion=2012-10-21.12; # UTC
# files under version control, but running all of the right tools
# with the right arguments, in the correct order to regenerate
# all of those files in readiness for configuration and building
# can be surprisingly involved! Many projects have a `bootstrap'
# can be surprisingly involved! Many projects have a 'bootstrap'
# script under version control to invoke Autotools and perform
# other assorted book-keeping with version numbers and the like.
#
@ -80,13 +80,13 @@ scriptversion=2012-10-21.12; # UTC
# All uppercase denotes values stored in the environment. These
# variables should generally be overridden by the user - however, we do
# set them to `true' in some parts of this script to prevent them being
# called at the wrong time by other tools that we call (`autoreconf',
# set them to 'true' in some parts of this script to prevent them being
# called at the wrong time by other tools that we call ('autoreconf',
# for example).
#
# We also allow `LIBTOOLIZE', `M4', `SHA1SUM' and some others to be
# We also allow 'LIBTOOLIZE', 'M4', 'SHA1SUM' and some others to be
# overridden, and export the result for child processes, but they are
# handled by the function `func_find_tool' and not defaulted in this
# handled by the function 'func_find_tool' and not defaulted in this
# section.
: ${ACLOCAL="aclocal"}
@ -124,17 +124,17 @@ export CONFIG_SHELL
## -------------- ##
# A newline delimited list of triples of programs (that respond to
# --version), the minimum version numbers required (or just `-' in the
# --version), the minimum version numbers required (or just '-' in the
# version field if any version will be sufficient) and homepage URLs
# to help locate missing packages.
buildreq=
# Name of a file containing instructions on installing missing packages
# required in `buildreq'.
# required in 'buildreq'.
buildreq_readme=README-hacking
# These are extracted from AC_INIT in configure.ac, though you can
# override those values in `bootstrap.conf' if you prefer.
# override those values in 'bootstrap.conf' if you prefer.
build_aux=
macro_dir=
package=
@ -142,9 +142,9 @@ package_name=
package_version=
package_bugreport=
# These are extracted from `gnulib-cache.m4', or else fall-back
# These are extracted from 'gnulib-cache.m4', or else fall-back
# automatically on the gnulib defaults; unless you set the values
# manually in `bootstrap.conf'.
# manually in 'bootstrap.conf'.
doc_base=
gnulib_mk=
gnulib_name=
@ -152,8 +152,8 @@ local_gl_dir=
source_base=
tests_base=
# The list of gnulib modules required at `gnulib-tool' time. If you
# check `gnulib-cache.m4' into your repository, then this list will be
# The list of gnulib modules required at 'gnulib-tool' time. If you
# check 'gnulib-cache.m4' into your repository, then this list will be
# extracted automatically.
gnulib_modules=
@ -206,7 +206,7 @@ extra_locale_categories=
# Additional xgettext options to use. Gnulib might provide you with an
# extensive list of additional options to append to this, but gettext
# 0.16.1 and newer appends them automaticaly, so you can safely ignore
# the complaints from `gnulib-tool' if your $configure_ac states:
# the complaints from 'gnulib-tool' if your $configure_ac states:
#
# AM_GNU_GETTEXT_VERSION([0.16.1])
xgettext_options="
@ -225,8 +225,8 @@ checkout_only_file=
# the --copy option has no effect).
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/',
# 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 "none" to ignore VCS ignore files entirely. Default is
@ -238,15 +238,15 @@ vc_ignore=
## Hookable functions. ##
## ------------------- ##
# 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
# 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 my_func'.
#
# You might notice that many of these functions begin with a series of
# `$require_foo' lines. See the docu-comments at the start of the
# `Resource management' section for a description of what these are.
# '$require_foo' lines. See the docu-comments at the start of the
# 'Resource management' section for a description of what these are.
# func_bootstrap [ARG]...
@ -258,7 +258,7 @@ func_bootstrap ()
$debug_cmd
# Save the current positional parameters to prevent them being
# corrupted by calls to `set' in `func_init'.
# corrupted by calls to 'set' in 'func_init'.
func_quote_for_eval ${1+"$@"}
_G_saved_positional_parameters=$func_quote_for_eval_result
@ -289,9 +289,9 @@ func_bootstrap ()
# func_init
# ---------
# Any early initialisations can be hooked to this function. Consider
# whether you can hook onto `func_prep' instead, because if you hook
# whether you can hook onto 'func_prep' instead, because if you hook
# any slow to execute code in here, it will also add to the time before
# `./bootstrap --version' can respond.
# './bootstrap --version' can respond.
func_hookable func_init
func_init ()
{
@ -304,8 +304,8 @@ func_init ()
# func_prep
# ---------
# Function to perform preparation for remaining bootstrap process. If
# your hooked code relies on the outcome of `func_options' hook it here
# rather than to `func_init'.
# your hooked code relies on the outcome of 'func_options' hook it here
# rather than to 'func_init'.
#
# All the functions called inside func_prep are hookable. See the
# individual implementations for details.
@ -355,18 +355,18 @@ func_reconfigure ()
{
$debug_cmd
# Released `autopoint' has the tendency to install macros that have
# been obsoleted in current `gnulib., so run this before `gnulib-tool'.
# Released 'autopoint' has the tendency to install macros that have
# been obsoleted in current 'gnulib., so run this before 'gnulib-tool'.
func_autopoint
# Autoreconf runs `aclocal' before `libtoolize', which causes spurious
# warnings if the initial `aclocal' is confused by the libtoolized
# Autoreconf runs 'aclocal' before 'libtoolize', which causes spurious
# warnings if the initial 'aclocal' is confused by the libtoolized
# (or worse: out-of-date) macro directory.
func_libtoolize
# If you need to do anything after `gnulib-tool' is done, but before
# `autoreconf' runs, you don't need to override this whole function,
# because `func_gnulib_tool' is hookable.
# If you need to do anything after 'gnulib-tool' is done, but before
# 'autoreconf' runs, you don't need to override this whole function,
# because 'func_gnulib_tool' is hookable.
func_gnulib_tool
func_autoreconf
@ -377,11 +377,11 @@ func_reconfigure ()
# func_gnulib_tool
# ----------------
# Run `gnulib-tool' to fetch gnulib modules into the current package.
# Run 'gnulib-tool' to fetch gnulib modules into the current package.
#
# It's assumed that since you are using gnulib's `bootstrap' script,
# It's assumed that since you are using gnulib's 'bootstrap' script,
# you're also using gnulib elsewhere in your package. If not, then
# you can replace this function in `bootstrap.conf' with:
# you can replace this function in 'bootstrap.conf' with:
#
# func_gnulib_tool () { :; }
#
@ -401,13 +401,13 @@ func_gnulib_tool ()
$require_build_aux
$require_macro_dir
# Try not to pick up any stale values from `gnulib-cache.m4'.
# Try not to pick up any stale values from 'gnulib-cache.m4'.
rm -f "$gnulib_cache"
gnulib_mode=--import
# `gnulib_modules' and others are maintained in `bootstrap.conf`:
# Use `gnulib --import` to fetch gnulib modules.
# 'gnulib_modules' and others are maintained in 'bootstrap.conf':
# Use 'gnulib --import' to fetch gnulib modules.
test -n "$build_aux" \
&& func_append_uniq gnulib_tool_options " --aux-dir=$build_aux"
test -n "$macro_dir" \
@ -428,8 +428,8 @@ func_gnulib_tool ()
}
else
# `gnulib_modules' and others are cached in `gnulib-cache.m4':
# Use `gnulib --update' to fetch gnulib modules.
# 'gnulib_modules' and others are cached in 'gnulib-cache.m4':
# Use 'gnulib --update' to fetch gnulib modules.
gnulib_mode=--update
fi
@ -455,7 +455,7 @@ func_gnulib_tool ()
func_show_eval "$gnulib_cmd" 'exit $?'
# Use `gnulib-tool --copy-file' to install non-module files.
# Use 'gnulib-tool --copy-file' to install non-module files.
func_install_gnulib_non_module_files
}
@ -535,14 +535,14 @@ func_gettext_configuration ()
## Core functions. ##
## --------------- ##
# This section contains the main functions called from the `Hookable
# This section contains the main functions called from the 'Hookable
# functions' (shown above), and are the ones you're most likely
# to want to replace with your own implementations in `bootstrap.conf'.
# to want to replace with your own implementations in 'bootstrap.conf'.
# func_autopoint
# --------------
# If this package uses gettext, then run `autopoint'.
# If this package uses gettext, then run 'autopoint'.
func_autopoint ()
{
$debug_cmd
@ -556,7 +556,7 @@ func_autopoint ()
# func_libtoolize
# ---------------
# If this package uses libtool, then run `libtoolize'.
# If this package uses libtool, then run 'libtoolize'.
func_libtoolize ()
{
$debug_cmd
@ -594,16 +594,16 @@ func_gnulib_tool_copy_file ()
# distribution tarball), make sure that at least we have some
# version of the required file already in place.
test -f "$2" || func_fatal_error "\
Can't find, copy or download \`$2', a required
Can't find, copy or download '$2', a required
gnulib supplied file, please provide the location of a
complete \`gnulib' tree by setting \`gnulib_path' in your
\`bootstrap.conf' or with the \`--gnulib-srcdir' option -
or else specify the location of your \`git' binary by
setting \`GIT' in the environment so that a fresh
\`gnulib' submodule can be cloned."
complete 'gnulib' tree by setting 'gnulib_path' in your
'bootstrap.conf' or with the '--gnulib-srcdir' option -
or else specify the location of your 'git' binary by
setting 'GIT' in the environment so that a fresh
'gnulib' submodule can be cloned."
else
test -f "$gnulib_path/$1" || {
func_error "\`$gnulib_path/$1' does not exist"
func_error "'$gnulib_path/$1' does not exist"
return 1
}
@ -632,7 +632,7 @@ func_install_gnulib_non_module_files ()
build-aux/missing) dest=
func_warning settings "\
Please remove build-aux/missing from gnulib_module_files in
\`bootstrap.conf', as it may clash with Automake's version."
'bootstrap.conf', as it may clash with Automake's version."
;;
build-aux/*) dest=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;;
*) dest=$file;;
@ -667,7 +667,7 @@ func_ensure_changelog ()
ChangeLog is generated by gitlog-to-changelog.
EOT
_G_message="creating dummy \`ChangeLog'"
_G_message="creating dummy 'ChangeLog'"
test -f ChangeLog~ \
&& func_append _G_message ' (backup in ChangeLog~)'
func_verbose "$_G_message"
@ -678,9 +678,9 @@ EOT
# func_autoreconf
# ---------------
# Being careful not to re-run `autopoint' or `libtoolize', and not to
# try to run `autopoint', `libtoolize' or `autoheader' on packages that
# don't use them, defer to `autoreconf' for execution of the remaining
# Being careful not to re-run 'autopoint' or 'libtoolize', and not to
# try to run 'autopoint', 'libtoolize' or 'autoheader' on packages that
# don't use them, defer to 'autoreconf' for execution of the remaining
# autotools to bootstrap this package.
func_autoreconf ()
{
@ -690,7 +690,7 @@ func_autoreconf ()
$require_build_aux # automake and others put files in here
$require_macro_dir # aclocal and others put files in here
# We ran these manually already, and autoreconf won't exec `:'
# We ran these manually already, and autoreconf won't exec ':'
save_AUTOPOINT=$AUTOPOINT; AUTOPOINT=true
save_LIBTOOLIZE=$LIBTOOLIZE; LIBTOOLIZE=true
@ -716,10 +716,10 @@ func_check_configuration ()
$require_configure_ac
eval 'test -n "$'$1'"' || {
_G_error_msg="please set \`$1' in \`bootstrap.conf'"
_G_error_msg="please set '$1' in 'bootstrap.conf'"
if test -n "$configure_ac" && test -n "$2"; then
func_append _G_error_msg "
or add the following (or similar) to your \`$configure_ac':
or add the following (or similar) to your '$configure_ac':
$2"
fi
@ -757,10 +757,10 @@ func_clean_dangling_symlinks ()
# ------------------------
# Autopoint can result in over-zealously adding macros into $macro_dir
# even though they are not actually used, for example tests to help
# build the `intl' directory even though you have specified
# `AM_GNU_GETTEXT([external])' in your configure.ac. This function
# build the 'intl' directory even though you have specified
# 'AM_GNU_GETTEXT([external])' in your configure.ac. This function
# looks removes any macro files that can be found in gnulib, but
# are not `m4_include'd by `aclocal.m4'.
# are not 'm4_include'd by 'aclocal.m4'.
func_clean_unused_macros ()
{
$debug_cmd
@ -771,7 +771,7 @@ func_clean_unused_macros ()
test -n "$gnulib_path" && test -f aclocal.m4 && {
aclocal_m4s=`find . -name aclocal.m4 -print`
# We use `ls|grep' instead of `ls *.m4' to avoid exceeding
# We use 'ls|grep' instead of 'ls *.m4' to avoid exceeding
# command line length limits in some shells.
for file in `cd "$macro_dir" && ls -1 |grep '\.m4$'`; do
@ -782,13 +782,13 @@ func_clean_unused_macros ()
# ...and there is an identical file in gnulib...
if func_cmp_s "$gnulib_path/m4/$file" "$macro_dir/$file"; then
# ...and it's not in the precious list (`echo' is needed
# ...and it's not in the precious list ('echo' is needed
# here to squash whitespace for the match expression).
case " "`echo $gnulib_precious`" " in
*" $file "*) ;;
*) rm -f "$macro_dir/$file"
func_verbose \
"removing unused gnulib file \`$macro_dir/$file'"
"removing unused gnulib file '$macro_dir/$file'"
esac
fi
}
@ -799,8 +799,8 @@ func_clean_unused_macros ()
# func_skip_po_recommendation
# ---------------------------
# If there is a po directory, and `--skip-po' wasn't passed, let the
# user know that they can use `--skip-po' on subsequent invocations.
# If there is a po directory, and '--skip-po' wasn't passed, let the
# user know that they can use '--skip-po' on subsequent invocations.
func_skip_po_recommendation ()
{
$debug_cmd
@ -809,7 +809,7 @@ func_skip_po_recommendation ()
|| $opt_skip_po \
|| func_warning recommend "\
If your pofiles are up-to-date, you can rerun bootstrap
as \`$progname --skip-po' to avoid redownloading."
as '$progname --skip-po' to avoid redownloading."
}
@ -843,9 +843,9 @@ func_update_dotversion ()
# particular resource (a file, or a non-empty configuration variable for
# example) is available, and if appropriate to extract default values
# from pertinent package files. Where a variable already has a non-
# empty value (as set by the package's `bootstrap.conf'), that value is
# empty value (as set by the package's 'bootstrap.conf'), that value is
# used in preference to deriving the default. Call them using their
# associated `require_*' variable to ensure that they are executed, at
# associated 'require_*' variable to ensure that they are executed, at
# most, once.
@ -862,7 +862,7 @@ func_require_checkout_only_file ()
test -n "$checkout_only_file" && test ! -f "$checkout_only_file" \
&& func_fatal_error "\
Bootstrapping from a non-checked-out distribution is risky.
If you wish to bootstrap anyway, use the \`--force' option."
If you wish to bootstrap anyway, use the '--force' option."
}
require_checkout_only_file=:
@ -871,8 +871,8 @@ If you wish to bootstrap anyway, use the \`--force' option."
# require_aclocal_amflags
# -----------------------
# Ensure `$aclocal_amflags' has a sensible default, extracted from
# `Makefile.am' if necessary.
# Ensure '$aclocal_amflags' has a sensible default, extracted from
# 'Makefile.am' if necessary.
require_aclocal_amflags=func_require_aclocal_amflags
func_require_aclocal_amflags ()
{
@ -972,10 +972,10 @@ func_require_bootstrap_uptodate ()
done
if $_G_missing_bootstrap_sources; then
func_warning upgrade '
func_warning upgrade "\
Please add bootstrap to your gnulib_modules list in
`bootstrap.conf'\'', so that I can tell you when there are
updates available.'
'bootstrap.conf', so that I can tell you when there are
updates available."
else
$build_aux/inline-source $build_aux/bootstrap.in > bootstrap.new
@ -983,16 +983,16 @@ updates available.'
rm -f bootstrap.new
func_verbose "bootstrap script up to date"
else
func_warning upgrade '
func_warning upgrade "\
An updated bootstrap script has been generated for you in
`bootstrap.new'\''. After you'\''ve verified that you want
'bootstrap.new'. After you've verified that you want
the changes, you can update with:
cat bootstrap.new > '$progname'
./'$progname'
cat bootstrap.new > $progname
./$progname
Or you can disable this check permanently by adding the
following to `bootstrap.conf'\'':
require_bootstrap_uptodate=:'
following to 'bootstrap.conf':
require_bootstrap_uptodate=:"
fi
fi
@ -1002,7 +1002,7 @@ following to `bootstrap.conf'\'':
# require_build_aux
# -----------------
# Ensure that `$build_aux' is set, and if it doesn't already point to an
# Ensure that '$build_aux' is set, and if it doesn't already point to an
# existing directory, create one.
require_build_aux=func_require_build_aux
func_require_build_aux ()
@ -1050,7 +1050,7 @@ func_require_buildreq_autobuild ()
test -n "$func_extract_trace_result" && {
func_append buildreq 'autobuild - http://josefsson.org/autobuild/
'
func_verbose "auto-adding \`autobuild' to build requirements"
func_verbose "auto-adding 'autobuild' to build requirements"
}
}
@ -1063,7 +1063,7 @@ func_require_buildreq_autobuild ()
# require_buildreq_libtoolize
# ---------------------------
# Try to find the minimum compatible version of autoconf/libtool
# required to bootstrap successfully, and add it to `$buildreq'.
# required to bootstrap successfully, and add it to '$buildreq'.
for tool in autoconf libtoolize autopoint; do
b=$tool
v=require_buildreq_${tool}
@ -1091,7 +1091,7 @@ for tool in autoconf libtoolize autopoint; do
'$tool' $_G_version http://www.gnu.org/s/'$b'
"
func_verbose \
"auto-adding \`'$tool'-$_G_version'\'' to build requirements"
"auto-adding '\'$tool'-'$_G_version\'' to build requirements"
}
}
@ -1104,7 +1104,7 @@ done
# require_buildreq_automake
# -------------------------
# Try to find the minimum compatible version of automake required to
# bootstrap successfully, and add it to `$buildreq'.
# bootstrap successfully, and add it to '$buildreq'.
require_buildreq_automake=func_require_buildreq_automake
func_require_buildreq_automake ()
{
@ -1124,7 +1124,7 @@ func_require_buildreq_automake ()
automake $automake_version http://www.gnu.org/s/automake
"
func_verbose \
"auto-adding \`automake-$automake_version' to build requirements"
"auto-adding 'automake-$automake_version' to build requirements"
}
}
@ -1199,7 +1199,7 @@ $buildreq_readme explains how to obtain these prerequisite programs:
# require_copyright_holder
# ------------------------
# Ensure there is a sensible non-empty default value in `$copyright_holder'.
# Ensure there is a sensible non-empty default value in '$copyright_holder'.
require_copyright_holder=func_require_copyright_holder
func_require_copyright_holder ()
{
@ -1208,8 +1208,8 @@ func_require_copyright_holder ()
test -n "$copyright_holder" || {
copyright_holder='Free Software Foundation, Inc.'
func_warning settings "\
Please set copyright_holder explicitly in \`bootstrap.conf';
defaulting to \`$copyright_holder'."
Please set copyright_holder explicitly in 'bootstrap.conf';
defaulting to '$copyright_holder'."
}
require_copyright_holder=:
@ -1218,7 +1218,7 @@ defaulting to \`$copyright_holder'."
# require_dotgitmodules
# ---------------------
# Ensure we have a `.gitmodules' file, with appropriate `gnulib' settings.
# Ensure we have a '.gitmodules' file, with appropriate 'gnulib' settings.
require_dotgitmodules=func_require_dotgitmodules
func_require_dotgitmodules ()
{
@ -1233,7 +1233,7 @@ func_require_dotgitmodules ()
test -n "$_G_path" || {
$require_vc_ignore_files
func_verbose "creating \`.gitmodules'"
func_verbose "creating '.gitmodules'"
# If the .gitmodules file doesn't exist, create it now, and mark
# it as ignored for the VCS.
@ -1257,14 +1257,14 @@ func_require_dotgitmodules ()
# require_extra_locale_categories
# -------------------------------
# Ensure there is a default value in `$extra_locale_categories'
# Ensure there is a default value in '$extra_locale_categories'
require_extra_locale_categories=func_require_extra_locale_categories
func_require_extra_locale_categories ()
{
$debug_cmd
# Defaults to empty, so run with whatever value may have been set in
# `bootstrap.conf'.
# 'bootstrap.conf'.
require_extra_locale_categories=:
}
@ -1293,7 +1293,7 @@ func_require_git ()
# require_gnulib_cache
# --------------------
# Ensure there is a non-empty default for `$gnulib_cache', and that it
# Ensure there is a non-empty default for '$gnulib_cache', and that it
# names an existing file.
require_gnulib_cache=func_require_gnulib_cache
func_require_gnulib_cache ()
@ -1305,7 +1305,7 @@ func_require_gnulib_cache ()
test -n "$gnulib_cache" \
|| gnulib_cache=$macro_dir/gnulib-cache.m4
func_verbose "found \`$gnulib_cache'"
func_verbose "found '$gnulib_cache'"
require_gnulib_cache=:
}
@ -1342,8 +1342,8 @@ func_require_gnulib_merge_changelog ()
# require_gnulib_mk
# -----------------
# Ensure gnulib_mk has a sensible value, extracted from `gnulib-cache.m4'
# if possible, otherwise letting `gnulib-tool' pick a default.
# Ensure gnulib_mk has a sensible value, extracted from 'gnulib-cache.m4'
# if possible, otherwise letting 'gnulib-tool' pick a default.
require_gnulib_mk=func_require_gnulib_mk
func_require_gnulib_mk ()
{
@ -1366,7 +1366,7 @@ func_require_gnulib_mk ()
# require_gnulib_path
# require_gnulib_url
# -------------------
# Ensure `gnulib_path' and `gnulib_url' are set.
# Ensure 'gnulib_path' and 'gnulib_url' are set.
require_gnulib_path=func_require_dotgitmodules_parameters
require_gnulib_url=func_require_dotgitmodules_parameters
func_require_dotgitmodules_parameters ()
@ -1376,9 +1376,9 @@ func_require_dotgitmodules_parameters ()
$require_git
test true = "$GIT" && {
# If we can't find git (or if the user specified `--skip-git'),
# If we can't find git (or if the user specified '--skip-git'),
# then use an existing gnulib directory specified with
# `--gnulib-srcdir' if possible.
# '--gnulib-srcdir' if possible.
test -n "$gnulib_path" \
|| test ! -x "$opt_gnulib_srcdir/gnulib-tool" \
|| gnulib_path=$opt_gnulib_srcdir
@ -1413,7 +1413,7 @@ func_require_dotgitmodules_parameters ()
# require_gnulib_submodule
# ------------------------
# Ensure that there is a current gnulib submodule at `$gnulib_path'.
# Ensure that there is a current gnulib submodule at '$gnulib_path'.
require_gnulib_submodule=func_require_gnulib_submodule
func_require_gnulib_submodule ()
{
@ -1423,7 +1423,7 @@ func_require_gnulib_submodule ()
if test true = "$GIT"; then
func_warning recommend \
"No \`git' found; imported gnulib modules may be outdated."
"No 'git' found; imported gnulib modules may be outdated."
else
$require_gnulib_path
$require_gnulib_url
@ -1468,8 +1468,8 @@ func_require_gnulib_submodule ()
# require_gnulib_tool
# -------------------
# Ensure that `$gnulib_tool' is set, and points to an executable file,
# or else fall back to using the binary `true' if the main gnulib
# Ensure that '$gnulib_tool' is set, and points to an executable file,
# or else fall back to using the binary 'true' if the main gnulib
# files appear to have been imported already.
require_gnulib_tool=func_require_gnulib_tool
func_require_gnulib_tool ()
@ -1487,11 +1487,11 @@ func_require_gnulib_tool ()
test -x "$gnulib_tool" || {
gnulib_tool=true
func_warning recommend \
"No \`gnulib-tool' found; gnulib modules may be missing."
"No 'gnulib-tool' found; gnulib modules may be missing."
}
test true = "$gnulib_tool" \
|| func_verbose "found \`$gnulib_tool'"
|| func_verbose "found '$gnulib_tool'"
}
require_gnulib_tool=:
@ -1507,8 +1507,8 @@ func_require_libtoolize ()
$debug_cmd
# Unless we're not searching for libtool use by this package, set
# LIBTOOLIZE to true if none of `LT_INIT', `AC_PROG_LIBTOOL' and
# `AM_PROG_LIBTOOL' are used in configure.
# LIBTOOLIZE to true if none of 'LT_INIT', 'AC_PROG_LIBTOOL' and
# 'AM_PROG_LIBTOOL' are used in configure.
test true = "$LIBTOOLIZE" || {
func_extract_trace LT_INIT
test -n "$func_extract_trace_result" || func_extract_trace AC_PROG_LIBTOOL
@ -1534,14 +1534,14 @@ func_require_libtoolize ()
# require_macro_dir
# -----------------
# Ensure that `$macro_dir' is set, and if it doesn't already point to an
# Ensure that '$macro_dir' is set, and if it doesn't already point to an
# existing directory, create one.
require_macro_dir=func_require_macro_dir
func_require_macro_dir ()
{
$debug_cmd
# Sometimes this is stored in `configure.ac'.
# Sometimes this is stored in 'configure.ac'.
test -n "$macro_dir" || {
# AC_CONFIG_MACRO_DIRS takes a space delimited list of directories,
# but we only care about the first one in bootstrap.
@ -1553,7 +1553,7 @@ func_require_macro_dir ()
macro_dir=$func_extract_trace_first_result
}
# Otherwise we might find it in `Makefile.am'.
# Otherwise we might find it in 'Makefile.am'.
test -n "$macro_dir" || {
$require_aclocal_amflags
@ -1590,7 +1590,7 @@ func_require_macro_dir ()
# require_makefile_am
# -------------------
# Ensure there is a `Makefile.am' in the current directory.
# Ensure there is a 'Makefile.am' in the current directory.
# names an existing file.
require_makefile_am=func_require_makefile_am
func_require_makefile_am ()
@ -1602,7 +1602,7 @@ func_require_makefile_am ()
<"$makefile_am"
func_verbose "found \`$makefile_am'"
func_verbose "found '$makefile_am'"
require_makefile_am=:
}
@ -1610,7 +1610,7 @@ func_require_makefile_am ()
# require_package
# ---------------
# Ensure that `$package' contains a sensible default value.
# Ensure that '$package' contains a sensible default value.
require_package=func_require_package
func_require_package ()
{
@ -1631,7 +1631,7 @@ func_require_package ()
# require_package_bugreport
# -------------------------
# Ensure that this has a sensible value, extracted from `configure.ac'
# Ensure that this has a sensible value, extracted from 'configure.ac'
# if appropriate (and possible!).
require_package_bugreport=func_require_package_bugreport
func_require_package_bugreport ()
@ -1657,7 +1657,7 @@ func_require_package_bugreport ()
# require_package_name
# --------------------
# Ensure that this has a sensible value, extracted from `configure.ac'
# Ensure that this has a sensible value, extracted from 'configure.ac'
# if appropriate (and possible!).
require_package_name=func_require_package_name
func_require_package_name ()
@ -1683,11 +1683,11 @@ func_require_package_name ()
# require_package_version
# -----------------------
# Ensure that this has a sensible value, extracted from `configure.ac'
# Ensure that this has a sensible value, extracted from 'configure.ac'
# if appropriate (and possible!). While we might have set all the
# parameters extracted from AC_INIT at once, `package_version' in
# parameters extracted from AC_INIT at once, 'package_version' in
# particular is not necessarily available as early as the others, since
# `git-version-gen' is often involved, and until then we can't rely on
# 'git-version-gen' is often involved, and until then we can't rely on
# getting a correct version number from an AC_INIT extraction.
require_package_version=func_require_package_version
func_require_package_version ()
@ -1709,7 +1709,7 @@ func_require_package_version ()
*" git-version-gen "*)
func_fatal_error "\
cannot \$require_package_version in bootstrap.conf before
func_gnulib_tool has installed the \`git-version-gen' script."
func_gnulib_tool has installed the 'git-version-gen' script."
;;
*)
func_check_configuration package_version \
@ -1750,7 +1750,7 @@ func_require_patch ()
# require_source_base
# -------------------
# Ensure that source_base has a sensible value, extracted from
# `gnulib-cache.m4' if possible.
# 'gnulib-cache.m4' if possible.
require_source_base=func_require_source_base
func_require_source_base ()
{
@ -1774,8 +1774,8 @@ func_require_source_base ()
# require_vc_ignore_files
# -----------------------
# Ensure that `$vc_ignore' has been processed to list VCS ignore files
# in `$vc_ignore_files'
# Ensure that '$vc_ignore' has been processed to list VCS ignore files
# in '$vc_ignore_files'
require_vc_ignore_files=func_require_vc_ignore_files
func_require_vc_ignore_files ()
{
@ -1801,7 +1801,7 @@ func_require_vc_ignore_files ()
## Helper functions. ##
## ------------------##
# This section contains the helper functions used by the rest of `bootstrap'.
# This section contains the helper functions used by the rest of 'bootstrap'.
# func_len STRING
# ---------------
@ -1829,10 +1829,10 @@ fi
# func_unset VAR
# --------------
# Portably unset VAR.
# In some shells, an `unset VAR' statement leaves a non-zero return
# In some shells, an 'unset VAR' statement leaves a non-zero return
# status if VAR is already unset, which might be problematic if the
# statement is used at the end of a function (thus poisoning its return
# value) or when `set -e' is active (causing even a spurious abort of
# value) or when 'set -e' is active (causing even a spurious abort of
# the script in this case).
func_unset ()
{
@ -1850,7 +1850,7 @@ func_cmp_s ()
$debug_cmd
# This function relies on non-zero exit status, which will cause the
# program to exit when running in `set -e' mode.
# program to exit when running in 'set -e' mode.
$CMP "$@" >/dev/null 2>&1
}
@ -1864,7 +1864,7 @@ func_grep_q ()
$debug_cmd
# This function relies on non-zero exit status, which will cause the
# program to exit when running in `set -e' mode.
# program to exit when running in 'set -e' mode.
$GREP "$@" >/dev/null 2>&1
}
@ -1963,9 +1963,9 @@ func_strrow ()
# valued WIDTH arguments following INDENT. The next set (i.e. a number
# of arguments equal to the number of WIDTH arguments) of fields are
# treated as the table's column HEADERs, and are separated from the
# remainder of the table by an indented row of `-' characters. Remaining
# remainder of the table by an indented row of '-' characters. Remaining
# arguments are each aligned below the next available header, wrapping
# to a new row as necessary. Finally another row of `-' characters is
# to a new row as necessary. Finally another row of '-' characters is
# added to mark the end of the table.
#
# For example an unindented 3 column table with 2 rows of data would be
@ -2006,7 +2006,7 @@ func_strtable ()
done
func_strrow $_G_header
# Strip off the indent, and make a divider with `-' chars, then
# Strip off the indent, and make a divider with '-' chars, then
# reindent.
_G_divider=`$bs_echo "$func_strrow_result" \
|$SED 's|[^ ]|-|g
@ -2046,7 +2046,7 @@ func_internal_error ()
{
func_fatal_error "\
INTERNAL: " ${1+"$@"} "
Please report this bug to \`bug-gnulib@gnu.org'
Please report this bug to 'bug-gnulib@gnu.org'
in as much detail as possible."
}
@ -2059,7 +2059,7 @@ func_permissions_error ()
{
$debug_cmd
func_fatal_error "Failed to create \`$1', check permissions."
func_fatal_error "Failed to create '$1', check permissions."
}
@ -2142,7 +2142,7 @@ func_insert_sorted_if_absent ()
test -f "$file" || touch "$file"
func_grep_q "$str" "$file" \
&& func_verbose "inserting \`$str' into \`$file'"
&& func_verbose "inserting '$str' into '$file'"
$bs_echo "$str" |sort -u - "$file" |func_cmp_s - "$file" \
|| $bs_echo "$str" |sort -u - "$file" -o "$file" \
@ -2153,7 +2153,7 @@ func_insert_sorted_if_absent ()
# func_sort_ver VER1 VER2
# -----------------------
# `sort -V' is not generally available.
# 'sort -V' is not generally available.
# Note this deviates from the version comparison in automake
# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
# but this should suffice as we won't be specifying old
@ -2257,11 +2257,11 @@ func_check_versions ()
_G_instver=`func_get_version $_G_app`
test -z "$_G_instver" \
|| func_verbose "found \`$_G_app' version $_G_instver"
|| func_verbose "found '$_G_app' version $_G_instver"
# Fail if --version didn't work.
if test -z "$_G_instver"; then
func_error "\`$_G_app' not found"
func_error "'$_G_app' not found"
func_check_versions_result=false
# Fail if a new version than what we have is required.
@ -2269,8 +2269,8 @@ func_check_versions ()
_G_newer=`func_sort_ver $_G_reqver $_G_instver |cut -d' ' -f2`
test "$_G_newer" != "$_G_instver" && {
func_error "\
\`$_G_app' version == $_G_instver is too old
\`$_G_app' version >= $_G_reqver is required"
'$_G_app' version == $_G_instver is too old
'$_G_app' version >= $_G_reqver is required"
func_check_versions_result=false
}
fi
@ -2359,9 +2359,9 @@ func_update_po_files ()
usage='$progpath [OPTION]...'
# Short help message in response to `-h'. Add to this in `bootstrap.conf'
# Short help message in response to '-h'. Add to this in 'bootstrap.conf'
# if you accept any additional options.
usage_message='Common Bootstrap Options:
usage_message="Common Bootstrap Options:
-c, --copy copy files instead of creating symbolic links.
--debug enable verbose shell tracing
-n, --dry-run print commands rather than running them
@ -2370,10 +2370,10 @@ usage_message='Common Bootstrap Options:
--gnulib-srcdir=DIRNAME
specify a local directory where gnulib sources
reside. Use this if you already have the gnulib
sources on your machine, and don'\''t want to waste
sources on your machine, and don't want to waste
your bandwidth downloading them again. Defaults to
\$GNULIB_SRCDIR.
--no-warnings equivalent to \`-Wnone'\''
--no-warnings equivalent to '-Wnone'
--skip-git do not fetch files from remote repositories
--skip-po do not download po files.
-v, --verbose verbosely report processing
@ -2381,15 +2381,15 @@ usage_message='Common Bootstrap Options:
-W, --warnings=CATEGORY
report the warnings falling in CATEGORY [all]
-h, --help print short or long help message and exit
'
"
# Additional text appended to `usage_message' in response to `--help'.
# Additional text appended to 'usage_message' in response to '--help'.
long_help_message=$long_help_message"
\`recommend' show warnings about missing recommended packages
\`settings' show warnings about missing \`$progname.conf' settings
\`upgrade' show warnings about out-dated files
'recommend' show warnings about missing recommended packages
'settings' show warnings about missing '$progname.conf' settings
'upgrade' show warnings about out-dated files
If the file \`$progname.conf' exists in the same directory as this
If the file '$progname.conf' exists in the same directory as this
script, its contents are read as shell variables to configure the
bootstrap.
@ -2399,8 +2399,8 @@ For build prerequisites, environment variables like \$AUTOCONF and
Running without arguments will suffice in most cases.
"
# Warning categories used by `bootstrap', append others if you use them
# in your `bootstrap.conf'.
# Warning categories used by 'bootstrap', append others if you use them
# in your 'bootstrap.conf'.
warning_categories='recommend settings upgrade'
@ -2492,7 +2492,7 @@ func_add_hook func_validate_options bootstrap_validate_options
## -------------------------------------------------- ##
## Source package customisations in `bootstrap.conf'. ##
## Source package customisations in 'bootstrap.conf'. ##
## -------------------------------------------------- ##
# Override the default configuration, if necessary.

48
gl/build-aux/extract-trace
View File

@ -34,10 +34,10 @@ scriptversion=2012-10-07.10; # UTC
## Usage. ##
## ------ ##
# Run `./extract-trace --help' for help with using this script from the
# Run './extract-trace --help' for help with using this script from the
# command line.
#
# Or source first `options-parser' and then this file into your own
# Or source first 'options-parser' and then this file into your own
# scripts in order to make use of the function and variable framework
# they define, and also to avoid the overhead of forking to run this
# script in its own process on every call.
@ -49,7 +49,7 @@ scriptversion=2012-10-07.10; # UTC
## ------------------##
# This section contains the helper functions used by the rest of
# `extract-trace'.
# 'extract-trace'.
# func_autoconf_configure MAYBE-CONFIGURE-FILE
@ -72,7 +72,7 @@ func_autoconf_configure ()
_G_status=$?
test 0 -ne "$_G_status" \
&& func_verbose "\`$1' not using Autoconf"
&& func_verbose "'$1' not using Autoconf"
(exit $_G_status)
}
@ -105,7 +105,7 @@ func_find_tool ()
fi
if test -n "$_G_find_tool_res"; then
func_tool_version_output >/dev/null $_G_find_tool_res "\
${_G_find_tool_error_prefix}Cannot run \`$_G_find_tool_res --version'"
${_G_find_tool_error_prefix}Cannot run '$_G_find_tool_res --version'"
# Make sure the result is exported to the environment for children
# to use.
@ -121,12 +121,12 @@ One of these is required:
# func_tool_version_output CMD [FATAL-ERROR-MSG]
# ----------------------------------------------
# Attempt to run `CMD --version', discarding errors. The output can be
# Attempt to run 'CMD --version', discarding errors. The output can be
# ignored by redirecting stdout, and this function used simply to test
# whether the command exists and exits normally when passed a
# `--version' argument.
# '--version' argument.
# When FATAL-ERROR-MSG is given, then this function will display the
# message and exit if running `CMD --version' returns a non-zero exit
# message and exit if running 'CMD --version' returns a non-zero exit
# status.
func_tool_version_output ()
{
@ -135,10 +135,10 @@ func_tool_version_output ()
_G_cmd=$1
_G_fatal_error_msg=$2
# Some tools, like `git2cl' produce thousands of lines of output
# Some tools, like 'git2cl' produce thousands of lines of output
# unless stdin is /dev/null - in that case we want to return
# successfully without saving all of that output. Other tools,
# such as `help2man' exit with a non-zero status when stdin comes
# such as 'help2man' exit with a non-zero status when stdin comes
# from /dev/null, so we re-execute without /dev/null if that
# happens. This means that occasionally, the output from both calls
# ends up in the result, but the alternative would be to discard the
@ -161,9 +161,9 @@ func_tool_version_output ()
# particular resource (a file, or a non-empty configuration variable for
# example) is available, and if appropriate to extract default values
# from pertinent package files. Where a variable already has a non-
# empty value (as set by the package's `bootstrap.conf'), that value is
# empty value (as set by the package's 'bootstrap.conf'), that value is
# used in preference to deriving the default. Call them using their
# associated `require_*' variable to ensure that they are executed, at
# associated 'require_*' variable to ensure that they are executed, at
# most, once.
#
# It's entirely deliberate that calling these functions can set
@ -174,9 +174,9 @@ func_tool_version_output ()
# require_configure_ac
# --------------------
# Ensure that there is a `configure.ac' or `configure.in' file in the
# Ensure that there is a 'configure.ac' or 'configure.in' file in the
# current directory which contains an uncommented call to AC_INIT, and
# that `$configure_ac' contains its name.
# that '$configure_ac' contains its name.
require_configure_ac=func_require_configure_ac
func_require_configure_ac ()
{
@ -187,7 +187,7 @@ func_require_configure_ac ()
test -z "$configure_ac" \
&& func_autoconf_configure configure.in && configure_ac=configure.in
test -z "$configure_ac" \
|| func_verbose "found \`$configure_ac'"
|| func_verbose "found '$configure_ac'"
require_configure_ac=:
}
@ -207,7 +207,7 @@ func_require_gnu_m4 ()
}
test -n "$M4" || func_fatal_error "\
Please install GNU M4, or \`export M4=/path/to/gnu/m4'."
Please install GNU M4, or 'export M4=/path/to/gnu/m4'."
func_verbose "export M4='$M4'"
@ -223,15 +223,15 @@ Please install GNU M4, or \`export M4=/path/to/gnu/m4'."
## --------------- ##
# This section contains the high level functions used when calling this
# file as a script. `func_extract_trace' is probably the only one that you
# file as a script. 'func_extract_trace' is probably the only one that you
# won't want to replace if you source this file into your own script.
# func_extract_trace MACRO_NAMES [FILENAME]...
# --------------------------------------------
# set `$func_extract_trace_result' to a colon delimited list of arguments
# set '$func_extract_trace_result' to a colon delimited list of arguments
# to any of the comma separated list of MACRO_NAMES in FILENAME. If no
# FILENAME is given, then `$configure_ac' is assumed.
# FILENAME is given, then '$configure_ac' is assumed.
func_extract_trace ()
{
$debug_cmd
@ -250,11 +250,11 @@ func_extract_trace ()
# Generate an error if the first file is missing
<"$1"
# Sadly, we can't use `autom4te' tracing to extract macro arguments,
# Sadly, we can't use 'autom4te' tracing to extract macro arguments,
# because it complains about things we want to ignore at bootstrap
# time - like missing m4_include files; AC_PREREQ being newer than
# the installed autoconf; and returns nothing when tracing
# `AM_INIT_AUTOMAKE' when aclocal hasn't been generated yet.
# 'AM_INIT_AUTOMAKE' when aclocal hasn't been generated yet.
#
# The following tries to emulate a less persnickety version of (and
# due to not having to wait for Perl startup on every invocation,
@ -266,7 +266,7 @@ func_extract_trace ()
# it for reading Autoconf macros, while still providing some of the
# functionality generally used at m4-time to supply dynamic
# arguments to Autocof functions, but without following
# `m4_s?include' files.
# 'm4_s?include' files.
_G_mini='
# Initialisation.
m4_changequote([,])
@ -352,7 +352,7 @@ func_extract_trace ()
# --------------------------------------------------
# Exactly like func_extract_trace, except that only the first argument
# to the first invocation of one of the comma separated MACRO_NAMES is
# returned in `$func_extract_trace_first_result`.
# returned in '$func_extract_trace_first_result'.
func_extract_trace_first ()
{
$debug_cmd
@ -405,7 +405,7 @@ on a separate line.'
## Actually perform the trace. ##
## --------------------------- ##
# Only call `func_main' if this script was called directly.
# Only call 'func_main' if this script was called directly.
test extract-trace = "$progname" && func_main "$@"
# Local variables:

42
gl/build-aux/funclib.sh
View File

@ -84,7 +84,7 @@ nl='
'
IFS=" $sp$nl"
# There are still modern systems that have problems with `echo' mis-
# There are still modern systems that have problems with 'echo' mis-
# handling backslashes, among others, so make sure $bs_echo is set to a
# command that correctly interprets backslashes.
# (this code from Autoconf 2.68)
@ -171,11 +171,11 @@ sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
# (escaped) backslashes. A very naive implementation.
sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
# Re-`\' parameter expansions in output of sed_double_quote_subst that
# were `\'-ed in input to the same. If an odd number of `\' preceded a
# Re-'\' parameter expansions in output of sed_double_quote_subst that
# were '\'-ed in input to the same. If an odd number of '\' preceded a
# '$' in input to sed_double_quote_subst, that '$' was protected from
# expansion. Since each input `\' is now two `\'s, look for any number
# of runs of four `\'s followed by two `\'s and then a '$'. `\' that '$'.
# expansion. Since each input '\' is now two '\'s, look for any number
# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'.
_G_bs='\\'
_G_bs2='\\\\'
_G_bs4='\\\\\\\\'
@ -194,12 +194,12 @@ sed_double_backslash="\
# Except for the global variables explicitly listed below, the following
# functions in the '^func_' namespace, and the '^require_' namespace
# variables initialised in the `Resource management' section, sourcing
# variables initialised in the 'Resource management' section, sourcing
# this file will not pollute your global namespace with anything
# else. There's no portable way to scope variables in Bourne shell
# though, so actually running these functions will sometimes place
# results into a variable named after the function, and often use
# temporary variables in the `^_G_' namespace. If you are careful to
# temporary variables in the '^_G_' namespace. If you are careful to
# avoid using those namespaces casually in your sourcing script, things
# should continue to work as you expect. And, of course, you can freely
# overwrite any of the functions or variables defined here before
@ -211,7 +211,7 @@ EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
# Allow overriding, eg assuming that you follow the convention of
# putting `$debug_cmd' at the start of all your functions, you can get
# 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 your-script-name
@ -271,19 +271,19 @@ opt_dry_run=false
opt_quiet=false
opt_verbose=false
# Categories `all' and `none' are always available. Append any others
# Categories 'all' and 'none' are always available. Append any others
# you will pass as the first argument to func_warning from your own
# code.
warning_categories=
# By default, display warnings according to `opt_warning_types'. Set
# `warning_func' to `:' to elide all warnings, or func_fatal_error to
# By default, display warnings according to 'opt_warning_types'. Set
# 'warning_func' to ':' to elide all warnings, or func_fatal_error to
# treat the next displayed warning as a fatal error.
warning_func=func_warn_and_continue
# Set to `all' to display all warnings, `none' to suppress all
# Set to 'all' to display all warnings, 'none' to suppress all
# warnings, or a space delimited list of some subset of
# `warning_categories' to display only the listed warnings.
# 'warning_categories' to display only the listed warnings.
opt_warning_types=all
@ -295,7 +295,7 @@ opt_warning_types=all
# particular resource (a file, or a non-empty configuration variable for
# example) is available, and if appropriate to extract default values
# from pertinent package files. Call them using their associated
# `require_*' variable to ensure that they are executed, at most, once.
# 'require_*' variable to ensure that they are executed, at most, once.
#
# It's entirely deliberate that calling these functions can set
# variables that don't obey the namespace limitations obeyed by the rest
@ -659,7 +659,7 @@ func_mkdir_p ()
if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
# Protect directory names starting with `-'
# Protect directory names starting with '-'
case $_G_directory_path in
-*) _G_directory_path=./$_G_directory_path ;;
esac
@ -681,7 +681,7 @@ func_mkdir_p ()
func_mkdir_p_IFS=$IFS; IFS=:
for _G_dir in $_G_dir_list; do
IFS=$func_mkdir_p_IFS
# mkdir can fail with a `File exist' error if two processes
# 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 "$_G_dir" 2>/dev/null || :
@ -690,7 +690,7 @@ func_mkdir_p ()
# Bail out if we (or some other process) failed to create a directory.
test -d "$_G_directory_path" || \
func_fatal_error "Failed to create \`$1'"
func_fatal_error "Failed to create '$1'"
fi
}
@ -726,7 +726,7 @@ func_mktempdir ()
# If we're not in dry-run mode, bomb out on failure
test -d "$_G_tmpdir" || \
func_fatal_error "cannot create temporary directory \`$_G_tmpdir'"
func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
fi
$ECHO "$_G_tmpdir"
@ -892,7 +892,7 @@ func_relative_path ()
func_append func_relative_path_result "/$func_stripname_result"
fi
# Normalisation. If bindir is libdir, return `.' else relative path.
# Normalisation. If bindir is libdir, return '.' else relative path.
if test -n "$func_relative_path_result"; then
func_stripname './' '' "$func_relative_path_result"
func_relative_path_result=$func_stripname_result
@ -1122,7 +1122,7 @@ func_warn_and_continue ()
# Echo program name prefixed warning message to standard error. Warning
# messages can be filtered according to CATEGORY, where this function
# elides messages where CATEGORY is not listed in the global variable
# `opt_warning_types'.
# 'opt_warning_types'.
func_warning ()
{
$debug_cmd
@ -1130,7 +1130,7 @@ func_warning ()
# CATEGORY must be in the warning_categories list!
case " $warning_categories " in
*" $1 "*) ;;
*) func_internal_error "invalid warning category \`$1'" ;;
*) func_internal_error "invalid warning category '$1'" ;;
esac
_G_category=$1

10
gl/build-aux/inline-source
View File

@ -38,12 +38,14 @@ scriptversion=2012-10-11.10; # UTC
## Usage. ##
## ------ ##
# Run `build-aux/inline-source --help' for help with using this script
# Run 'build-aux/inline-source --help' for help with using this script
# from the command line.
# Recursively scan through a FILE passed on the command line, replacing
# `. "relative/file"' or `. `echo "$0" |edit`"relative/file"` with the
# contents of the referenced files.
# either of the following:
# . "relative/file"
# . `echo "$0" |edit`"relative/file"
# with the contents of the referenced files.
## ---------------- ##
@ -52,7 +54,7 @@ scriptversion=2012-10-11.10; # UTC
usage='$progpath [OPTION]... FILE'
# Short help message in response to `-h'.
# Short help message in response to '-h'.
usage_message='Options:
--debug enable verbose shell tracing
--version print version information and exit

58
gl/build-aux/options-parser
View File

@ -44,23 +44,23 @@ scriptversion=2012-10-21.11; # UTC
# eval set dummy "$func_options_result"; shift
# ...rest of your script...
#
# In order for the `--version' option to work, you will need to have a
# In order for the '--version' option to work, you will need to have a
# suitably formatted comment like the one at the top of this file
# starting with '# Written by ' and ending with '# warranty; '.
#
# For `-h' and `--help' to work, you will also need a one line
# For '-h' and '--help' to work, you will also need a one line
# description of your script's purpose in a comment directly above the
# '# Written by ' line, like the one at the top of this file.
#
# The default options also support `--debug', which will turn on shell
# The default options also support '--debug', which will turn on shell
# execution tracing (see the comment above debug_cmd below for another
# use), and `--verbose' and the func_verbose function to allow your script
# use), and '--verbose' and the func_verbose function to allow your script
# to display verbose messages only when your user has specified
# `--verbose'.
# '--verbose'.
#
# After sourcing this file, you can plug processing for additional
# options by amending the variables from the `Configuration' section
# below, and following the instructions in the `Option parsing'
# options by amending the variables from the 'Configuration' section
# below, and following the instructions in the 'Option parsing'
# section further down.
## -------------- ##
@ -71,14 +71,14 @@ scriptversion=2012-10-21.11; # UTC
# file so that they reflect the customisations you have added to the
# option parser.
# The usage line for option parsing errors and the start of `-h' and
# `--help' output messages. You can embed shell variables for delayed
# The usage line for option parsing errors and the start of '-h' and
# '--help' output messages. You can embed shell variables for delayed
# expansion at the time the message is displayed, but you will need to
# quote other shell meta-characters carefully to prevent them being
# expanded when the contents are evaled.
usage='$progpath [OPTION]...'
# Short help message in response to `-h' and `--help'. Add to this or
# Short help message in response to '-h' and '--help'. Add to this or
# override it after sourcing this library to reflect the full set of
# options your script accepts.
usage_message="\
@ -90,15 +90,15 @@ usage_message="\
-h, --help print short or long help message and exit
"
# Additional text appended to `usage_message' in response to `--help'.
# Additional text appended to 'usage_message' in response to '--help'.
long_help_message="
Warning categories include:
\`all' show all warnings
\`none' turn off all the warnings
\`error' warnings are treated as fatal errors"
'all' show all warnings
'none' turn off all the warnings
'error' warnings are treated as fatal errors"
# Help message printed before fatal option parsing errors.
fatal_help='Try \`$progname --help'\'' for more information.'
fatal_help="Try '\$progname --help' for more information."
@ -113,7 +113,7 @@ fatal_help='Try \`$progname --help'\'' for more information.'
# func_hookable FUNC_NAME
# -----------------------
# Declare that FUNC_NAME will run hooks added with
# `func_add_hook FUNC_NAME ...'.
# 'func_add_hook FUNC_NAME ...'.
func_hookable ()
{
$debug_cmd
@ -125,14 +125,14 @@ func_hookable ()
# func_add_hook FUNC_NAME HOOK_FUNC
# ---------------------------------
# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must
# first have been declared "hookable" by a call to `func_hookable'.
# first have been declared "hookable" by a call to 'func_hookable'.
func_add_hook ()
{
$debug_cmd
case " $hookable_fns " in
*" $1 "*) ;;
*) func_fatal_error "\`$1' does not accept hook functions." ;;
*) func_fatal_error "'$1' does not accept hook functions." ;;
esac
eval func_append ${1}_hooks '" $2"'
@ -163,7 +163,7 @@ func_run_hooks ()
case " $hookable_fns " in
*" $1 "*) ;;
*) func_fatal_error "\`$1' does not support hook funcions.n" ;;
*) func_fatal_error "'$1' does not support hook funcions.n" ;;
esac
eval _G_hook_fns=\$$1_hooks; shift
@ -172,7 +172,7 @@ func_run_hooks ()
eval $_G_hook '"$@"'
# store returned options list back into positional
# parameters for next `cmd' execution.
# parameters for next 'cmd' execution.
eval _G_hook_result=\$${_G_hook}_result
eval set dummy "$_G_hook_result"; shift
done
@ -190,8 +190,8 @@ func_run_hooks ()
# In order to add your own option parsing hooks, you must accept the
# full positional parameter list in your hook function, remove any
# options that you action, and then pass back the remaining unprocessed
# options in `<hooked_function_name>_result', escaped suitably for
# `eval'. Like this:
# options in '<hooked_function_name>_result', escaped suitably for
# 'eval'. Like this:
#
# my_options_prep ()
# {
@ -240,7 +240,7 @@ func_run_hooks ()
# $debug_cmd
#
# $opt_silent && $opt_verbose && func_fatal_help "\
# \`--silent' and \`--verbose' options are mutually exclusive."
# '--silent' and '--verbose' options are mutually exclusive."
#
# func_quote_for_eval ${1+"$@"}
# my_option_validation_result=$func_quote_for_eval_result
@ -281,7 +281,7 @@ func_options ()
# Note that when calling hook functions, we pass through the list of
# positional parameters. If a hook function modifies that list, and
# needs to propogate that back to rest of this script, then the complete
# modified list must be put in `func_run_hooks_result' before
# modified list must be put in 'func_run_hooks_result' before
# returning.
func_hookable func_options_prep
func_options_prep ()
@ -354,7 +354,7 @@ func_parse_options ()
;;
*)
func_fatal_error \
"unsupported warning category: \`$1'"
"unsupported warning category: '$1'"
;;
esac
shift
@ -389,7 +389,7 @@ func_parse_options ()
;;
--) break ;;
-*) func_fatal_help "unrecognised option: \`$_G_opt'" ;;
-*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
*) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
esac
done
@ -467,7 +467,7 @@ func_missing_arg ()
{
$debug_cmd
func_error "Missing argument for \`$1'."
func_error "Missing argument for '$1'."
exit_cmd=exit
}
@ -475,7 +475,7 @@ func_missing_arg ()
# func_split_equals STRING
# ------------------------
# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
# splitting STRING at the `=' sign.
# splitting STRING at the '=' sign.
test -z "$_G_HAVE_XSI_OPS" \
&& (eval 'x=a/b/c;
test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
@ -541,7 +541,7 @@ func_usage ()
$debug_cmd
func_usage_message
$bs_echo "Run \`$progname --help |${PAGER-more}' for full usage"
$bs_echo "Run '$progname --help |${PAGER-more}' for full usage"
exit 0
}

4
libltdl/libltdl/slist.h
View File

@ -31,7 +31,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
/* A generalised list. This is deliberately transparent so that you
can make the NEXT field of all your chained data structures first,
and then cast them to `(SList *)' so that they can be manipulated
and then cast them to '(SList *)' so that they can be manipulated
by this API.
Alternatively, you can generate raw SList elements using slist_new(),
@ -57,7 +57,7 @@ extern "C" {
typedef struct slist {
struct slist *next; /* chain forward pointer*/
const void *userdata; /* for boxed `SList' item */
const void *userdata; /* for boxed 'SList' item */
} SList;
typedef void * SListCallback (SList *item, void *userdata);

4
libltdl/loaders/loadlibrary.c
View File

@ -173,8 +173,8 @@ vm_open (lt_user_data LT__UNUSED loader_data, const char *filename,
ext = strrchr (wpath, '.');
if (!ext)
{
/* Append a `.' to stop Windows from adding an
implicit `.dll' extension. */
/* Append a '.' to stop Windows from adding an
implicit '.dll' extension. */
if (!len)
len = strlen (wpath);

2
libltdl/ltdl.c
View File

@ -1519,7 +1519,7 @@ try_dlopen (lt_dlhandle *phandle, const char *filename, const char *ext,
}
/* If the last error message stored was `FILE_NOT_FOUND', then return
/* If the last error message stored was 'FILE_NOT_FOUND', then return
non-zero. */
static int
file_not_found (void)

4
libltdl/slist.c
View File

@ -345,7 +345,7 @@ slist_sort (SList *slist, SListCompare *compare, void *userdata)
used for the boxes. It us usually a very bad idea to mix boxed and
non-boxed items in a single list. */
/* Return a `boxed' freshly mallocated 1 element list containing
/* Return a 'boxed' freshly mallocated 1 element list containing
USERDATA. */
SList *
slist_box (const void *userdata)
@ -361,7 +361,7 @@ slist_box (const void *userdata)
return item;
}
/* Return the contents of a `boxed' ITEM, recycling the box itself. */
/* Return the contents of a 'boxed' ITEM, recycling the box itself. */
void *
slist_unbox (SList *item)
{

176
libtoolize.in
View File

@ -25,7 +25,7 @@
## Usage. ##
## ------ ##
# Run `./libtoolize --help` for help with using this script from the
# Run './libtoolize --help' for help with using this script from the
# command line.
@ -73,15 +73,15 @@ scriptversion='(GNU @PACKAGE@) @VERSION@'
usage='$progpath [OPTION]...'
# Short help message in response to `-h'.
usage_message='Options:
# Short help message in response to '-h'.
usage_message="Options:
-c, --copy copy files rather than symlinking them
--debug enable verbose shell tracing
-n, --dry-run print commands rather than running them
-f, --force replace existing files
-i, --install copy missing auxiliary files
--ltdl[=DIR] install libltdl sources [default: libltdl]
--no-warnings equivalent to \`-Wnone'\''
--no-warnings equivalent to '-Wnone'
--nonrecursive prepare ltdl for non-recursive make
-q, --quiet work silently
--recursive prepare ltdl for recursive make
@ -91,12 +91,12 @@ usage_message='Options:
-W, --warnings=CATEGORY
report the warnings falling in CATEGORY [all]
-h, --help print short or long help message
'
"
# Additional text appended to `usage_message' in response to `--help'.
# Additional text appended to 'usage_message' in response to '--help'.
long_help_message=$long_help_message"
\`environment' show warnings about LIBTOOLIZE_OPTIONS content
\`file' show warnings about file copying and linking
'environment' show warnings about LIBTOOLIZE_OPTIONS content
'file' show warnings about file copying and linking
The following space or comma delimited options can be passed to $progname
via the environment variable LIBTOOLIZE_OPTIONS, unknown environment
@ -107,8 +107,8 @@ options are ignored:
--quiet work silently
--verbose verbosely report processing
You must \`cd' to the top directory of your package before you run
\`$progname'.
You must 'cd' to the top directory of your package before you run
'$progname'.
When reporting a bug, please describe a test case to reproduce it and
include the following information:
@ -144,8 +144,8 @@ libtoolize_environment_options ()
--debug|--no-warn|--no-warning|--no-warnings|--quiet|--verbose)
envopts="${envopts+$envopts }$opt" ;;
--*) env_warning="${env_warning+$env_warning
}unrecognized environment option \`$opt'" ;;
*) func_fatal_help "garbled LIBTOOLIZE_OPTIONS near \`$opt'" ;;
}unrecognized environment option '$opt'" ;;
*) func_fatal_help "garbled LIBTOOLIZE_OPTIONS near '$opt'" ;;
esac
done
@ -283,7 +283,7 @@ libtoolize_validate_options ()
# any remaining arguments are an error
test 0 -lt $# &&
func_fatal_help "unknown additional arguments: \`${1+$@}'"
func_fatal_help "unknown additional arguments: '${1+$@}'"
# Pass back the empty argument list
func_quote_for_eval ${1+"$@"}
@ -353,7 +353,7 @@ func_notquiet_error_hdr ()
# func_copy FILENAME SRCDIR DESTDIR [MSG_VAR [FILTER]]
# ----------------------------------------------------
# If option `--copy' was specified, or soft-linking SRCFILE to DESTFILE
# If option '--copy' was specified, or soft-linking SRCFILE to DESTFILE
# fails, then try to copy SRCFILE to DESTFILE (making sure to update the
# timestamp so that a series of files with dependencies can be copied
# in the right order that their timestamps won't trigger rebuilds). If
@ -374,7 +374,7 @@ func_copy ()
# Libtool is probably misinstalled if this happens:
test -f "$my_srcfile" || {
func_notquiet_error_hdr "$my_msg_var" "\`$my_srcfile' not found"
func_notquiet_error_hdr "$my_msg_var" "'$my_srcfile' not found"
return 1
}
@ -382,11 +382,11 @@ func_copy ()
$opt_force && $RM "$my_destfile"
test -f "$my_destfile" && {
func_notquiet_error_hdr "$my_msg_var" \
"\`$my_destfile' exists: use \`--force' to overwrite"
"'$my_destfile' exists: use '--force' to overwrite"
return 1
}
# Be careful to support `func_copy dir/target srcbase destbase'.
# Be careful to support 'func_copy dir/target srcbase destbase'.
func_dirname "$my_destfile"
func_mkdir_p "$func_dirname_result"
@ -402,16 +402,16 @@ func_copy ()
if $opt_verbose; then
func_notquiet "$SED -e '$my_filter' $my_srcfile > $my_destfile"
else
func_notquiet "creating file \`$my_destfile'"
func_notquiet "creating file '$my_destfile'"
fi
else
func_notquiet_error_hdr "$my_msg_var" "creating \`$my_destfile' from \`$my_srcfile' failed"
func_notquiet_error_hdr "$my_msg_var" "creating '$my_destfile' from '$my_srcfile' failed"
return 1
fi
return 0
fi
# Otherwise copy or link according to `--copy' option.
# Otherwise copy or link according to '--copy' option.
if $opt_copy; then
my_copycmd=$CP
my_copy_type=copying
@ -419,7 +419,7 @@ func_copy ()
my_copycmd=$LN_S
my_copy_type=linking
fi
my_copy_msg="$my_copy_type file \`$my_destfile'"
my_copy_msg="$my_copy_type file '$my_destfile'"
$opt_verbose && my_copy_msg="$my_copycmd $my_srcfile $my_destdir"
if $opt_dry_run || {
@ -431,7 +431,7 @@ func_copy ()
func_notquiet_hdr "$my_msg_var" "$my_copy_msg"
else
func_notquiet_error_hdr "$my_msg_var" \
"$my_copy_type \`$my_srcdir/$my_filename' to \`$my_destdir/' failed"
"$my_copy_type '$my_srcdir/$my_filename' to '$my_destdir/' failed"
return 1
fi
}
@ -526,7 +526,7 @@ func_serial_max ()
func_serial_max_result=
test "X$1$2" = X`$ECHO "$1$2" | $SED "$my_sed_digits"` || {
func_error "serial numbers \`$1' or \`$2' contain non-digit chars"
func_error "serial numbers '$1' or '$2' contain non-digit chars"
return
}
@ -574,7 +574,7 @@ func_serial_update_check ()
if test -f "$my_destfile"; then
test 0 = "$my_src_serial" && {
func_warning file "no serial number on \`$my_srcfile', not copying."
func_warning file "no serial number on '$my_srcfile', not copying."
return
}
@ -583,12 +583,12 @@ func_serial_update_check ()
test "X$my_src_serial" = "X$func_serial_max_result" || my_update_p=false
test "X$my_src_serial" = "X$func_serial_max_result" \
&& func_verbose "\`$my_srcfile' is serial $my_src_serial, greater than $my_dest_serial in \`$my_destfile'"
&& func_verbose "'$my_srcfile' is serial $my_src_serial, greater than $my_dest_serial in '$my_destfile'"
if test "X$my_dest_serial" = "X$func_serial_max_result"; then
func_verbose "\`$my_srcfile' is serial $my_src_serial, less than $my_dest_serial in \`$my_destfile'"
func_verbose "'$my_srcfile' is serial $my_src_serial, less than $my_dest_serial in '$my_destfile'"
$opt_force || if test -n "$ac_macro_dir$ac_ltdl_dir"; then
func_error "\`$my_destfile' is newer: use \`--force' to overwrite"
func_error "'$my_destfile' is newer: use '--force' to overwrite"
fi
fi
fi
@ -643,7 +643,7 @@ func_aclocal_update_check ()
# ------------------------------------------------------------------------------
# Copy the FILENAME from a SRCDIR to DESTDIR provided that either FILENAME
# has a newer serial number, or DESTFILE does not yet exist, or the user
# specified `--force' at the command line. If given, MACRO_REGEX or
# specified '--force' at the command line. If given, MACRO_REGEX or
# OLD_MACRO_REGEX must match any text after "# serial N" in both files.
func_serial_update ()
{
@ -661,7 +661,7 @@ func_serial_update ()
my_srcfile=$my_srcdir/$my_filename
my_destfile=$my_destdir/$my_filename
test -f "$my_srcfile" || func_fatal_error "\`$my_srcfile' does not exist."
test -f "$my_srcfile" || func_fatal_error "'$my_srcfile' does not exist."
if test -f "$my_destfile"; then
my_src_serial=`func_serial "$my_srcfile" "$my_macro_regex"`
@ -685,12 +685,12 @@ func_serial_update ()
func_copy "$my_filename" "$my_srcdir" "$my_destdir" "$my_msg_var"
my_return_status=$?
elif $opt_force && test "X$my_dest_serial" = "X$my_src_serial"; then
func_notquiet_hdr "$my_msg_var" "\`$my_destfile' is already up to date."
func_notquiet_hdr "$my_msg_var" "'$my_destfile' is already up to date."
fi
# Do this after the copy for hand maintained `aclocal.m4', incase
# it has `m4_include([DESTFILE])', so the copy effectively already
# updated `aclocal.m4'.
# Do this after the copy for hand maintained 'aclocal.m4', incase
# it has 'm4_include([DESTFILE])', so the copy effectively already
# updated 'aclocal.m4'.
my_included_files=`func_included_files aclocal.m4`
case `echo " "$my_included_files" "` in
@ -707,7 +707,7 @@ func_serial_update ()
"$my_src_serial" `func_serial aclocal.m4 "$my_macro_regex"`
if test "X$my_src_serial" = "X$func_serial_max_result"; then
func_notquiet_hdr "$my_msg_var" \
"You should add the contents of \`$my_destfile' to \`aclocal.m4'."
"You should add the contents of '$my_destfile' to 'aclocal.m4'."
fi
fi
;;
@ -721,7 +721,7 @@ func_serial_update ()
# Copy the FILENAME from a SRCDIR to DESTDIR provided that either FILENAME
# has a newer revision according to the serial number extracted by
# SED_SCRIPT, or DESTFILE does not yet exist, or the user specified
# `--force' at the command line.
# '--force' at the command line.
func_keyword_update ()
{
$debug_cmd
@ -737,12 +737,12 @@ func_keyword_update ()
my_keyword_update_p=:
test -f "$my_srcfile" || func_fatal_error "\`$my_srcfile' does not exist."
test -f "$my_srcfile" || func_fatal_error "'$my_srcfile' does not exist."
if test -f "$my_destfile"; then
my_src_serial=`$SED -e "$my_sed_script" "$my_srcfile"`
test -z "$my_src_serial" && {
func_warning file "no serial number in \`$my_srcfile', not copying."
func_warning file "no serial number in '$my_srcfile', not copying."
return
}
@ -758,7 +758,7 @@ func_keyword_update ()
$RM "$my_destfile"
func_copy "$my_filename" "$my_srcdir" "$my_destdir" "$my_msg_var"
elif $opt_verbose || $opt_force && test "X$my_dest_serial" = "X$my_src_serial"; then
func_notquiet_hdr "$my_msg_var" "\`$my_destfile' is already up to date."
func_notquiet_hdr "$my_msg_var" "'$my_destfile' is already up to date."
fi
}
@ -767,7 +767,7 @@ func_keyword_update ()
# ----------------------------------------------------
# Copy the FILENAME from a SRCDIR to DESTDIR provided that either FILENAME
# has a newer revision, or DESTFILE does not yet exist, or the user
# specified `--force' at the command line.
# specified '--force' at the command line.
func_ltmain_update ()
{
$debug_cmd
@ -789,7 +789,7 @@ func_ltmain_update ()
# ----------------------------------------------------
# Copy the FILENAME from a SRCDIR to DESTDIR provided that either FILENAME
# has a newer timestamp, or DESTFILE does not yet exist, or the user
# specified `--force' at the command line.
# specified '--force' at the command line.
func_config_update ()
{
$debug_cmd
@ -812,7 +812,7 @@ func_config_update ()
# -----------------------------------------------------
# Copy the FILENAME from a SRCDIR to DESTDIR provided that either FILENAME
# has a newer timestamp, or DESTFILE does not yet exist, or the user
# specified `--force' at the command line.
# specified '--force' at the command line.
func_install_update ()
{
$debug_cmd
@ -855,9 +855,9 @@ func_install_pkgmacro_files ()
# Install the libltdl autoconf macros to this project's source tree.
$opt_quiet || if test -n "$ac_macro_dir"; then
my_pkgmacro_header="putting macros in AC_CONFIG_MACRO_DIRS, \`$ac_macro_dir'."
my_pkgmacro_header="putting macros in AC_CONFIG_MACRO_DIRS, '$ac_macro_dir'."
else
my_pkgmacro_header="putting macros in \`$macro_dir'."
my_pkgmacro_header="putting macros in '$macro_dir'."
fi
for file in $pkgmacro_files; do
@ -871,7 +871,7 @@ func_install_pkgmacro_files ()
func_serial_update "$file" "$aclocaldir" "$macro_dir" \
my_pkgmacro_header 'LTDL_INIT'
else
func_verbose "Not copying \`$macro_dir/$file', libltdl not used."
func_verbose "Not copying '$macro_dir/$file', libltdl not used."
fi
;;
ltoptions.m4|ltsugar.m4|ltversion.m4|lt~obsolete.m4)
@ -883,7 +883,7 @@ func_install_pkgmacro_files ()
func_serial_update "$file" "$aclocaldir" "$macro_dir" \
my_pkgmacro_header "$file"
else
func_verbose "Not copying \`$macro_dir/$file', libltdl not used."
func_verbose "Not copying '$macro_dir/$file', libltdl not used."
fi
;;
esac
@ -914,11 +914,11 @@ func_install_pkgltdl_files ()
done
# Copy all the files from installed libltdl to this project, if the
# user specified `--ltdl'.
# user specified '--ltdl'.
$opt_quiet || if test -n "$ac_ltdl_dir"; then
pkgltdl_header="putting libltdl files in LT_CONFIG_LTDL_DIR, \`$ac_ltdl_dir'."
pkgltdl_header="putting libltdl files in LT_CONFIG_LTDL_DIR, '$ac_ltdl_dir'."
else
pkgltdl_header="putting libltdl files in \`$ltdl_dir'."
pkgltdl_header="putting libltdl files in '$ltdl_dir'."
fi
$require_filter_Makefile_am
@ -986,7 +986,7 @@ func_install_pkgltdl_files ()
test ltdl.mk = "$file" \
&& func_grep "^-\?include $ltdl_dir/Makefile.inc\$" Makefile.am \
&& mv "$ltdl_dir/$file" "$ltdl_dir/Makefile.inc" \
&& func_notquiet "renaming file \`$ltdl_dir/Makefile.inc'"
&& func_notquiet "renaming file '$ltdl_dir/Makefile.inc'"
done
}
@ -1013,9 +1013,9 @@ func_install_pkgaux_files ()
done
if test -n "$ac_aux_dir"; then
pkgaux_header="putting auxiliary files in AC_CONFIG_AUX_DIR, \`$ac_aux_dir'."
pkgaux_header="putting auxiliary files in AC_CONFIG_AUX_DIR, '$ac_aux_dir'."
else
pkgaux_header="putting auxiliary files in \`$aux_dir'."
pkgaux_header="putting auxiliary files in '$aux_dir'."
fi
for file in $pkgaux_files; do
@ -1043,7 +1043,7 @@ func_install_pkgaux_files ()
# will still need to build libtool for its own purposes, and might
# need another copy of ltmain.sh if the parent didn't declare an
# AC_CONFIG_AUX_DIR.
pkgaux_hdr="putting another copy of auxiliary files in \`.'"
pkgaux_hdr="putting another copy of auxiliary files in '.'"
test -f "$configure_ac" \
&& test -z "$ac_aux_dir" \
&& test subproject = "$ltdl_mode" \
@ -1051,12 +1051,12 @@ func_install_pkgaux_files ()
&& func_ltmain_update "$file" "$pkgauxdir" . pkgaux_hdr
# FIXME: Remove in 2013.
# Very old parent projects using `libtoolize --install --ltdl', and
# Very old parent projects using 'libtoolize --install --ltdl', and
# a top-level $configure_ac to build the ltdl subproject, but not
# using Automake themselves, might still be relying on the old
# behaviour of libtoolize to put a second copy of some `Auxiliary
# behaviour of libtoolize to put a second copy of some 'Auxiliary
# Programs' needed by the top-level configure (instead of using
# the recommended method: `automake --add-missing').
# the recommended method: 'automake --add-missing').
test -f "$configure_ac" \
&& test subproject = "$ltdl_mode" \
&& test "$aux_dir" = "$ltdl_dir" \
@ -1079,11 +1079,11 @@ func_nonemptydir_p ()
# Is it a directory at all?
test -d "$my_dir" \
|| func_fatal_error "\$$my_dirvar is not a directory: \`$my_dir'"
|| func_fatal_error "\$$my_dirvar is not a directory: '$my_dir'"
# check that the directories contents can be ls'ed
test -n "`{ cd $my_dir && ls; } 2>/dev/null`" \
|| func_fatal_error "cannot list files: \`$my_dir'"
|| func_fatal_error "cannot list files: '$my_dir'"
}
@ -1124,9 +1124,9 @@ func_check_macros ()
done
if test -n "$my_missing"; then
func_echo "You should add the contents of the following files to \`aclocal.m4':"
func_echo "You should add the contents of the following files to 'aclocal.m4':"
for need in $my_missing; do
func_echo " \`$aclocaldir/$need'"
func_echo " '$aclocaldir/$need'"
done
fi
fi
@ -1139,7 +1139,7 @@ func_check_macros ()
test " none" = "$opt_warning_types" && return
$seen_libtool ||
func_echo "Remember to add \`LT_INIT' to $configure_ac."
func_echo "Remember to add 'LT_INIT' to $configure_ac."
# Suggest using LTDL_INIT if appropriate:
$opt_ltdl && if test : != "$seen_ltdl"; then
@ -1147,13 +1147,13 @@ func_check_macros ()
subproject) ltdl_init_args= ;;
*) ltdl_init_args="([$ltdl_mode])" ;;
esac
func_echo "Remember to add \`LTDL_INIT$ltdl_init_args' to $configure_ac."
func_echo "Remember to add 'LTDL_INIT$ltdl_init_args' to $configure_ac."
fi
if $opt_ltdl; then
# Remind the user to call LT_CONFIG_LTDL_DIR:
test -n "$ac_ltdl_dir" ||
func_echo "Remember to add \`LT_CONFIG_LTDL_DIR([$ltdl_dir])' to \`$configure_ac'."
func_echo "Remember to add 'LT_CONFIG_LTDL_DIR([$ltdl_dir])' to '$configure_ac'."
# For nonrecursive mode, warn about continued use of Makefile.inc:
# FIXME: Remove in 2013
@ -1161,35 +1161,35 @@ func_check_macros ()
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!"
func_echo "Consider updating to use of \`include $ltdl_dir/ltdl.mk' in Makefile.am."
func_error "Use of 'include $ltdl_dir/Makefile.inc' is deprecated!"
func_echo "Consider updating to use of 'include $ltdl_dir/ltdl.mk' in Makefile.am."
fi
fi
fi
# Suggest modern idioms for storing autoconf macros:
$ac_config_macro_dir_advised || if test -z "$macro_dir" || test . = "$macro_dir"; then
func_echo "Consider adding \`AC_CONFIG_MACRO_DIRS([m4])' to $configure_ac and"
func_echo "Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to $configure_ac and"
func_echo "rerunning $progname, to keep the correct libtool macros in-tree."
ac_config_macro_dir_advised=:
elif test -z "$ac_macro_dir"; then
func_echo "Consider adding \`AC_CONFIG_MACRO_DIRS([$macro_dir])' to $configure_ac,"
func_echo "Consider adding 'AC_CONFIG_MACRO_DIRS([$macro_dir])' to $configure_ac,"
func_echo "and rerunning $progname and aclocal."
ac_config_macro_dir_advised=:
fi
if test -z "$am_macro_dir$ac_macro_dir"; then
func_echo "Consider adding \`-I m4' to ACLOCAL_AMFLAGS in Makefile.am."
func_echo "Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am."
elif test -z "$am_macro_dir"; then
func_echo "Consider adding \`-I $macro_dir' to ACLOCAL_AMFLAGS in Makefile.am."
func_echo "Consider adding '-I $macro_dir' to ACLOCAL_AMFLAGS in Makefile.am."
fi
# Don't trace for this, we're just checking the user didn't invoke it
# directly from configure.ac.
$SED 's|dnl .*$||; s|# .*$||' "$configure_ac" | grep AC_PROG_RANLIB >/dev/null &&
func_echo "\`AC_PROG_RANLIB' is rendered obsolete by \`LT_INIT'"
func_echo "'AC_PROG_RANLIB' is rendered obsolete by 'LT_INIT'"
# FIXME: Ensure ltmain.sh, libtool.m4 and ltdl.m4 are from the same release
}
@ -1224,7 +1224,7 @@ func_autoconf_configure ()
_G_status=$?
test 0 -ne "$_G_status" \
&& func_verbose "\`$1' not using Autoconf"
&& func_verbose "'$1' not using Autoconf"
(exit $_G_status)
}
@ -1264,7 +1264,7 @@ func_make_relative_dir_filter ()
else
my_match_currdir=`$ECHO "$my_currdir" |$SED "$sed_make_literal_regex"`
# Avoid substituting with `dir/./file' when current dir is `.'.
# Avoid substituting with 'dir/./file' when current dir is '.'.
if test . = "$my_currdir"; then
func_make_relative_dir_filter_result="
s|$4$my_match_currdir/$5|$4$5|g"
@ -1277,8 +1277,8 @@ func_make_relative_dir_filter ()
# func_make_relative_ltdl_filter CURRDIR DESTDIR [PREFIX [SUFFIX]]
# ----------------------------------------------------------------
# As `func_make_relative_dir_filter' optimised for the common case where
# SRCDIR is `$ltdl_dir'.
# As 'func_make_relative_dir_filter' optimised for the common case where
# SRCDIR is '$ltdl_dir'.
func_make_relative_ltdl_filter ()
{
$debug_cmd
@ -1298,9 +1298,9 @@ func_make_relative_ltdl_filter ()
# particular resource (a file, or a non-empty configuration variable for
# example) is available, and if appropriate to extract default values
# from pertinent package files. Where a variable already has a non-
# empty value (as set by the package's `bootstrap.conf'), that value is
# empty value (as set by the package's 'bootstrap.conf'), that value is
# used in preference to deriving the default. Call them using their
# associated `require_*' variable to ensure that they are executed, at
# associated 'require_*' variable to ensure that they are executed, at
# most, once.
#
# Some of the require functions are very similar, so we generate those
@ -1318,9 +1318,9 @@ for base in '' ltdl_; do
# require_Makefile_am
# require_ltdl_Makefile_am
# ------------------------
# If not already set, set Makefile_am to `Makefile.am' if that file is
# If not already set, set Makefile_am to 'Makefile.am' if that file is
# present in the current directory, and similarly for
# `$pkgltdldir/Makefile.am'.
# '$pkgltdldir/Makefile.am'.
r=${base}Makefile_am
v=require_$r
f=func_$v
@ -1332,7 +1332,7 @@ for base in '' ltdl_; do
test -n "$'$r'" || '$r'='$p'Makefile.am
if test -f "$'$r'"; then
func_verbose "found \`$'$r\''"
func_verbose "found '\'\$$r\''"
else
'$r'=
fi
@ -1345,8 +1345,8 @@ for base in '' ltdl_; do
# require_aclocal_amflags
# require_ltdl_aclocal_amflags
# ----------------------------
# Extract `$aclocal_amflags' from `Makefile.am' if present, and
# similarly for `libltdl/Makefile.am'.
# Extract '$aclocal_amflags' from 'Makefile.am' if present, and
# similarly for 'libltdl/Makefile.am'.
r=${base}aclocal_amflags
v=require_$r
f=func_$v
@ -1380,7 +1380,7 @@ for base in '' ltdl_; do
# require_ltdl_am_macro_dir
# -------------------------
# Set am_macro_dir to the first directory specified in
# ACLOCAL_AMFLAGS from `Makefile.am', and similarly for
# ACLOCAL_AMFLAGS from 'Makefile.am', and similarly for
# 'libltdl/Makefile.am'.
r=${base}am_macro_dir
v=require_$r
@ -1583,8 +1583,8 @@ func_require_aux_dir ()
# require_configure_ac
# --------------------
# Ensure that there is a `configure.ac' or `configure.in' file in this
# directory, and that `$configure_ac' contains its name.
# Ensure that there is a 'configure.ac' or 'configure.in' file in this
# directory, and that '$configure_ac' contains its name.
require_configure_ac=func_require_configure_ac
func_require_configure_ac ()
{
@ -1595,7 +1595,7 @@ func_require_configure_ac ()
test -z "$configure_ac" \
&& func_autoconf_configure configure.in && configure_ac=configure.in
test -z "$configure_ac" \
|| func_verbose "found \`$configure_ac'"
|| func_verbose "found '$configure_ac'"
require_configure_ac=:
}
@ -1603,7 +1603,7 @@ func_require_configure_ac ()
# require_filter_Makefile_am
# --------------------------
# Set `filter_Makefile_am' ready for passing to func_copy when libltdl's
# Set 'filter_Makefile_am' ready for passing to func_copy when libltdl's
# stock Makefile.am contents need to be filtered to work in recursive
# mode.
require_filter_Makefile_am=func_require_filter_Makefile_am
@ -1649,7 +1649,7 @@ func_require_filter_Makefile_am ()
# require_filter_aclocal_m4
# -------------------------
# Set `filter_aclocal_m4' ready for passing to func_copy when libltdl's
# Set 'filter_aclocal_m4' ready for passing to func_copy when libltdl's
# stock aclocal.m4 contents need to be filtered to work in recursive
# mode.
require_filter_aclocal_m4=func_require_filter_aclocal_m4
@ -1674,7 +1674,7 @@ func_require_filter_aclocal_m4 ()
# require_filter_configure_ac
# ---------------------------
# Set `filter_configure_ac' ready for passing to func_copy when
# Set 'filter_configure_ac' ready for passing to func_copy when
# libltdl's stock configure.ac contents need to be filtered to work in
# subproject mode.
require_filter_configure_ac=func_require_filter_configure_ac
@ -1693,7 +1693,7 @@ func_require_filter_configure_ac ()
# require_filter_ltdl_mk
# ----------------------
# Set `filter_ltdl_mk' ready for passing to func_copy in order for the
# Set 'filter_ltdl_mk' ready for passing to func_copy in order for the
# contents of ltdl.mk to match the nonrecursive libltdl directory into
# which it is copied.
require_filter_ltdl_mk=func_require_filter_ltdl_mk

2
m4/argz.m4
View File

@ -17,7 +17,7 @@ AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT])
AC_CHECK_TYPES([error_t],
[],
[AC_DEFINE([error_t], [int],
[Define to a type to use for `error_t' if it is not otherwise available.])
[Define to a type to use for 'error_t' if it is not otherwise available.])
AC_DEFINE([__error_t_defined], [1], [Define so that glibc/gnulib argp.h
does not typedef error_t.])],
[#if defined(HAVE_ARGZ_H)

76
m4/libtool.m4 vendored
View File

@ -128,7 +128,7 @@ cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
# _LT_FILEUTILS_DEFAULTS
# ----------------------
# It is okay to use these file commands and assume they have been set
# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
m4_defun([_LT_FILEUTILS_DEFAULTS],
[: ${CP="cp -f"}
: ${MV="mv -f"}
@ -207,7 +207,7 @@ esac
ofile=libtool
can_build_shared=yes
# All known linkers require a `.a' archive for static linking (except MSVC,
# All known linkers require a '.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
@ -267,9 +267,9 @@ no_glob_subst='s/\*/\\\*/g'
# _LT_PROG_LTMAIN
# ---------------
# Note that this code is called both from `configure', and `config.status'
# Note that this code is called both from 'configure', and 'config.status'
# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
# `config.status' has no value for ac_aux_dir unless we are using Automake,
# 'config.status' has no value for ac_aux_dir unless we are using Automake,
# so we pass a copy along to make sure it has a sensible value anyway.
m4_defun([_LT_PROG_LTMAIN],
[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
@ -284,7 +284,7 @@ ltmain=$ac_aux_dir/ltmain.sh
# So that we can recreate a full libtool script including additional
# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
# in macros and then make a single call at the end using the `libtool'
# in macros and then make a single call at the end using the 'libtool'
# label.
@ -419,8 +419,8 @@ m4_define([_lt_decl_all_varnames],
# _LT_CONFIG_STATUS_DECLARE([VARNAME])
# ------------------------------------
# Quote a variable value, and forward it to `config.status' so that its
# declaration there will have the same value as in `configure'. VARNAME
# Quote a variable value, and forward it to 'config.status' so that its
# declaration there will have the same value as in 'configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
@ -472,7 +472,7 @@ m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
# _LT_LIBTOOL_CONFIG_VARS
# -----------------------
# Produce commented declarations of non-tagged libtool config variables
# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
# section) are produced by _LT_LIBTOOL_TAG_VARS.
m4_defun([_LT_LIBTOOL_CONFIG_VARS],
@ -498,8 +498,8 @@ m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
# variables for single and double quote escaping we saved from calls
# to _LT_DECL, we can put quote escaped variables declarations
# into `config.status', and then the shell code to quote escape them in
# for loops in `config.status'. Finally, any additional code accumulated
# into 'config.status', and then the shell code to quote escape them in
# for loops in 'config.status'. Finally, any additional code accumulated
# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
m4_defun([_LT_CONFIG_COMMANDS],
[AC_PROVIDE_IFELSE([LT_OUTPUT],
@ -574,7 +574,7 @@ _LT_OUTPUT_LIBTOOL_INIT
# Generate a child script FILE with all initialization necessary to
# reuse the environment learned by the parent script, and make the
# file executable. If COMMENT is supplied, it is inserted after the
# `#!' sequence but before initialization text begins. After this
# '#!' sequence but before initialization text begins. After this
# macro, additional text can be appended to FILE to form the body of
# the child script. The macro ends with non-zero status if the
# file could not be fully written (such as if the disk is full).
@ -619,7 +619,7 @@ exec AS_MESSAGE_LOG_FD>>config.log
} >&AS_MESSAGE_LOG_FD
lt_cl_help="\
\`$as_me' creates a local libtool stub from the current configuration,
'$as_me' creates a local libtool stub from the current configuration,
for use in further configure time tests before the real libtool is
generated.
@ -654,10 +654,10 @@ do
lt_cl_silent=: ;;
-*) AC_MSG_ERROR([unrecognized option: $[1]
Try \`$[0] --help' for more information.]) ;;
Try '$[0] --help' for more information.]) ;;
*) AC_MSG_ERROR([unrecognized argument: $[1]
Try \`$[0] --help' for more information.]) ;;
Try '$[0] --help' for more information.]) ;;
esac
shift
done
@ -2042,7 +2042,7 @@ if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_loc
ln conftest.a conftest.b 2>/dev/null && hard_links=no
AC_MSG_RESULT([$hard_links])
if test no = "$hard_links"; then
AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
need_locks=warn
fi
else
@ -2270,8 +2270,8 @@ aix[[4-9]]*)
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
# the line `#! .'. This would cause the generated library to
# depend on `.', always an invalid library. This was fixed in
# the line '#! .'. This would cause the generated library to
# depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[[01]] | aix4.[[01]].*)
@ -3154,13 +3154,13 @@ lt_cv_deplibs_check_method='unknown'
# Need to set the preceding variable on all platforms that support
# interlibrary dependencies.
# 'none' -- dependencies not supported.
# `unknown' -- same as none, but documents that we really don't know.
# 'unknown' -- same as none, but documents that we really don't know.
# '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.
# 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.
# 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.
case $host_os in
aix[[4-9]]*)
@ -3391,7 +3391,7 @@ else
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:
# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
# nm: unknown option "B" ignored
# Tru64's nm complains that /dev/null is an invalid object file
case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
@ -3876,8 +3876,8 @@ m4_if([$1], [CXX], [
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
# adding the `-m68020' flag to GCC prevents building anything better,
# like `-m68040'.
# adding the '-m68020' flag to GCC prevents building anything better,
# like '-m68040'.
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
esac
@ -4194,8 +4194,8 @@ m4_if([$1], [CXX], [
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
# adding the `-m68020' flag to GCC prevents building anything better,
# like `-m68040'.
# adding the '-m68020' flag to GCC prevents building anything better,
# like '-m68040'.
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
esac
@ -4608,9 +4608,9 @@ m4_if([$1], [CXX], [
# included in the symbol list
_LT_TAGVAR(include_expsyms, $1)=
# exclude_expsyms can be an extended regexp of symbols to exclude
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
# it will be wrapped by ' (' and ')$', so one must not match beginning or
# end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
# as well as any symbol that contains 'd'.
_LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
@ -5450,7 +5450,7 @@ _LT_EOF
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
# The compiler driver will combine and reorder linker options,
# but understands `-z linker_flag'. GCC discards it without `$wl',
# but understands '-z linker_flag'. GCC discards it without '$wl',
# but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
if test yes = "$GCC"; then
@ -5720,7 +5720,7 @@ dnl [Compiler flag to generate thread safe objects])
# ------------------------
# Ensure that the configuration variables for a C compiler are suitably
# defined. These variables are subsequently used by _LT_CONFIG to write
# the compiler configuration to `libtool'.
# the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_C_CONFIG],
[m4_require([_LT_DECL_EGREP])dnl
lt_save_CC=$CC
@ -5805,7 +5805,7 @@ CC=$lt_save_CC
# --------------------------
# Ensure that the configuration variables for a C++ compiler are suitably
# defined. These variables are subsequently used by _LT_CONFIG to write
# the compiler configuration to `libtool'.
# the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_CXX_CONFIG],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
@ -6696,7 +6696,7 @@ if test yes != "$_lt_caught_CXX_error"; then
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
# The compiler driver will combine and reorder linker options,
# but understands `-z linker_flag'.
# but understands '-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
;;
@ -6732,7 +6732,7 @@ if test yes != "$_lt_caught_CXX_error"; then
# linking a shared library.
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
_LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
@ -7143,7 +7143,7 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
# --------------------------
# Ensure that the configuration variables for a Fortran 77 compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
# to write the compiler configuration to `libtool'.
# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_F77_CONFIG],
[AC_LANG_PUSH(Fortran 77)
if test -z "$F77" || test no = "$F77"; then
@ -7274,7 +7274,7 @@ AC_LANG_POP
# -------------------------
# Ensure that the configuration variables for a Fortran compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
# to write the compiler configuration to `libtool'.
# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_FC_CONFIG],
[AC_LANG_PUSH(Fortran)
@ -7409,7 +7409,7 @@ AC_LANG_POP
# --------------------------
# Ensure that the configuration variables for the GNU Java Compiler compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
# to write the compiler configuration to `libtool'.
# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_GCJ_CONFIG],
[AC_REQUIRE([LT_PROG_GCJ])dnl
AC_LANG_SAVE
@ -7480,7 +7480,7 @@ CFLAGS=$lt_save_CFLAGS
# --------------------------
# Ensure that the configuration variables for the GNU Go compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
# to write the compiler configuration to `libtool'.
# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_GO_CONFIG],
[AC_REQUIRE([LT_PROG_GO])dnl
AC_LANG_SAVE
@ -7551,7 +7551,7 @@ CFLAGS=$lt_save_CFLAGS
# -------------------------
# Ensure that the configuration variables for the Windows resource compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
# to write the compiler configuration to `libtool'.
# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_RC_CONFIG],
[AC_REQUIRE([LT_PROG_RC])dnl
AC_LANG_SAVE

28
m4/ltdl.m4
View File

@ -24,14 +24,14 @@ m4_defun([_LT_CONFIG_LTDL_DIR],
[dnl remove trailing slashes
m4_pushdef([_ARG_DIR], m4_bpatsubst([$1], [/*$]))
m4_case(_LTDL_DIR,
[], [dnl only set lt_ltdl_dir if _ARG_DIR is not simply `.'
[], [dnl only set lt_ltdl_dir if _ARG_DIR is not simply '.'
m4_if(_ARG_DIR, [.],
[],
[m4_define([_LTDL_DIR], _ARG_DIR)
_LT_SHELL_INIT([lt_ltdl_dir=']_ARG_DIR['])])],
[m4_if(_ARG_DIR, _LTDL_DIR,
[],
[m4_fatal([multiple libltdl directories: `]_LTDL_DIR[', `]_ARG_DIR['])])])
[m4_fatal([multiple libltdl directories: ']_LTDL_DIR[', ']_ARG_DIR['])])])
m4_popdef([_ARG_DIR])
])# _LT_CONFIG_LTDL_DIR
@ -41,8 +41,8 @@ m4_define([_LTDL_DIR], [])
# _LT_BUILD_PREFIX
# ----------------
# If Autoconf is new enough, expand to `$(top_build_prefix)', otherwise
# to `$(top_builddir)/'.
# If Autoconf is new enough, expand to '$(top_build_prefix)', otherwise
# to '$(top_builddir)/'.
m4_define([_LT_BUILD_PREFIX],
[m4_ifdef([AC_AUTOCONF_VERSION],
[m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.62]),
@ -154,7 +154,7 @@ m4_defun([_LTDL_INSTALLABLE],
if test yes = "${lt_lib_ltdl-no}"; then
if test yes != "$enable_ltdl_install"; then
# Don't overwrite $prefix/lib/libltdl.la without --enable-ltdl-install
AC_MSG_WARN([not overwriting libltdl at $prefix, force with `--enable-ltdl-install'])
AC_MSG_WARN([not overwriting libltdl at $prefix, force with '--enable-ltdl-install'])
enable_ltdl_install=no
fi
elif test no = "$enable_ltdl_install"; then
@ -191,10 +191,10 @@ AC_SUBST([INCLTDL])
# _LTDL_MODE_DISPATCH
# -------------------
m4_define([_LTDL_MODE_DISPATCH],
[dnl If _LTDL_DIR is `.', then we are configuring libltdl itself:
[dnl If _LTDL_DIR is '.', then we are configuring libltdl itself:
m4_if(_LTDL_DIR, [],
[],
dnl if _LTDL_MODE was not set already, the default value is `subproject':
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])],
@ -271,7 +271,7 @@ AC_ARG_WITH([ltdl_include],
if test -n "$with_ltdl_include"; then
if test -f "$with_ltdl_include/ltdl.h"; then :
else
AC_MSG_ERROR([invalid ltdl include directory: `$with_ltdl_include'])
AC_MSG_ERROR([invalid ltdl include directory: '$with_ltdl_include'])
fi
else
with_ltdl_include=no
@ -284,7 +284,7 @@ AC_ARG_WITH([ltdl_lib],
if test -n "$with_ltdl_lib"; then
if test -f "$with_ltdl_lib/libltdl.la"; then :
else
AC_MSG_ERROR([invalid ltdl library directory: `$with_ltdl_lib'])
AC_MSG_ERROR([invalid ltdl library directory: '$with_ltdl_lib'])
fi
else
with_ltdl_lib=no
@ -307,7 +307,7 @@ case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in
LTDLINCL=
;;
,no*,no,*)
AC_MSG_ERROR([`--with-ltdl-include' and `--with-ltdl-lib' options must be used together])
AC_MSG_ERROR(['--with-ltdl-include' and '--with-ltdl-lib' options must be used together])
;;
*) with_included_ltdl=no
LIBLTDL="-L$with_ltdl_lib -lltdl"
@ -452,7 +452,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
case $host_os in
aix3*|aix4.1.*|aix4.2.*)
# Unknown whether this is true for these versions of AIX, but
# we want this `case' here to explicitly catch those versions.
# we want this 'case' here to explicitly catch those versions.
lt_cv_sys_dlopen_deplibs=unknown
;;
aix[[4-9]]*)
@ -502,7 +502,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
osf[[1234]]*)
# dlopen did load deplibs (at least at 4.x), but until the 5.x series,
# it did *not* use an RPATH in a shared library to find objects the
# library depends on, so we explicitly say `no'.
# library depends on, so we explicitly say 'no'.
lt_cv_sys_dlopen_deplibs=no
;;
osf5.0|osf5.0a|osf5.1)
@ -511,14 +511,14 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
# that the library depends on, but there's no easy way to know if that
# patch is installed. Since this is the case, all we can really
# say is unknown -- it depends on the patch being installed. If
# it is, this changes to `yes'. Without it, it would be `no'.
# it is, this changes to 'yes'. Without it, it would be 'no'.
lt_cv_sys_dlopen_deplibs=unknown
;;
osf*)
# the two cases above should catch all versions of osf <= 5.1. Read
# the comments above for what we know about them.
# At > 5.1, deplibs are loaded *and* any RPATH in a shared library
# is used to find them so we can finally say `yes'.
# is used to find them so we can finally say 'yes'.
lt_cv_sys_dlopen_deplibs=yes
;;
qnx*)

36
m4/ltoptions.m4 vendored
View File

@ -29,7 +29,7 @@ m4_define([_LT_SET_OPTION],
[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
_LT_MANGLE_DEFUN([$1], [$2]),
[m4_warning([Unknown $1 option `$2'])])[]dnl
[m4_warning([Unknown $1 option '$2'])])[]dnl
])
@ -75,7 +75,7 @@ m4_if([$1],[LT_INIT],[
dnl
dnl If no reference was made to various pairs of opposing options, then
dnl we run the default mode handler for the pair. For example, if neither
dnl `shared' nor `disable-shared' was passed, we enable building of shared
dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
dnl archives by default:
_LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
_LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
@ -112,7 +112,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN],
[_LT_SET_OPTION([LT_INIT], [dlopen])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
put the `dlopen' option into LT_INIT's first parameter.])
put the 'dlopen' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@ -148,7 +148,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
_LT_SET_OPTION([LT_INIT], [win32-dll])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
put the `win32-dll' option into LT_INIT's first parameter.])
put the 'win32-dll' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@ -157,9 +157,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
# _LT_ENABLE_SHARED([DEFAULT])
# ----------------------------
# implement the --enable-shared flag, and supports the `shared' and
# `disable-shared' LT_INIT options.
# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
# implement the --enable-shared flag, and supports the 'shared' and
# 'disable-shared' LT_INIT options.
# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_SHARED],
[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([shared],
@ -211,9 +211,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], [])
# _LT_ENABLE_STATIC([DEFAULT])
# ----------------------------
# implement the --enable-static flag, and support the `static' and
# `disable-static' LT_INIT options.
# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
# implement the --enable-static flag, and support the 'static' and
# 'disable-static' LT_INIT options.
# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_STATIC],
[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([static],
@ -265,9 +265,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], [])
# _LT_ENABLE_FAST_INSTALL([DEFAULT])
# ----------------------------------
# implement the --enable-fast-install flag, and support the `fast-install'
# and `disable-fast-install' LT_INIT options.
# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
# implement the --enable-fast-install flag, and support the 'fast-install'
# and 'disable-fast-install' LT_INIT options.
# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_FAST_INSTALL],
[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([fast-install],
@ -304,14 +304,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL],
[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
the `fast-install' option into LT_INIT's first parameter.])
the 'fast-install' option into LT_INIT's first parameter.])
])
AU_DEFUN([AC_DISABLE_FAST_INSTALL],
[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
the `disable-fast-install' option into LT_INIT's first parameter.])
the 'disable-fast-install' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@ -321,9 +321,9 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
# _LT_WITH_PIC([MODE])
# --------------------
# implement the --with-pic flag, and support the `pic-only' and `no-pic'
# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
# LT_INIT options.
# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'.
m4_define([_LT_WITH_PIC],
[AC_ARG_WITH([pic],
[AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
@ -359,7 +359,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE],
[_LT_SET_OPTION([LT_INIT], [pic-only])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
put the `pic-only' option into LT_INIT's first parameter.])
put the 'pic-only' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:

2
m4/ltsugar.m4 vendored
View File

@ -45,7 +45,7 @@ m4_define([lt_unquote], $1)
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------
# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
# Note that neither SEPARATOR nor STRING are expanded; they are appended
# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
# No SEPARATOR is output if MACRO-NAME was previously undefined (different

2
tests/cmdline_wrap.at
View File

@ -35,7 +35,7 @@ chmod +x libtool
LIBTOOL=`pwd`/libtool
export LIBTOOL
# run the suite in a subdirectory, otherwise the two suites will compete
# for the output file `testsuite.log'.
# for the output file 'testsuite.log'.
mkdir tests
cd tests
INNER_TESTSUITEFLAGS="$INNER_TESTSUITEFLAGS abs_top_srcdir=$abs_top_srcdir \

8
tests/configure-iface.at
View File

@ -64,7 +64,7 @@ main (void)
}
else
{
fprintf (stderr, "function `f' not found: %s\n", lt_dlerror ());
fprintf (stderr, "function 'f' not found: %s\n", lt_dlerror ());
++errors;
}
}
@ -144,7 +144,7 @@ prefix=`pwd`/_inst
LT_AT_BOOTSTRAP([--ltdl], [-I libltdl/m4], [], [--add-missing], [],
[--with-included-ltdl --prefix=$prefix], [all install])
# TODO: Check that the installed program `main' is linked against our libltdl
# TODO: Check that the installed program 'main' is linked against our libltdl
AT_CHECK([test -f "$prefix/lib/libltdl.la"])
AT_CHECK([test -f "$prefix/include/ltdl.h"])
@ -229,7 +229,7 @@ LT_AT_BOOTSTRAP([], [-I _inst/aclocal], [], [--add-missing], [],
[all])
## TODO: portable ldd check for correct libltdl
## Currently, this test doesn't fail if `main' ends up linking against a
## Currently, this test doesn't fail if 'main' ends up linking against a
## previously installed system libltdl.
LT_AT_NOINST_EXEC_CHECK([./main], [-dlopen libmodule.la], [], [expout], [])
@ -286,7 +286,7 @@ LT_AT_BOOTSTRAP([--ltdl], [-I libltdl/m4], [], [--add-missing], [],
AT_CHECK([test -f libltdl/libltdlc.la])
## TODO: portable ldd check for correct libltdl
## Currently, this test doesn't fail if `main' ends up linking against a
## Currently, this test doesn't fail if 'main' ends up linking against a
## previously installed system libltdl.
LT_AT_NOINST_EXEC_CHECK([./main], [-dlopen libmodule.la], [], [expout], [])

26
tests/demo.at
View File

@ -316,7 +316,7 @@ int main ()
if (pnothing)
*pnothing = 1;
else
fprintf (stderr, "did not find the `nothing' variable\n");
fprintf (stderr, "did not find the 'nothing' variable\n");
/* Just call the functions and check return values. */
if (pfoo)
@ -325,7 +325,7 @@ int main ()
return 1;
}
else
fprintf (stderr, "did not find the `foo' function\n");
fprintf (stderr, "did not find the 'foo' function\n");
if (phello)
{
@ -333,7 +333,7 @@ int main ()
return 3;
}
else
fprintf (stderr, "did not find the `hello' function\n");
fprintf (stderr, "did not find the 'hello' function\n");
return 0;
}
@ -674,27 +674,27 @@ for file in hc-*; do
case $hardcoded in
yes)
if test yes = "$expected"; then
echo "$objdir was hardcoded in \`$file', as libtool expected"
echo "$objdir was hardcoded in '$file', as libtool expected"
else
echo "$objdir was hardcoded in \`$file', which fooled libtool" 1>&2
echo "$objdir was hardcoded in '$file', which fooled libtool" 1>&2
exit_status=1
fi
;;
no)
if test no = "$expected"; then
echo "$objdir was not hardcoded in \`$file', as libtool expected"
echo "$objdir was not hardcoded in '$file', as libtool expected"
else
echo "$objdir was not hardcoded in \`$file', which fooled libtool" 1>&2
echo "$objdir was not hardcoded in '$file', which fooled libtool" 1>&2
exit_status=1
fi
;;
unsupported)
if test unsupported = "$expected"; then
echo "\`$file' was not linked properly, as libtool expected"
echo "'$file' was not linked properly, as libtool expected"
else
echo "\`$file' was not linked properly, which fooled libtool" 1>&2
echo "'$file' was not linked properly, which fooled libtool" 1>&2
exit_status=1
fi
;;
@ -723,7 +723,7 @@ eval `$EGREP '^library_names=' libhello.la`
AT_CHECK([test -n "$library_names" || (exit 77)])
func_save_files
# AIX 5.3 `/bin/sh' will invoke the trap for 0 at the end of a
# AIX 5.3 '/bin/sh' will invoke the trap for 0 at the end of a
# function, so we set the trap outside of a function to be portable.
trap func_restore_files 0 1 2 13 15
@ -748,8 +748,8 @@ AT_CHECK([test -f libhello.la])
# Try running uninstalled ./hell with only broken libhello.la in build tree.
# If the following has normal exit status, shlibpath_overrides_runpath is
# wrong, and should be set to `no' on this host.
# The unusual `|| (exit 1)' is to normalize all non-zero exit statuses.
# wrong, and should be set to 'no' on this host.
# The unusual '|| (exit 1)' is to normalize all non-zero exit statuses.
LT_AT_CHECK([./hell || (exit 1)], 1, [ignore], [ignore])
test relink = "$hardcode_action" ||
@ -760,7 +760,7 @@ test yes = "$shlibpath_overrides_runpath" ||
# Running demo/hell with installed libhello.la.
# If the following check fails, then shlibpath_overrides_runpath is
# wrong, and should be set to `yes' on this host.
# wrong, and should be set to 'yes' on this host.
LT_AT_CHECK([./hell], 0, [expout])
}

8
tests/depdemo.at
View File

@ -366,7 +366,7 @@ AT_CHECK([test -n "$library_names" || (exit 77)])
func_save_files
# AIX 5.3 `/bin/sh' will invoke the trap for 0 at the end of a
# AIX 5.3 '/bin/sh' will invoke the trap for 0 at the end of a
# function, so we set the trap outside of a function to be portable.
trap func_restore_files 0 1 2 13 15
@ -403,8 +403,8 @@ AT_CHECK([test -f l3/libl3.la])
# Try running uninstalled ./depdemo with only broken libl3.la in build tree.
# If the following has normal exit status, shlibpath_overrides_runpath is
# wrong, and should be set to `no' on this host.
# The unusual `|| (exit 1)' is to normalize all non-zero exit statuses.
# wrong, and should be set to 'no' on this host.
# The unusual '|| (exit 1)' is to normalize all non-zero exit statuses.
AT_CHECK([./depdemo$EXEEXT || (exit 1)], 1, [ignore], [ignore])
test relink = "$hardcode_action" ||
@ -415,7 +415,7 @@ test yes = "$shlibpath_overrides_runpath" ||
# Running depdemo with installed libl3.la.
# If the following check fails, then shlibpath_overrides_runpath is
# wrong, and should be set to `yes' on this host.
# wrong, and should be set to 'yes' on this host.
LT_AT_CHECK([./depdemo], 0, [expout])
}

4
tests/deplib-in-subdir.at
View File

@ -28,8 +28,8 @@
# path valid at execution time.
#
# Also test installing these libraries and programs; however,
# use consistent relative paths between `libtool --mode=link' and
# `libtool --mode=install' in this test.
# use consistent relative paths between 'libtool --mode=link' and
# 'libtool --mode=install' in this test.
AT_SETUP([deplib in subdir])
AT_KEYWORDS([libtool])

4
tests/deplibs-mingw.at
View File

@ -21,7 +21,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
####
# Check that deplibs are detected correctly even if there is no `file'
# Check that deplibs are detected correctly even if there is no 'file'
# command installed.
AT_SETUP([deplibs without file command])
@ -54,7 +54,7 @@ AT_CHECK([$LIBTOOL --mode=install cp liba.la $libdir], [], [ignore], [ignore])
AT_CHECK([$LIBTOOL --mode=clean rm -f liba.la], [], [ignore], [ignore])
rm -f $libdir/liba.la
# check once with `file' (if present) and once without, if on MinGW.
# check once with 'file' (if present) and once without, if on MinGW.
for try in with-file without-file; do
AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o libb.la b.lo -rpath $libdir ]dnl
[-L$libdir -la],

2
tests/destdir.at
View File

@ -119,7 +119,7 @@ for lib in a1dep a2dep a; do
echo "int this_should_not_be_linked_against () { return 0; }" > $lib.c
$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c $lib.c
# Note the rpath argument includes $DESTDIR: the installed false libs
# should be functional (i.e., not need `libtool --mode=finish').
# should be functional (i.e., not need 'libtool --mode=finish').
$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o lib$lib.la $lib.lo -rpath $DESTDIR$ldir
$LIBTOOL --mode=install cp lib$lib.la $DESTDIR$ldir/lib$lib.la
done

18
tests/execute-mode.at
View File

@ -159,19 +159,19 @@ AT_CHECK([$LIBTOOL --mode=execute ./lt-wrapper foo </dev/null || exit 1],
mv -f lt-backup lt-real
# Now use arguments that require decent quoting.
AT_CHECK([$LIBTOOL --mode=execute ./foo "arg with special chars: \$!&*\`'()"],
[], [arg with special chars: $!&*`'()
AT_CHECK([$LIBTOOL --mode=execute ./foo "arg with special chars: \$!&*'\`()"],
[], [arg with special chars: $!&*'`()
])
AT_CHECK([$LIBTOOL --mode=execute ./lt-wrapper "arg with special chars: \$!&*\`'()" </dev/null],
[], [arg with special chars: $!&*`'()
AT_CHECK([$LIBTOOL --mode=execute ./lt-wrapper "arg with special chars: \$!&*'\`()" </dev/null],
[], [arg with special chars: $!&*'`()
])
AT_CHECK([$LIBTOOL --mode=execute ./foo lt-wrapper "arg with special chars: \$!&*\`'()"],
AT_CHECK([$LIBTOOL --mode=execute ./foo lt-wrapper "arg with special chars: \$!&*'\`()"],
[], [./lt-real
arg with special chars: $!&*`'()
arg with special chars: $!&*'`()
])
LT_AT_NOINST_EXEC_CHECK([./main], [], [], [stdout], [ignore],
["arg with special chars: \$!&*\`'()"])
AT_CHECK([$FGREP 'arg with special chars: $!&*`'\''()' stdout], [], [ignore])
["arg with special chars: \$!&*'\`()"])
AT_CHECK([$FGREP 'arg with special chars: $!&*'\''`()' stdout], [], [ignore])
# We always pair two args. The first one is never the empty string.
arg1=
@ -213,7 +213,7 @@ done
# Check that .la files are not transformed by the wrapper searching loop.
AT_CHECK([$LIBTOOL --mode=execute echo ./main$EXEEXT liba.lo libfakelib.la], [], [stdout])
# This could be .libs/lt-main or similar (or just plain `main').
# This could be .libs/lt-main or similar (or just plain 'main').
AT_CHECK([grep main stdout], [], [ignore])
AT_CHECK([grep liba.lo stdout], [], [ignore])
AT_CHECK([grep libfakelib.la stdout], [], [ignore])

2
tests/f77demo.at
View File

@ -41,7 +41,7 @@ AM_INIT_AUTOMAKE
AC_PROG_CC
AC_PROG_F77
dnl When configuring for `make dist' purposes, skip checks that may yield fatal
dnl When configuring for 'make dist' purposes, skip checks that may yield fatal
dnl errors when there is no working F77 compiler.
if test -z "$with_dist"; then
dnl Check the flags needed to link f77 programs with ld (i.e. cc)

2
tests/fail.at
View File

@ -71,7 +71,7 @@ case $pic_mode in default | no)
esac
# program creation failure.
# We can't rely on `main' not being present: the QNX linker
# We can't rely on 'main' not being present: the QNX linker
# won't error out in that case, although the resulting binary won't work.
# So we provoke a link failure due to an unresolved symbol, and require
# libtool to fail only if the link without libtool would have failed, too.

2
tests/inherited_flags.at
View File

@ -78,7 +78,7 @@ AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo
# We used to grep for
# 'llt_[[ui]]nlikely_existing_lib.*llt_[[ui]]nlikely_existing_lib'
# here. This fails on win32/MSVC because the generated command lines have a
# different syntax. So drop the first `l'.
# different syntax. So drop the first 'l'.
AT_CHECK([$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)], [1], [ignore])
AT_CHECK([grep 'lt_[[ui]]nlikely_existing_lib.*lt_[[ui]]nlikely_existing_lib' stdout],
[0],[ignore],[ignore])

4
tests/libtool.at
View File

@ -101,8 +101,8 @@ for mode in compile link install; do
AT_CHECK([$LIBTOOL -n --mode=$mode $preargs $preflag"$flag:test" $postargs],
[0], [stdout])
# We must not attempt to match $preargs in the output, because libtool
# may modify them. For example, on Cygwin, ``libtool --mode=link gcc -o
# foo foo.o'' becomes ``gcc -o foo.exe foo.o''.
# may modify them. For example, on Cygwin, 'libtool --mode=link gcc -o
# foo foo.o' becomes 'gcc -o foo.exe foo.o'.
AT_CHECK([grep "$mode:.*$match_preflag$flag:test " stdout], [0], [ignore])

838
tests/libtoolize.at
View File

File diff suppressed because it is too large Load Diff

4
tests/lt_dladvise.at
View File

@ -71,13 +71,13 @@ moduletest (lt_dlhandle handle, const char *fname, const char *vname)
if (!f)
{
fprintf (stderr, "function `%s' not found\n", fname);
fprintf (stderr, "function '%s' not found\n", fname);
++errors;
return -1;
}
if (!v)
{
fprintf (stderr, "variable `%s' not found\n", vname);
fprintf (stderr, "variable '%s' not found\n", vname);
++errors;
return -1;
}

4
tests/lt_dlexit.at
View File

@ -61,11 +61,11 @@ xdlsymtest (lt_dlhandle handle, const char *func, const char *var)
pfun_T pf = (pfun_T) lt_dlsym (handle, func);
pvar_T pv = (pvar_T) lt_dlsym (handle, var);
if (pf == NULL) {
fprintf (stderr, "function `%s' not found\n", func);
fprintf (stderr, "function '%s' not found\n", func);
return 1;
}
if (pv == NULL) {
fprintf (stderr, "variable `%s' not found\n", var);
fprintf (stderr, "variable '%s' not found\n", var);
return 1;
}
return (*pf) (*pv);

20
tests/mdemo.at
View File

@ -273,7 +273,7 @@ int test_dl (char *filename) {
}
else
{
fprintf (stderr, "did not find the `hello' function\n");
fprintf (stderr, "did not find the 'hello' function\n");
fprintf (stderr, "error was: %s\n", lt_dlerror());
ret = 1;
}
@ -284,7 +284,7 @@ int test_dl (char *filename) {
*pnothing = 1;
else
{
fprintf (stderr, "did not find the `nothing' variable\n");
fprintf (stderr, "did not find the 'nothing' variable\n");
fprintf (stderr, "error was: %s\n", lt_dlerror());
ret = 1;
}
@ -308,7 +308,7 @@ int test_dl (char *filename) {
}
else
{
fprintf (stderr, "did not find any of the `foo' functions\n");
fprintf (stderr, "did not find any of the 'foo' functions\n");
fprintf (stderr, "error was: %s\n", lt_dlerror());
ret = 1;
}
@ -408,7 +408,7 @@ test_dl (char *filename, int test_ext)
}
else
{
fprintf (stderr, "did not find the `hello' function\n");
fprintf (stderr, "did not find the 'hello' function\n");
fprintf (stderr, "error was: %s\n", lt_dlerror());
ret = 1;
}
@ -419,7 +419,7 @@ test_dl (char *filename, int test_ext)
*pnothing = 1;
else
{
fprintf (stderr, "did not find the `nothing' variable\n");
fprintf (stderr, "did not find the 'nothing' variable\n");
fprintf (stderr, "error was: %s\n", lt_dlerror());
ret = 1;
}
@ -443,7 +443,7 @@ test_dl (char *filename, int test_ext)
}
else
{
fprintf (stderr, "did not find any of the `foo' functions\n");
fprintf (stderr, "did not find any of the 'foo' functions\n");
fprintf (stderr, "error was: %s\n", lt_dlerror());
ret = 1;
}
@ -486,7 +486,7 @@ test_dlself ()
}
else
{
fprintf (stderr, "did not find the `myfunc' function\n");
fprintf (stderr, "did not find the 'myfunc' function\n");
fprintf (stderr, "error was: %s\n", lt_dlerror());
ret = 1;
}
@ -497,7 +497,7 @@ test_dlself ()
*pmyvar = 1;
else
{
fprintf (stderr, "did not find the `myvar' variable\n");
fprintf (stderr, "did not find the 'myvar' variable\n");
fprintf (stderr, "error was: %s\n", lt_dlerror());
ret = 1;
}
@ -688,9 +688,9 @@ _LT_SETUP
LT_AT_CHECK_CONFIG([--with-included-ltdl])
LT_AT_MAKE([all-local libltdl/libltdlc.la])
# create `before' and `after' in a directory deep within objdir,
# create 'before' and 'after' in a directory deep within objdir,
# so that their creation and removal does not modify even a timestamp
# in the output of `ls -l . $objdir'
# in the output of 'ls -l . $objdir'
$lt_INSTALL -d "$objdir/temp/temp"
before=$objdir/temp/temp/before
after=$objdir/temp/temp/after

4
tests/need_lib_prefix.at
View File

@ -74,12 +74,12 @@ moduletest (lt_dlhandle handle)
if (!f)
{
complain ("function `f' not found");
complain ("function 'f' not found");
return 1;
}
if (!v)
{
complain ("variable `i' not found");
complain ("variable 'i' not found");
return 1;
}
printf ("%s: %d\n", info->name, f (*v));

92
tests/old-ltdl-iface.at
View File

@ -76,55 +76,55 @@ int main (int argc, const void *argv[]) {
]])
AT_DATA([expout],
[[libtoolize: putting auxiliary files in `.'.
libtoolize: linking file `./config.guess'
libtoolize: linking file `./config.sub'
libtoolize: linking file `./install-sh'
libtoolize: linking file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `m4'.
libtoolize: linking file `m4/argz.m4'
libtoolize: linking file `m4/libtool.m4'
libtoolize: linking file `m4/ltdl.m4'
libtoolize: linking file `m4/ltoptions.m4'
libtoolize: linking file `m4/ltsugar.m4'
libtoolize: linking file `m4/ltversion.m4'
libtoolize: linking file `m4/lt~obsolete.m4'
libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, `ltdl'.
libtoolize: linking file `ltdl/COPYING.LIB'
libtoolize: linking file `ltdl/README'
libtoolize: linking file `ltdl/argz_.h'
libtoolize: linking file `ltdl/argz.c'
libtoolize: linking file `ltdl/libltdl/lt__alloc.h'
libtoolize: linking file `ltdl/libltdl/lt__dirent.h'
libtoolize: linking file `ltdl/libltdl/lt__glibc.h'
libtoolize: linking file `ltdl/libltdl/lt__private.h'
libtoolize: linking file `ltdl/libltdl/lt__strl.h'
libtoolize: linking file `ltdl/libltdl/lt_dlloader.h'
libtoolize: linking file `ltdl/libltdl/lt_error.h'
libtoolize: linking file `ltdl/libltdl/lt_system.h'
libtoolize: linking file `ltdl/libltdl/slist.h'
libtoolize: linking file `ltdl/loaders/dld_link.c'
libtoolize: linking file `ltdl/loaders/dlopen.c'
libtoolize: linking file `ltdl/loaders/dyld.c'
libtoolize: linking file `ltdl/loaders/load_add_on.c'
libtoolize: linking file `ltdl/loaders/loadlibrary.c'
libtoolize: linking file `ltdl/loaders/preopen.c'
libtoolize: linking file `ltdl/loaders/shl_load.c'
libtoolize: linking file `ltdl/lt__alloc.c'
libtoolize: linking file `ltdl/lt__dirent.c'
libtoolize: linking file `ltdl/lt__strl.c'
libtoolize: linking file `ltdl/lt_dlloader.c'
libtoolize: linking file `ltdl/lt_error.c'
libtoolize: linking file `ltdl/ltdl.c'
libtoolize: linking file `ltdl/ltdl.h'
libtoolize: creating file `ltdl/ltdl.mk'
libtoolize: renaming file `ltdl/Makefile.inc'
libtoolize: linking file `ltdl/slist.c'
libtoolize: Consider updating to use of `include ltdl/ltdl.mk' in Makefile.am.
[[libtoolize: putting auxiliary files in '.'.
libtoolize: linking file './config.guess'
libtoolize: linking file './config.sub'
libtoolize: linking file './install-sh'
libtoolize: linking file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: linking file 'm4/argz.m4'
libtoolize: linking file 'm4/libtool.m4'
libtoolize: linking file 'm4/ltdl.m4'
libtoolize: linking file 'm4/ltoptions.m4'
libtoolize: linking file 'm4/ltsugar.m4'
libtoolize: linking file 'm4/ltversion.m4'
libtoolize: linking file 'm4/lt~obsolete.m4'
libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, 'ltdl'.
libtoolize: linking file 'ltdl/COPYING.LIB'
libtoolize: linking file 'ltdl/README'
libtoolize: linking file 'ltdl/argz_.h'
libtoolize: linking file 'ltdl/argz.c'
libtoolize: linking file 'ltdl/libltdl/lt__alloc.h'
libtoolize: linking file 'ltdl/libltdl/lt__dirent.h'
libtoolize: linking file 'ltdl/libltdl/lt__glibc.h'
libtoolize: linking file 'ltdl/libltdl/lt__private.h'
libtoolize: linking file 'ltdl/libltdl/lt__strl.h'
libtoolize: linking file 'ltdl/libltdl/lt_dlloader.h'
libtoolize: linking file 'ltdl/libltdl/lt_error.h'
libtoolize: linking file 'ltdl/libltdl/lt_system.h'
libtoolize: linking file 'ltdl/libltdl/slist.h'
libtoolize: linking file 'ltdl/loaders/dld_link.c'
libtoolize: linking file 'ltdl/loaders/dlopen.c'
libtoolize: linking file 'ltdl/loaders/dyld.c'
libtoolize: linking file 'ltdl/loaders/load_add_on.c'
libtoolize: linking file 'ltdl/loaders/loadlibrary.c'
libtoolize: linking file 'ltdl/loaders/preopen.c'
libtoolize: linking file 'ltdl/loaders/shl_load.c'
libtoolize: linking file 'ltdl/lt__alloc.c'
libtoolize: linking file 'ltdl/lt__dirent.c'
libtoolize: linking file 'ltdl/lt__strl.c'
libtoolize: linking file 'ltdl/lt_dlloader.c'
libtoolize: linking file 'ltdl/lt_error.c'
libtoolize: linking file 'ltdl/ltdl.c'
libtoolize: linking file 'ltdl/ltdl.h'
libtoolize: creating file 'ltdl/ltdl.mk'
libtoolize: renaming file 'ltdl/Makefile.inc'
libtoolize: linking file 'ltdl/slist.c'
libtoolize: Consider updating to use of 'include ltdl/ltdl.mk' in Makefile.am.
]])
AT_DATA([experr],
[[libtoolize: error: Use of `include ltdl/Makefile.inc' is deprecated!
[[libtoolize: error: Use of 'include ltdl/Makefile.inc' is deprecated!
]])
LT_AT_CHECK_LIBTOOLIZE([--ltdl=ltdl --nonrecursive --install], 0, [expout], [experr])

18
tests/old-m4-iface.at
View File

@ -181,15 +181,15 @@ AC_OUTPUT
]])
AT_DATA(expout,
[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
libtoolize: copying file `build-aux/ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, 'build-aux'.
libtoolize: copying file 'build-aux/ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
]])
LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout)

18
tests/static.at
View File

@ -33,10 +33,10 @@
# - simply remove the libraries before execution. If the program still works,
# then the library was linked statically.
# -Does this work on all systems?
# -No, it will fail on AIX with non-rtl-created libraries: plain `-static'
# will only cause the linker not to consider `*.so' libraries, but only
# `*.a'. The latter, however, may still be shared images. :-/
# `-all-static' still works, however.
# -No, it will fail on AIX with non-rtl-created libraries: plain '-static'
# will only cause the linker not to consider '*.so' libraries, but only
# '*.a'. The latter, however, may still be shared images. :-/
# '-all-static' still works, however.
#
# It will not work with dlpreloading until we fix its related bug.
#
@ -55,9 +55,9 @@
# - 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
# value, then `-Bstatic'/`-Bdynamic' override that
# - `-Bdefault' resets to the default value given by the other switches.
# - '-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.
# - TODO: test exposure for dlopened and dlpreopened modules,
# without and with diverse static flag combinations.
@ -187,7 +187,7 @@ func_test_exec ()
func_test_exec_fail ()
{
# No point in testing if we're linking statically anyway.
# TODO: Maybe in the `else' case we could test for success?
# TODO: Maybe in the 'else' case we could test for success?
if $have_shared; then
echo "## The following should fail:"
for st
@ -325,7 +325,7 @@ for withdep in no yes; do
# - remove the library images to catch failure to link statically/dynamically,
# - add false other deplibs in the paths to catch (some) wrongly added run paths.
# if `-all-static' does not work, do not exercise it any more.
# if '-all-static' does not work, do not exercise it any more.
all_static=-all-static
test -z "$link_static_flag" && all_static=

2
tests/stresstest.at
View File

@ -264,7 +264,7 @@ do
[0],[ignore],[ignore])
for st in '' '-static' '-no-install'
do
# if `-static' is not passed, and the library is shared, then we have
# if '-static' is not passed, and the library is shared, then we have
# to use -DLIBA_DLL_IMPORT, thus main.lo (and not main-static.lo).
case $st,$l3 in
-static,*) mst=-static ;;

14
tests/testsuite.at
View File

@ -104,7 +104,7 @@ mv -f $1.t $1
])dnl
# LT_AT_CHECK_LIBTOOLIZE(ARGS, [EXIT-STATUS = 0], [STDOUT = `'], [STDERR = `'])
# LT_AT_CHECK_LIBTOOLIZE(ARGS, [EXIT-STATUS = 0], [STDOUT = ''], [STDERR = ''])
# -----------------------------------------------------------------------------
m4_define([LT_AT_CHECK_LIBTOOLIZE],
[m4_if([$3], [expout], [_LIBTOOLIZE_TRANSFORM([$3])])dnl
@ -317,7 +317,7 @@ LT_AT_UNIFY_NL([$1.t], [m4_default([$2], [$1])])[]dnl
# Run EXECUTABLE ARGS-OR-STATUS-ADJUST. STATUS, STDOUT, and STDERR are
# handled as in AT_CHECK.
# However, if we are cross-compiling, then SKIP instead of FAIL.
# ARGS-OR-STATUS-ADJUST can also contain code like `|| (exit 1)'
# ARGS-OR-STATUS-ADJUST can also contain code like '|| (exit 1)'
# to unify different possible exit status values.
m4_define([LT_AT_EXEC_CHECK],
[lt_exe=$1; if test -f "$1$EXEEXT"; then lt_exe=$lt_exe$EXEEXT; fi
@ -332,11 +332,11 @@ AT_CHECK([if "$lt_exe" $5; then :; else lt_status=$?; ]dnl
# [STATUS = 0], [STDOUT], [STDERR],
# [ARGS-OR-STATUS-ADJUST])
# ---------------------------------------------------------
# Run EXECUTABLE ARGS-OR-STATUS-ADJUST using `libtool --mode=execute'
# with `-dlopen' arguments in NOINST_MODULES. STATUS, STDOUT, and
# Run EXECUTABLE ARGS-OR-STATUS-ADJUST using 'libtool --mode=execute'
# with '-dlopen' arguments in NOINST_MODULES. STATUS, STDOUT, and
# STDERR are handled as in AT_CHECK.
# However, if we are cross-compiling, then SKIP instead of FAIL.
# ARGS-OR-STATUS-ADJUST can also contain code like `|| (exit 1)'
# ARGS-OR-STATUS-ADJUST can also contain code like '|| (exit 1)'
# to unify different possible exit status values.
m4_define([LT_AT_NOINST_EXEC_CHECK],
[lt_exe=$1; if test -f "$1$EXEEXT"; then lt_exe=$lt_exe$EXEEXT; fi
@ -387,7 +387,7 @@ m4_case([$1],
# LT_AT_MVDIR(SRC, DEST)
# ----------------------
# Move contents of a directory recursively.
# Avoid `mv DIR ...' due to issues with non-deletable shared libraries
# Avoid 'mv DIR ...' due to issues with non-deletable shared libraries
# on AIX on NFS mounts. We cannot use slibclean as non-superuser.
m4_define([LT_AT_MVDIR],
[$mkdir_p $2
@ -509,7 +509,7 @@ m4_popdef([_ARG_DIR])
])# _LTDL_PROJECT_FILES
# We use `dnl' in zillions of places...
# We use 'dnl' in zillions of places...
m4_pattern_allow([^dnl$])
# We exercise these tools.

2
tests/versioning.at
View File

@ -122,7 +122,7 @@ done
# Hypothesis: -version-info can be passed kinds of values, esp. zero ones
# and large ones.
# TODO: check something like 1001:2419:189 after fixing issues
# for `version_type's of `irix', `nonstopux', or `osf'.
# for 'version_type's of 'irix', 'nonstopux', or 'osf'.
for version_info in 1 1:2 0:0:0 1:1:1 13:241:7; do
AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la liba1.lo ]dnl
[-version-info $version_info -rpath $libdir], [], [ignore], [ignore])