[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Libtool branch, master, updated. v2.4.2-121-g61e09a5
|
From: |
Gary V. Vaughan |
|
Subject: |
[SCM] GNU Libtool branch, master, updated. v2.4.2-121-g61e09a5 |
|
Date: |
Fri, 25 Nov 2011 08:51:19 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".
The branch, master has been updated
via 61e09a55669820ab0cd2bb3ffcdbd8e40baa6497 (commit)
via 962aa919f51cdf8e2cee4fb2d1d9bafa34d50887 (commit)
via 8fad6be03e8eca44e5e771cfbb907d3840a8e01e (commit)
via 4757bf0637658fd2e298042d9f7a0d51c5f49495 (commit)
via a53d6cc4983d5c274b9db259835af12c12842a6b (commit)
via 06c6555d4a77a5e91f43da3451586534da93e0ae (commit)
via 59e09030ae0f79108745dd527b2fd03f0f149696 (commit)
via 11d16ab06c36948c053c507f5f9e06ff3de221c7 (commit)
via 0893c48bdaa0d1cc1bc9e434f43df14b5994ede3 (commit)
from f9fe50d499e261d63123464d7ceb87b1c0619753 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 61e09a55669820ab0cd2bb3ffcdbd8e40baa6497
Author: Gary V. Vaughan <address@hidden>
Date: Mon Nov 21 18:02:23 2011 +0700
syntax-check: fix violations and implement sc_prohibit_sed_s_comma.
I like to name temporary directories that I will remove shortly
with two leading commas so that they sort lexicographically at
the top of `ls' output. Now, `./configure
--prefix=`pwd`/,,inst' works again, for the first time in
several years.
* cfg.mk (sc_prohibit_sed_s_comma): Comma is too common a
character to use routinely as the separator for sed
substitutions on file paths and other variables determined by
the user, causing bugs like the one I describe above. Make sure
we don't accidentally reintroduce any comma separators in
future.
* Makefile.am, bootstrap, bootstrap.conf, build-aux/extract-trace,
build-aux/general.m4sh, build-aux/git-hooks/commit-msg,
build-aux/git-log-fix, build-aux/ltmain.m4sh, libtoolize.m4sh,
m4/libtool.m4, m4/ltdl.m4, tests/cdemo-undef.test,
tests/cmdline_wrap.at, tests/darwin.at, tests/defs.m4sh,
tests/getopt-m4sh.at, tests/install.at, tests/libtoolize.at,
tests/mdemo/Makefile.am, tests/need_lib_prefix.at,
tests/sysroot.at, tests/tagdemo-undef.test, tests/testsuite.at:
Try to use `|' as the default separator wherever possible,
otherwise something else that doesn't occur in the substitution
expression.
* NEWS: Updated.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit 962aa919f51cdf8e2cee4fb2d1d9bafa34d50887
Author: Gary V. Vaughan <address@hidden>
Date: Mon Nov 21 11:35:20 2011 +0700
syntax-check: fix violations and implement
sc_prohibit_test_const_follows_var.
To safely use a non-literal first argument to `test', you must
always prepend a literal non-`-' character, but often the second
operand is a constant that doesn't begin with a `-' already, so
always use `test a = "$b"' instead of noisy `test "X$b" = Xa'.
* cfg.mk (sc_prohibit_test_const_follows_var): New syntax-check
rule to ensure we don't reintroduce noisy test operands.
* bootstrap, build-aux/extract-trace, build-aux/general.m4sh,
build-aux/ltmain.m4sh, doc/libtool.texi, libtoolize.m4sh,
m4/argz.m4, m4/libtool.m4, m4/ltdl.m4, tests/bindir.at,
tests/defs.m4sh, tests/demo-relink.test,
tests/demo/configure.ac, tests/depdemo-relink.test,
tests/destdir.at, tests/duplicate_conv.at, tests/fail.at,
tests/getopt-m4sh.at, tests/help.at, tests/libtoolize.at,
tests/link-2.test, tests/link-order2.at, tests/lt_dlopenext.at,
tests/mdemo/configure.ac, tests/mdemo2/configure.ac,
tests/need_lib_prefix.at, tests/nocase.at,
tests/pdemo/configure.ac, tests/pic_flag.at,
tests/search-path.at, tests/shlibpath.at, tests/static.at,
tests/sysroot.at, tests/tagtrace.test, tests/testsuite.at,
tests/with-pic.at: Swap operands to avoid useless noise.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit 8fad6be03e8eca44e5e771cfbb907d3840a8e01e
Author: Gary V. Vaughan <address@hidden>
Date: Sun Nov 20 21:08:24 2011 +0700
syntax-check: fix violations and implement
sc_useless_braces_in_variable_derefs.
Until now, libtool sources have used braced variable names
seemingly at random! Almost always the braces are just noise, so
remove all the unnecessary ones.
* cfg.mk (sc_useless_braces_in_variable_derefs): New syntax
check rule to ensure we only reintroduce braced variable
dereferences if they are followed by a valid variable name
character.
build-aux/general.m4sh, build-aux/git-hooks/commit-msg,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
libltdl/configure.ac, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/defs.m4sh, tests/demo-nopic.test,
tests/depdemo/configure.ac, tests/flags.at, tests/link.test,
tests/objectlist.test, tests/quote.test, tests/static.at: Remove
spurious braces.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit 4757bf0637658fd2e298042d9f7a0d51c5f49495
Author: Gary V. Vaughan <address@hidden>
Date: Sat Nov 19 22:53:20 2011 +0700
syntax-check: fix violations and implement sc_prohibit_bare_basename.
* cfg.mk (sc_prohibit_bare_basename, sc_prohibit_basename_with_sed):
Make sure not to go back to using occasional `|$basename' or
`|$dirname' syntax.
* build-aux/git-hooks/commit-msg, build-aux/ltmain.m4sh,
* build-aux/options-parser, tests/fcdemo-conf.test,
* tests/fcdemo-shared.test, tests/fcdemo-static.test,
* tests/libtoolize.at: Fix violations.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit a53d6cc4983d5c274b9db259835af12c12842a6b
Author: Gary V. Vaughan <address@hidden>
Date: Wed Nov 16 23:21:18 2011 +0700
tests: migrate tests/sh.test checks to syntax-checks.
Some modernization of the legacy testsuite.
* tests/sh.test: Remove.
* Makefile.am (COMMON_TESTS): Adjust.
* cfg.mk (sc_libtool_m4_cc_basename, sc_prohibit_bracket_as_test)
(sc_prohibit_nested_quotes, sc_prohibit_set_dummy_without_shift)
(sc_prohibit_set_minus_minus, sc_prohibit_test_binary_operators)
(sc_prohibit_test_dollar, sc_prohibit_test_minus_e)
(sc_prohibit_test_unary_operators, sc_prohibit_test_X)
(sc_prohibit_Xsed_withou_X, sc_require_function_nl_brace):
Functionally identical tests to what used to be performed by
sh.test, only with coverage of all files.
* bootstrap, build-aux/edit-readme-alpha,
build-aux/extract-trace, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, configure.ac, m4/libtool.m4, m4/ltdl.m4,
tests/bindir.at, tests/configure-iface.at, tests/cwrapper.at,
tests/darwin.at, tests/defs.m4sh, tests/demo-hardcode.test,
tests/dlloader-api.at, tests/exceptions.at,
tests/getopt-m4sh.at, tests/lalib-syntax.at, tests/link-2.test,
tests/link-order2.at, tests/loadlibrary.at,
tests/lt_dladvise.at, tests/lt_dlexit.at, tests/lt_dlopen_a.at,
tests/lt_dlopenext.at, tests/need_lib_prefix.at,
tests/nonrecursive.at, tests/recursive.at, tests/resident.at,
tests/standalone.at, tests/static.at, tests/stresstest.at,
tests/subproject.at, tests/sysroot.at, tests/tagtrace.test,
tests/testsuite.at: Fix violations of the new syntax checks.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit 06c6555d4a77a5e91f43da3451586534da93e0ae
Author: Gary V. Vaughan <address@hidden>
Date: Wed Nov 16 18:59:01 2011 +0700
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit 59e09030ae0f79108745dd527b2fd03f0f149696
Author: Gary V. Vaughan <address@hidden>
Date: Wed Nov 16 15:00:47 2011 +0700
syntax-check: fix violations and implement sc_useless_quotes_in_case.
Contrary to popular belief, Bourne shell does not resplit case
expressions after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (sc_useless_quotes_in_case): New syntax-check rule to
ensure we don't reintroduce useless quoted case expressions.
* build-aux/ltmain.m4sh, m4/libtool.m4, tests/bindir.at,
tests/darwin.at, tests/defs.m4sh, tests/demo-hardcode.test,
tests/demo-nopic.test, tests/link-2.test, tests/quote.test,
tests/sysroot.at: Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit 11d16ab06c36948c053c507f5f9e06ff3de221c7
Author: Gary V. Vaughan <address@hidden>
Date: Fri Nov 25 14:39:57 2011 +0700
maint: quote $file correctly in bootstrap.
* bootstrap (func_insert_sorted_if_absent): Don't forget the
double quotes, since we can't control the content of $file.
Reported by Steffano Lattarini.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit 0893c48bdaa0d1cc1bc9e434f43df14b5994ede3
Author: Gary V. Vaughan <address@hidden>
Date: Fri Nov 25 14:50:37 2011 +0700
build: fix a quoting bug when regenerating with bootstrap_edit.
* Makefile.am (m4/ltversion.m4, build-aux/ltmain.sh): The
bootstrap_edit make macro already contains double quotes, so
when echoing it, don't surround it with more double quotes since
it is not escaped.
Signed-off-by: Gary V. Vaughan <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 99 ++--
NEWS | 1 +
bootstrap | 157 ++--
bootstrap.conf | 46 +-
build-aux/edit-readme-alpha | 6 +-
build-aux/extract-trace | 14 +-
build-aux/general.m4sh | 120 ++--
build-aux/getopt.m4sh | 16 +-
build-aux/git-hooks/commit-msg | 14 +-
build-aux/git-log-fix | 48 +-
build-aux/ltmain.m4sh | 1587 ++++++++++++++++++++--------------------
build-aux/options-parser | 34 +-
cfg.mk | 171 +++++
configure.ac | 12 +-
doc/libtool.texi | 10 +-
libltdl/configure.ac | 2 +-
libtoolize.m4sh | 178 +++---
m4/argz.m4 | 14 +-
m4/libtool.m4 | 1268 ++++++++++++++++----------------
m4/ltdl.m4 | 102 ++--
m4/ltoptions.m4 | 24 +-
tests/bindir.at | 16 +-
tests/cdemo-undef.test | 2 +-
tests/cmdline_wrap.at | 2 +-
tests/configure-iface.at | 8 +-
tests/cwrapper.at | 6 +-
tests/darwin.at | 6 +-
tests/defs.m4sh | 50 +-
tests/demo-hardcode.test | 10 +-
tests/demo-nopic.test | 6 +-
tests/demo-relink.test | 6 +-
tests/demo/configure.ac | 4 +-
tests/depdemo-relink.test | 6 +-
tests/depdemo/configure.ac | 2 +-
tests/destdir.at | 2 +-
tests/dlloader-api.at | 2 +-
tests/duplicate_conv.at | 2 +-
tests/exceptions.at | 2 +-
tests/fail.at | 4 +-
tests/fcdemo-conf.test | 2 +-
tests/fcdemo-shared.test | 2 +-
tests/fcdemo-static.test | 2 +-
tests/flags.at | 2 +-
tests/getopt-m4sh.at | 4 +-
tests/help.at | 4 +-
tests/install.at | 2 +-
tests/lalib-syntax.at | 4 +-
tests/libtoolize.at | 22 +-
tests/link-2.test | 4 +-
tests/link-order2.at | 14 +-
tests/link.test | 2 +-
tests/loadlibrary.at | 2 +-
tests/lt_dladvise.at | 4 +-
tests/lt_dlexit.at | 2 +-
tests/lt_dlopen_a.at | 2 +-
tests/lt_dlopenext.at | 8 +-
tests/mdemo/Makefile.am | 2 +-
tests/mdemo/configure.ac | 4 +-
tests/mdemo2/configure.ac | 4 +-
tests/need_lib_prefix.at | 8 +-
tests/no-executables.at | 2 +-
tests/nocase.at | 2 +-
tests/nonrecursive.at | 4 +-
tests/objectlist.test | 4 +-
tests/pdemo/configure.ac | 4 +-
tests/pic_flag.at | 2 +-
tests/quote.test | 34 +-
tests/recursive.at | 4 +-
tests/resident.at | 2 +-
tests/search-path.at | 2 +-
tests/sh.test | 134 ----
tests/shlibpath.at | 4 +-
tests/standalone.at | 4 +-
tests/static.at | 40 +-
tests/stresstest.at | 2 +-
tests/subproject.at | 4 +-
tests/suffix.test | 2 +-
tests/sysroot.at | 10 +-
tests/tagdemo-undef.test | 2 +-
tests/tagtrace.test | 4 +-
tests/testsuite.at | 18 +-
tests/with-pic.at | 4 +-
82 files changed, 2240 insertions(+), 2207 deletions(-)
delete mode 100755 tests/sh.test
diff --git a/Makefile.am b/Makefile.am
index 2c6cf81..c55dfdd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,7 +52,7 @@ LT_M4SH = $(M4SH) -B
'$(srcdir)/$(m4sh_dir)'
lt__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
git_version_gen = '$(SHELL)' '$(aux_dir)/git-version-gen' '.tarball-version'
-rebuild = rebuild=:; revision=`$(lt__cd) $(srcdir) && $(git_version_gen) | sed
's,-.*$$,,g'`
+rebuild = rebuild=:; revision=`$(lt__cd) $(srcdir) && $(git_version_gen) | sed
's|-.*$$||g'`
# ---------- #
@@ -108,18 +108,18 @@ EXTRA_DIST += $(extract_trace) $(libtoolize_in)
$(libtoolize_m4sh) \
## because they must be static in distributed files, and not accidentally
## changed by configure running on the build machine.
bootstrap_edit = $(SED) \
- -e 's,@MACRO_VERSION\@,$(VERSION),g' \
- -e "s,@MACRO_REVISION\@,$$revision,g" \
- -e "s,@MACRO_SERIAL\@,$$serial,g" \
- -e 's,@PACKAGE\@,$(PACKAGE),g' \
- -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
- -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
- -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
- -e "s,@package_revision\@,$$revision,g" \
- -e 's,@PACKAGE_STRING\@,$(PACKAGE_NAME) $(VERSION),g' \
- -e 's,@PACKAGE_TARNAME\@,$(PACKAGE),g' \
- -e 's,@PACKAGE_VERSION\@,$(VERSION),g' \
- -e 's,@VERSION\@,$(VERSION),g'
+ -e 's|@MACRO_VERSION\@|$(VERSION)|g' \
+ -e "s|@MACRO_REVISION\@|$$revision|g" \
+ -e "s|@MACRO_SERIAL\@|$$serial|g" \
+ -e 's|@PACKAGE\@|$(PACKAGE)|g' \
+ -e 's|@PACKAGE_BUGREPORT\@|$(PACKAGE_BUGREPORT)|g' \
+ -e 's|@PACKAGE_URL\@|$(PACKAGE_URL)|g' \
+ -e 's|@PACKAGE_NAME\@|$(PACKAGE_NAME)|g' \
+ -e "s|@package_revision\@|$$revision|g" \
+ -e 's|@PACKAGE_STRING\@|$(PACKAGE_NAME) $(VERSION)|g' \
+ -e 's|@PACKAGE_TARNAME\@|$(PACKAGE)|g' \
+ -e 's|@PACKAGE_VERSION\@|$(VERSION)|g' \
+ -e 's|@VERSION\@|$(VERSION)|g'
## ltmain.sh needs some additional editing to remove unsubstituted
## variable defaulting lines, because ltmain.sh never gets passed
@@ -139,7 +139,7 @@ $(ltversion_m4): $(ltversion_in) $(dotversion)
@$(rebuild); \
if test -f '$@'; then \
eval `'$(SED)' -n '/^macro_revision=/p' '$@'`; \
- test x"$$macro_revision" = x"$$revision" && rebuild=false; \
+ test "x$$macro_revision" = "x$$revision" && rebuild=false; \
fi; \
for prereq in $?; do \
case $$prereq in *.version);; *) rebuild=:;; esac; \
@@ -152,7 +152,7 @@ $(ltversion_m4): $(ltversion_in) $(dotversion)
serial=`$(git_commit_count)`; \
fi; \
if test 0 = '$(V)'; then echo " GEN " $@; \
- else echo "$(bootstrap_edit) '$(ltversion_in)' > '$@'"; fi; \
+ else echo $(bootstrap_edit) "'$(ltversion_in)' > '$@'"; fi; \
$(bootstrap_edit) '$(ltversion_in)' > '$@'; \
chmod a-w '$@'; \
fi
@@ -171,7 +171,7 @@ $(ltmain_sh): $(ltmain_m4sh) $(sh_files) $(dotversion)
@$(rebuild); \
if test -f '$@'; then \
eval `'$(SED)' -n '/^package_revision=/p' '$@'`; \
- test x"$$package_revision" = x"$$revision" && rebuild=false; \
+ test "x$$package_revision" = "x$$revision" && rebuild=false; \
fi; \
for prereq in $?; do \
case $$prereq in *.version);; *) rebuild=:;; esac; \
@@ -179,7 +179,7 @@ $(ltmain_sh): $(ltmain_m4sh) $(sh_files) $(dotversion)
if $$rebuild; then \
rm -f '$@'; \
if test 0 = '$(V)'; then echo " GEN " $@; \
- else echo "$(LT_M4SH) '$(ltmain.m4sh)' | $(ltmain_sh_edit) > '$@'";
fi; \
+ else echo "$(LT_M4SH) '$(ltmain.m4sh)' |" $(ltmain_sh_edit) "> '$@'";
fi; \
$(LT_M4SH) '$(ltmain_m4sh)' | $(ltmain_sh_edit) > '$@'; \
chmod a-w '$@'; \
fi
@@ -210,8 +210,8 @@ $(lt_Makefile_am): $(ltdl_mk)
}; \
'$(SED)' -n '/^.. DO NOT REMOVE THIS LINE -- /,$$p' \
'$(ltdl_mk)' \
- |'$(SED)' -e 's,libltdl_,,; s,libltdl/,,; s,: libltdl/,: ,' \
- -e 's,\$$(libltdl_,$$(,' \
+ |'$(SED)' -e 's|libltdl_||; s|libltdl/||; s|: libltdl/|: |' \
+ -e 's|\$$(libltdl_|$$(|' \
) |'$(SED)' -e '/^.. DO NOT REMOVE THIS LINE -- /d' \
-e '1s,^\(.. Makefile.\)inc.*,\1am -- Process this file with
automake to produce Makefile.in,' > '$@'
$(AM_V_at)chmod a-w '$@'
@@ -275,26 +275,26 @@ all-local: $(LTDL_BOOTSTRAP_DEPS)
ltdl_ac_aux_dir = `$(extract_trace) AC_CONFIG_AUX_DIR
$(srcdir)/libltdl/configure.ac`
configure_edit = $(SED) \
- -e 's,@aclocaldir\@,$(aclocaldir),g' \
- -e 's,@aux_dir\@,$(aux_dir),g' \
- -e 's,@datadir\@,$(datadir),g' \
- -e 's,@EGREP\@,$(EGREP),g' \
- -e 's,@FGREP\@,$(FGREP),g' \
- -e 's,@GREP\@,$(GREP),g' \
- -e 's,@host_triplet\@,$(host_triplet),g' \
- -e 's,@LN_S\@,$(LN_S),g' \
- -e "s,@ltdl_ac_aux_dir\@,$(ltdl_ac_aux_dir),g" \
- -e 's,@macro_dir\@,$(macro_dir),g' \
- -e 's,@pkgauxdir\@,$(pkgauxdir),g' \
- -e 's,@pkgaux_files\@,$(pkgaux_scripts) $(pkgaux_data_files),g' \
- -e 's,@pkgaux_install_files\@,$(pkgaux_install_files),g' \
- -e 's,@pkgaux_parent_files\@,$(pkgaux_parent_files),g' \
- -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
- -e 's,@pkgltdl_files\@,$(pkgltdl_files),g' \
- -e 's,@pkgmacro_files\@,$(pkgmacro_files),g' \
- -e 's,@prefix\@,$(prefix),g' \
- -e 's,@SED\@,$(SED),g' \
- -e 's,@srcdir\@,$(srcdir),g'
+ -e 's|@aclocaldir\@|$(aclocaldir)|g' \
+ -e 's|@aux_dir\@|$(aux_dir)|g' \
+ -e 's|@datadir\@|$(datadir)|g' \
+ -e 's|@EGREP\@|$(EGREP)|g' \
+ -e 's|@FGREP\@|$(FGREP)|g' \
+ -e 's|@GREP\@|$(GREP)|g' \
+ -e 's|@host_triplet\@|$(host_triplet)|g' \
+ -e 's|@LN_S\@|$(LN_S)|g' \
+ -e "s|@ltdl_ac_aux_dir\@|$(ltdl_ac_aux_dir)|g" \
+ -e 's|@macro_dir\@|$(macro_dir)|g' \
+ -e 's|@pkgauxdir\@|$(pkgauxdir)|g' \
+ -e 's|@pkgaux_files\@|$(pkgaux_scripts) $(pkgaux_data_files)|g' \
+ -e 's|@pkgaux_install_files\@|$(pkgaux_install_files)|g' \
+ -e 's|@pkgaux_parent_files\@|$(pkgaux_parent_files)|g' \
+ -e 's|@pkgdatadir\@|$(pkgdatadir)|g' \
+ -e 's|@pkgltdl_files\@|$(pkgltdl_files)|g' \
+ -e 's|@pkgmacro_files\@|$(pkgmacro_files)|g' \
+ -e 's|@prefix\@|$(prefix)|g' \
+ -e 's|@SED\@|$(SED)|g' \
+ -e 's|@srcdir\@|$(srcdir)|g'
# The libtool distributor and the standalone libtool script.
bin_SCRIPTS = libtoolize libtool
@@ -326,7 +326,7 @@ libtool: $(ltmain_sh) $(config_status) $(dotversion)
.PHONY: configure-subdirs
configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
$(DIST_MAKEFILE_LIST):
- $(AM_V_at)dir=`echo '$@' |'$(SED)' 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \
+ $(AM_V_at)dir=`echo '$@' |'$(SED)' 's|^[^/]*$$|.|;s|/[^/]*$$||'`; \
test -d "$$dir" || mkdir "$$dir" || exit 1; \
abs_srcdir=`$(lt__cd) '$(srcdir)' && pwd`; \
(cd "$$dir" && "$$abs_srcdir/$$dir/configure" --with-dist) || exit 1
@@ -363,12 +363,12 @@ $(stamp_mk): $(lt_Makefile_in)
$(AM_V_at)T='$(srcdir)/$(aux_dir)/Makefile.tmp'; \
for p in $(srcdir)/$(aux_dir)/*; do \
test -f "$$p" || continue; \
- f=`echo "$$p" | $(SED) 's,^$(srcdir)/$(aux_dir)/,,'`; \
+ f=`echo "$$p" | $(SED) 's|^$(srcdir)/$(aux_dir)/||'`; \
case " $(pkgaux_scripts) ltmain.sh " in \
*" $$f "*) ;; \
*) '$(SED)' \
- -e 's,\(\$$([^)]*)/\)*'"$(ltdl_ac_aux_dir)/$$f"'\$$,,' \
- -e 's,\(\$$([^)]*)/\)*'"$(ltdl_ac_aux_dir)/$$f"' ,,' \
+ -e 's|\(\$$([^)]*)/\)*'"$(ltdl_ac_aux_dir)/$$f"'\$$||' \
+ -e 's|\(\$$([^)]*)/\)*'"$(ltdl_ac_aux_dir)/$$f"' ||' \
-e '/^[ ]*\\$$/d' \
'$(lt_Makefile_in)' > "$$T" \
&& mv -f "$$T" '$(lt_Makefile_in)';; \
@@ -510,7 +510,7 @@ install-data-local: $(lt_Makefile_in)
-rm -rf '$(DESTDIR)$(pkgdatadir)'/*
## First, put a copy of the libtool m4 macros in the aclocal dir
@list='$(pkgmacro_files)'; for p in $$list; do \
- d=`echo "$(DESTDIR)$(aclocaldir)/$$p" |$(SED) 's,[^/]*$$,,'`; \
+ d=`echo "$(DESTDIR)$(aclocaldir)/$$p" |$(SED) 's|[^/]*$$||'`; \
test -d "$$d" || $(mkinstalldirs) "$$d"; \
echo " $(INSTALL_DATA) '$(srcdir)/$(macro_dir)/$$p'
'$(DESTDIR)$(aclocaldir)/$$p'"; \
$(INSTALL_DATA) "$(srcdir)/$(macro_dir)/$$p"
"$(DESTDIR)$(aclocaldir)/$$p"; \
@@ -518,20 +518,20 @@ install-data-local: $(lt_Makefile_in)
## install the helper scripts
@list='extract-trace options-parser $(pkgaux_scripts)' && \
for p in $$list; do \
- d=`echo "$(DESTDIR)$(pkgauxdir)/$$p" |$(SED) 's,[^/]*$$,,'`; \
+ d=`echo "$(DESTDIR)$(pkgauxdir)/$$p" |$(SED) 's|[^/]*$$||'`; \
test -d "$$d" || $(mkinstalldirs) "$$d"; \
echo " $(INSTALL_SCRIPT) '$(srcdir)/$(aux_dir)/$$p'
'$(DESTDIR)$(pkgauxdir)/$$p'"; \
$(INSTALL_SCRIPT) "$(srcdir)/$(aux_dir)/$$p"
"$(DESTDIR)$(pkgauxdir)/$$p"; \
done
@list='$(pkgaux_data_files)' && for p in $$list; do \
- d=`echo "$(DESTDIR)$(pkgauxdir)/$$p" |$(SED) 's,[^/]*$$,,'`; \
+ d=`echo "$(DESTDIR)$(pkgauxdir)/$$p" |$(SED) 's|[^/]*$$||'`; \
test -d "$$d" || $(mkinstalldirs) "$$d"; \
echo " $(INSTALL_DATA) '$(srcdir)/$(aux_dir)/$$p'
'$(DESTDIR)$(pkgauxdir)/$$p'"; \
$(INSTALL_DATA) "$(srcdir)/$(aux_dir)/$$p"
"$(DESTDIR)$(pkgauxdir)/$$p"; \
done
## install the libltdl files
@list='$(pkgltdl_files)' && for p in $$list; do \
- d=`echo "$(DESTDIR)$(pkgdatadir)/$$p" |$(SED) 's,[^/]*$$,,'`; \
+ d=`echo "$(DESTDIR)$(pkgdatadir)/$$p" |$(SED) 's|[^/]*$$||'`; \
test -d "$$d" || $(mkinstalldirs) "$$d"; \
echo " $(INSTALL_DATA) '$(ltdldir)/$$p'
'$(DESTDIR)$(pkgdatadir)/$$p'"; \
$(INSTALL_DATA) "$(ltdldir)/$$p" "$(DESTDIR)$(pkgdatadir)/$$p"; \
@@ -557,7 +557,7 @@ changelog = $(distdir)/ChangeLog
# date is updated to the following year.
changelog_start_date = 2011-01-01
$(changelog): FORCE
- $(AM_V_GEN)if test -d $(srcdir)/.git; then \
+ $(AM_V_GEN)if test -d '$(srcdir)/.git'; then \
$(gitlog_to_changelog) --amend=$(git_log_fix) \
--since=$(changelog_start_date) > 'address@hidden'; \
rm -f '$@'; mv 'address@hidden' '$@'; \
@@ -580,7 +580,7 @@ $(readme): FORCE
$(SHELL) $(edit_readme_alpha) '$@'; \
fi
-git_commit_count = git log --pretty=oneline |wc -l |$(SED) 's,[ ],,g'
+git_commit_count = git log --pretty=oneline |wc -l |$(SED) 's|[ ]||g'
dist-hook: $(changelog) $(dotversion) $(readme)
## Arrange so that .tarball-version appears only in the distribution
@@ -874,7 +874,6 @@ COMMON_TESTS = \
tests/nomode.test \
tests/objectlist.test \
tests/quote.test \
- tests/sh.test \
tests/suffix.test \
tests/tagtrace.test \
tests/cdemo-static.test \
diff --git a/NEWS b/NEWS
index 32e9bb1..0479a34 100644
--- a/NEWS
+++ b/NEWS
@@ -48,6 +48,7 @@ NEWS - list of user-visible changes between releases of GNU
Libtool
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.
** Important incompatible changes:
diff --git a/bootstrap b/bootstrap
index 8776e21..ae65e37 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,11 +1,11 @@
#! /bin/sh
# Source required external libraries.
-. `echo "$0" |${SED-sed} 's,[^/]*$,,'`"build-aux/options-parser"
-. `echo "$0" |${SED-sed} 's,[^/]*$,,'`"build-aux/extract-trace"
+. `echo "$0" |${SED-sed} 's|[^/]*$||'`"build-aux/options-parser"
+. `echo "$0" |${SED-sed} 's|[^/]*$||'`"build-aux/extract-trace"
# Set a version string for *this* script.
-scriptversion=2011-11-15.06; # UTC
+scriptversion=2011-11-21.09; # UTC
# Bootstrap this package from checked-out sources.
# Written by Gary V. Vaughan, 2010
@@ -233,7 +233,7 @@ func_bootstrap ()
# Save the current positional parameters to prevent them being
# corrupted by calls to `set' in `func_init'.
func_quote_for_eval ${1+"$@"}
- _G_saved_positional_parameters="$func_quote_for_eval_result"
+ _G_saved_positional_parameters=$func_quote_for_eval_result
# Initialisation.
func_init
@@ -378,7 +378,7 @@ func_gnulib_tool ()
# Try not to pick up any stale values from `gnulib-cache.m4'.
rm -f "$gnulib_cache"
- gnulib_mode="--import"
+ gnulib_mode=--import
# `gnulib_modules' and others are maintained in `bootstrap.conf`:
# Use `gnulib --import` to fetch gnulib modules.
@@ -404,7 +404,7 @@ func_gnulib_tool ()
# `gnulib_modules' and others are cached in `gnulib-cache.m4':
# Use `gnulib --update' to fetch gnulib modules.
- gnulib_mode="--update"
+ gnulib_mode=--update
fi
# Add a sensible default libtool option to gnulib_tool_options.
@@ -656,8 +656,8 @@ func_autoreconf ()
$require_macro_dir # aclocal and others put files in here
# We ran these manually already, and autoreconf won't exec `:'
- save_AUTOPOINT="$AUTOPOINT"; AUTOPOINT=true
- save_LIBTOOLIZE="$LIBTOOLIZE"; LIBTOOLIZE=true
+ save_AUTOPOINT=$AUTOPOINT; AUTOPOINT=true
+ save_LIBTOOLIZE=$LIBTOOLIZE; LIBTOOLIZE=true
_G_autoreconf_options=
$opt_copy || func_append _G_autoreconf_options " --symlink"
@@ -665,8 +665,8 @@ func_autoreconf ()
$opt_verbose && func_append _G_autoreconf_options " --verbose"
func_show_eval "$AUTORECONF$_G_autoreconf_options --install" 'exit $?'
- AUTOPOINT="$save_AUTOPOINT"
- LIBTOOLIZE="$save_LIBTOOLIZE"
+ AUTOPOINT=$save_AUTOPOINT
+ LIBTOOLIZE=$save_LIBTOOLIZE
}
@@ -738,20 +738,20 @@ func_clean_unused_macros ()
# 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
+ for file in `cd "$macro_dir" && ls -1 |grep '\.m4$'`; do
# Remove a macro file when aclocal.m4 does not m4_include it...
func_grep_q 'm4_include([[]'$macro_dir/$file'])' $aclocal_m4s \
- || test ! -f $gnulib_path/m4/$file || {
+ || test ! -f "$gnulib_path/m4/$file" || {
# ...and there is an identical file in gnulib...
- if func_cmp_s $gnulib_path/m4/$file $macro_dir/$file; then
+ if func_cmp_s "$gnulib_path/m4/$file" "$macro_dir/$file"; then
# ...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
+ *) rm -f "$macro_dir/$file"
func_verbose \
"removing unused gnulib file \`$macro_dir/$file'"
esac
@@ -913,7 +913,7 @@ for tool in autoconf libtoolize autopoint; do
printf '%s\n' "$buildreq" |func_grep_q '\''^[ ]*'$tool\'' || {
func_extract_trace '$m'
- _G_version="$func_extract_trace_result"
+ _G_version=$func_extract_trace_result
test -n "$_G_version" && {
func_append buildreq "\
'$tool' $_G_version http://www.gnu.org/s/'$b'
@@ -973,7 +973,7 @@ func_require_automake_buildreq ()
test -n "$func_extract_trace_result" && {
automake_version=`echo "$func_extract_trace_result" \
|$SED 's|[^0-9]*||; s| .*$||'`
- test -n "$automake_version" || automake_version="-"
+ test -n "$automake_version" || automake_version=-
func_append buildreq "\
automake $automake_version http://www.gnu.org/s/automake
@@ -1044,7 +1044,7 @@ func_require_build_aux ()
test -n "$build_aux" || {
func_extract_trace AC_CONFIG_AUX_DIR
- build_aux="$func_extract_trace_result"
+ build_aux=$func_extract_trace_result
func_check_configuration build_aux \
"AC_CONFIG_AUX_DIR([name of a directory for build scripts])"
@@ -1132,7 +1132,7 @@ func_require_dotgitmodules ()
test true = "$GIT" || {
# A gnulib entry in .gitmodules always takes precedence.
- _G_path="`$GIT config --file .gitmodules submodule.gnulib.path
2>/dev/null`"
+ _G_path=`$GIT config --file .gitmodules submodule.gnulib.path
2>/dev/null`
test -n "$_G_path" || {
$require_vc_ignore_files
@@ -1207,7 +1207,7 @@ func_require_gnulib_cache ()
$require_macro_dir
test -n "$gnulib_cache" \
- || gnulib_cache="$macro_dir/gnulib-cache.m4"
+ || gnulib_cache=$macro_dir/gnulib-cache.m4
func_verbose "found \`$gnulib_cache'"
@@ -1258,7 +1258,7 @@ func_require_gnulib_mk ()
$require_macro_dir
func_extract_trace "gl_MAKEFILE_NAME" "$gnulib_cache"
- gnulib_mk="$func_extract_trace_result"
+ gnulib_mk=$func_extract_trace_result
test -n "$gnulib_mk" && func_verbose "gnulib_mk='$gnulib_mk'"
}
@@ -1285,7 +1285,7 @@ func_require_dotgitmodules_parameters ()
# `--gnulib-srcdir' if possible.
test -n "$gnulib_path" \
|| test ! -x "$opt_gnulib_srcdir/gnulib-tool" \
- || gnulib_path="$opt_gnulib_srcdir"
+ || gnulib_path=$opt_gnulib_srcdir
}
@@ -1296,13 +1296,13 @@ func_require_dotgitmodules_parameters ()
test -n "$gnulib_path" \
|| gnulib_path=`$SED -e '/^.submodule "gnulib".$/,${
/[ ]*path *= */{
- s,[ ]*,,g;s,^[^=]*=,,;p
+ s|[ ]*||g;s|^[^=]*=||;p
}
};d' .gitmodules |$SED 1q`
test -n "$gnulib_url" \
|| gnulib_url=`$SED -e '/^.submodule "gnulib".$/,${
/[ ]*url *= */{
- s,[ ]*,,g;s,^[^=]*=,,;p
+ s|[ ]*||g;s|^[^=]*=||;p
}
};d' .gitmodules |$SED 1q`
@@ -1383,7 +1383,7 @@ func_require_gnulib_tool ()
$require_gnulib_path
test -n "$gnulib_tool" \
- || gnulib_tool="$gnulib_path/gnulib-tool"
+ || gnulib_tool=$gnulib_path/gnulib-tool
test -x "$gnulib_tool" || {
gnulib_tool=true
@@ -1445,7 +1445,7 @@ func_require_macro_dir ()
# Sometimes this is stored in `configure.ac'.
test -n "$macro_dir" || {
func_extract_trace AC_CONFIG_MACRO_DIR
- macro_dir="$func_extract_trace_result"
+ macro_dir=$func_extract_trace_result
}
# Otherwise we might find it in `Makefile.am'.
@@ -1488,7 +1488,7 @@ func_require_makefile_am ()
$debug_cmd
test -n "$makefile_am" \
- || makefile_am="Makefile.am"
+ || makefile_am=Makefile.am
<"$makefile_am"
@@ -1530,13 +1530,13 @@ func_require_package_bugreport ()
func_extract_trace AC_INIT
- save_ifs="$IFS"
+ save_ifs=$IFS
IFS=:
set dummy $func_extract_trace_result
- IFS="$save_ifs"
+ IFS=$save_ifs
shift
- test -n "$package_bugreport" || package_bugreport="$3"
+ test -n "$package_bugreport" || package_bugreport=$3
func_check_configuration package_bugreport \
"AC_INIT([$package_name], [$package_version], address@hidden)"
func_verbose "package_bugreport='$package_bugreport'"
@@ -1556,13 +1556,13 @@ func_require_package_name ()
func_extract_trace AC_INIT
- save_ifs="$IFS"
+ save_ifs=$IFS
IFS=:
set dummy $func_extract_trace_result
- IFS="$save_ifs"
+ IFS=$save_ifs
shift
- test -n "$package_name" || package_name="$1"
+ test -n "$package_name" || package_name=$1
func_check_configuration package_name \
"AC_INIT([name of your package], [package version number])"
func_verbose "package_name='$package_name'"
@@ -1586,13 +1586,13 @@ func_require_package_version ()
func_extract_trace AC_INIT
- save_ifs="$IFS"
+ save_ifs=$IFS
IFS=:
set dummy $func_extract_trace_result
- IFS="$save_ifs"
+ IFS=$save_ifs
shift
- test -n "$package_version" || package_version="$2"
+ test -n "$package_version" || package_version=$2
test -n "$package_version" || {
# The embedded echo is to squash whitespace before globbing.
case " "`echo $gnulib_modules`" " in
@@ -1619,7 +1619,7 @@ func_gnulib_tool has installed the \`git-version-gen'
script."
# `gnulib-cache.m4' if possible.
require_source_base=func_require_source_base
func_require_source_base ()
- {
+{
$debug_cmd
$require_gnulib_cache
@@ -1629,7 +1629,7 @@ func_require_source_base ()
func_extract_trace "gl_SOURCE_BASE" "$gnulib_cache"
- source_base="$func_extract_trace_result"
+ source_base=$func_extract_trace_result
func_verbose "source_base='$source_base'"
}
@@ -1654,7 +1654,7 @@ func_require_vc_ignore_files ()
test -d .git && vc_ignore_files=.gitignore
test -d CVS && vc_ignore_files="$vc_ignore_files .cvsignore"
else
- vc_ignore_files="$vc_ignore"
+ vc_ignore_files=$vc_ignore
fi
func_verbose "vc_ignore_files='$vc_ignore_files'"
@@ -1760,7 +1760,7 @@ func_ifcontains ()
;;
esac
- test "$_G_status" -eq 0 || exit $_G_status
+ test 0 -eq $_G_status || exit $_G_status
}
@@ -1830,7 +1830,7 @@ func_strrow ()
{
$debug_cmd
- func_strrow_linelen="$1"; shift
+ func_strrow_linelen=$1; shift
_G_row=
while test $# -gt 0; do
@@ -1841,7 +1841,7 @@ func_strrow ()
done
func_strrpad "$_G_row" $func_strrow_linelen " "
- func_strrow_result="$func_strrpad_result"
+ func_strrow_result=$func_strrpad_result
}
@@ -1878,11 +1878,11 @@ func_strtable ()
$debug_cmd
# Save the indent value, we'll need it for each row we render.
- _G_indent="$1"; shift
+ _G_indent=$1; shift
# Collect remaining numeric args into a list for reuse between
# members of each row when we call func_strrow later.
- _G_widths="$1"; shift
+ _G_widths=$1; shift
while test 0 -lt `expr "$1" : '[1-9][0-9]*$'`; do
func_append _G_widths " $1"; shift
done
@@ -1890,7 +1890,7 @@ func_strtable ()
# Extract the same number of positional parameters as there are
# width elements - we'll do the header rows separately so that
# we can insert a divider line.
- _G_header="$_G_indent"
+ _G_header=$_G_indent
for _G_width in $_G_widths; do
func_append _G_header " $1 $_G_width"; shift
done
@@ -1914,7 +1914,7 @@ $_G_divider
# The remaining rows are zipped between the width values we
# unwound earlier just like the header row above.
while test $# -gt 0; do
- _G_row="$_G_indent"
+ _G_row=$_G_indent
for _G_width in $_G_widths; do
func_append _G_row " $1 $_G_width"; shift
done
@@ -1966,7 +1966,7 @@ func_warning ()
*) func_internal_error "invalid warning category \`$1'" ;;
esac
- _G_category="$1"
+ _G_category=$1
shift
case " $opt_warning " in
@@ -1984,19 +1984,19 @@ func_show_eval ()
{
$debug_cmd
- _G_cmd="$1"
- _G_fail_exp="${2-:}"
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
- ${opt_silent-false} || {
+ ${opt_silent-'false'} || {
func_quote_for_eval $_G_cmd
eval func_truncate_cmd $func_quote_for_eval_result
func_echo "running: $func_truncate_cmd_result"
}
- ${opt_dry_run-false} || {
+ ${opt_dry_run-'false'} || {
eval "$_G_cmd"
_G_status=$?
- test "$_G_status" -eq 0 || eval "(exit $_G_status); $_G_fail_exp"
+ test 0 -eq $_G_status || eval "(exit $_G_status); $_G_fail_exp"
}
}
@@ -2016,7 +2016,7 @@ func_truncate_cmd ()
set dummy "$@"; shift
while test $# -gt 0; do
- _G_opt="$1"; shift
+ _G_opt=$1; shift
test -n "$func_truncate_cmd_result" \
&& func_append func_truncate_cmd_result ' '
@@ -2027,7 +2027,7 @@ func_truncate_cmd ()
case $_G_opt in
-*) _G_last_arg_opt_p=: ;;
*) $_G_last_arg_opt_p \
- || test $min_cmd_len -gt $func_len_result \
+ || test "$min_cmd_len" -gt "$func_len_result" \
|| break
_G_last_arg_opt_p=false
;;
@@ -2051,13 +2051,13 @@ func_insert_sorted_if_absent ()
for file
do
- test -f $file || touch $file
+ test -f "$file" || touch "$file"
func_grep_q "$str" "$file" \
&& func_verbose "inserting \`$str' into \`$file'"
- echo "$str" |sort -u - $file |func_cmp_s - $file \
- || echo "$str" |sort -u - $file -o $file \
+ echo "$str" |sort -u - "$file" |func_cmp_s - "$file" \
+ || echo "$str" |sort -u - "$file" -o "$file" \
|| func_permissions_error "$file"
done
}
@@ -2065,18 +2065,19 @@ func_insert_sorted_if_absent ()
# func_sort_ver VER1 VER2
# -----------------------
+# `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
# version formats or redundant trailing .0 in bootstrap.conf.
# If we did want full compatibility then we should probably
# use m4_version_compare from autoconf.
-func_sort_ver () # sort -V is not generally available
+func_sort_ver ()
{
$debug_cmd
- ver1="$1"
- ver2="$2"
+ ver1=$1
+ ver2=$2
# Split on '.' and compare each component.
i=1
@@ -2141,7 +2142,7 @@ func_get_version ()
func_tool_version_output $_G_app >/dev/null
_G_status=$?
- test $_G_status -ne 0 \
+ test 0 -ne $_G_status \
|| $_G_app --version 2>&1 |$SED -n "$sed_get_version"
(exit $_G_status)
@@ -2157,13 +2158,13 @@ func_check_versions ()
func_check_versions_result=:
while test $# -gt 0; do
- _G_app="$1"; shift
- _G_reqver="$1"; shift
- _G_url="$1"; shift
+ _G_app=$1; shift
+ _G_reqver=$1; shift
+ _G_url=$1; shift
# Honor $APP variables ($TAR, $AUTOCONF, etc.)
_G_appvar=`echo $_G_app |tr '[a-z]' '[A-Z]'`
- test "$_G_appvar" = TAR && _G_appvar=AMTAR
+ test TAR = "$_G_appvar" && _G_appvar=AMTAR
eval "_G_app=\${$_G_appvar-$_G_app}"
_G_instver=`func_get_version $_G_app`
@@ -2176,7 +2177,7 @@ func_check_versions ()
func_check_versions_result=false
# Fail if a new version than what we have is required.
- elif test "$_G_reqver" != "-"; then
+ elif test "$_G_reqver" != -; then
_G_newer=`func_sort_ver $_G_reqver $_G_instver |cut -d' ' -f2`
test "$_G_newer" != "$_G_instver" && {
func_error "\
@@ -2232,9 +2233,9 @@ func_update_po_files ()
# Mirror *.po files into this dir.
# Usually contains *.s1 checksum files.
- _G_ref_po_dir="$_G_po_dir/.reference"
+ _G_ref_po_dir=$_G_po_dir/.reference
- test -d $_G_ref_po_dir || mkdir $_G_ref_po_dir || return
+ test -d "$_G_ref_po_dir" || mkdir $_G_ref_po_dir || return
func_download_po_files $_G_ref_po_dir $_G_domain \
&& ls "$_G_ref_po_dir"/*.po 2>/dev/null \
|$SED 's|.*/||; s|\.po$||' > "$_G_po_dir/LINGUAS" || return
@@ -2243,11 +2244,11 @@ func_update_po_files ()
func_find_tool SHA1SUM sha1sum gsha1sum shasum
_G_langs=`cd $_G_ref_po_dir && echo *.po|$SED 's|\.po||g'`
- test "$_G_langs" = '*' && _G_langs=x
+ test '*' = "$_G_langs" && _G_langs=x
for _G_po in $_G_langs; do
case $_G_po in x) continue;; esac
- _G_new_po="$_G_ref_po_dir/$_G_po.po"
- _G_cksum_file="$_G_ref_po_dir/$_G_po.s1"
+ _G_new_po=$_G_ref_po_dir/$_G_po.po
+ _G_cksum_file=$_G_ref_po_dir/$_G_po.s1
if ! test -f "$_G_cksum_file" ||
! test -f "$_G_po_dir/$_G_po.po" ||
! $SHA1SUM -c --status "$_G_cksum_file" \
@@ -2327,17 +2328,17 @@ bootstrap_options_prep ()
warning_func=func_error
# Option defaults:
- opt_copy=${copy-false}
+ opt_copy=${copy-'false'}
opt_dry_run=false
opt_force=false
- opt_gnulib_srcdir="$GNULIB_SRCDIR"
+ opt_gnulib_srcdir=$GNULIB_SRCDIR
opt_skip_git=false
opt_skip_po=false
opt_warning=
# Pass back the list of options we consumed.
func_quote_for_eval ${1+"$@"}
- bootstrap_options_prep_result="$func_quote_for_eval_result"
+ bootstrap_options_prep_result=$func_quote_for_eval_result
}
func_add_hook func_options_prep bootstrap_options_prep
@@ -2352,7 +2353,7 @@ bootstrap_parse_options ()
# Perform our own loop to consume as many options as possible in
# each iteration.
while test $# -gt 0; do
- _G_opt="$1"
+ _G_opt=$1
shift
case $_G_opt in
--dry-run|--dryrun|-n)
@@ -2362,7 +2363,7 @@ bootstrap_parse_options ()
--gnulib-srcdir)
test $# = 0 && func_missing_arg $_G_opt && break
- opt_gnulib_srcdir="$1"
+ opt_gnulib_srcdir=$1
shift
;;
@@ -2415,7 +2416,7 @@ bootstrap_parse_options ()
# save modified positional parameters for caller
func_quote_for_eval ${1+"$@"}
- bootstrap_parse_options_result="$func_quote_for_eval_result"
+ bootstrap_parse_options_result=$func_quote_for_eval_result
}
func_add_hook func_parse_options bootstrap_parse_options
@@ -2429,7 +2430,7 @@ bootstrap_validate_options ()
$debug_cmd
# Display all warnings if -W was not given.
- test -n "$opt_warning" || opt_warning="$warning_categories"
+ test -n "$opt_warning" || opt_warning=$warning_categories
# Validate options.
test $# -gt 0 \
@@ -2437,7 +2438,7 @@ bootstrap_validate_options ()
# Pass back the list of unconsumed options left.
func_quote_for_eval ${1+"$@"}
- bootstrap_validate_options_result="$func_quote_for_eval_result"
+ bootstrap_validate_options_result=$func_quote_for_eval_result
}
diff --git a/bootstrap.conf b/bootstrap.conf
index 6f0f0c3..f7bc1ac 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,4 +1,4 @@
-# bootstrap.conf (GNU Libtool) version 2011-11-11
+# bootstrap.conf (GNU Libtool) version 2011-11-21
#
# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
# Written by Gary V. Vaughan, 2010
@@ -77,13 +77,13 @@ gnulib_modules='
# Extra gnulib files that are not in modules, which override files of
# the same name installed by other bootstrap tools.
-gnulib_non_module_files="$gnulib_non_module_files"'
+gnulib_non_module_files=$gnulib_non_module_files'
doc/COPYINGv2
doc/fdl.texi
'
# What ignore files to maintain.
-vc_ignore=".gitignore"
+vc_ignore=.gitignore
# Running the installed `libtoolize' will trash the local (newer) libtool.m4
# among others. Don't use `:', since autoreconf can't exec it!
@@ -128,10 +128,10 @@ func_reconfigure ()
# Also bootstrap any additional directories that were specified with
# `reconfdirs' in the environment.
- save_IFS="$IFS"
+ save_IFS=$IFS
IFS=,
for sub in $opt_reconf_dirs; do
- IFS="$save_IFS"
+ IFS=$save_IFS
my_autoreconf_options=
$opt_copy || func_append my_autoreconf_options " --symlink"
$opt_force && func_append my_autoreconf_options " --force"
@@ -139,7 +139,7 @@ func_reconfigure ()
func_show_eval "$AUTORECONF$my_autoreconf_options --install $sub" \
'exit $?'
done
- IFS="$save_IFS"
+ IFS=$save_IFS
}
@@ -164,7 +164,7 @@ libtool_options_prep ()
$debug_cmd
# Extend the existing usage message
- usage_message="$usage_message"'
+ usage_message=$usage_message'
Libtool Specific Options:
-r, --reconf-dirs=DIR1,DIR2,...
limit the directories to be bootstrapped to
@@ -177,7 +177,7 @@ Libtool Specific Options:
# pass back the list of options we consumed
func_quote_for_eval ${1+"$@"}
- libtool_options_prep_result="$func_quote_for_eval_result"
+ libtool_options_prep_result=$func_quote_for_eval_result
}
func_add_hook func_options_prep libtool_options_prep
@@ -192,7 +192,7 @@ libtool_parse_options ()
# this inner loop lets us handle `-r.' in a single iteration
while test $# -gt 0; do
- opt="$1"
+ opt=$1
shift
case $opt in
@@ -215,7 +215,7 @@ libtool_parse_options ()
# pass back the list of options we consumed
func_quote_for_eval ${1+"$@"}
- libtool_parse_options_result="$func_quote_for_eval_result"
+ libtool_parse_options_result=$func_quote_for_eval_result
}
func_add_hook func_parse_options libtool_parse_options
@@ -231,20 +231,20 @@ libtool_validate_options ()
|| opt_reconf_dirs=`echo $reconfdirs |$SED 's| *|,|g'`
# validate $opt_reconf_dirs
- save_IFS="$IFS"
+ save_IFS=$IFS
IFS=,
for reconfdir in $opt_reconf_dirs; do
- IFS="$save_IFS"
+ IFS=$save_IFS
test -d "$reconfdir" || {
func_error "bad reconf directory \`$reconfdir': directory does not
exist"
exit_cmd=exit
}
done
- IFS="$save_IFS"
+ IFS=$save_IFS
# pass back the list of options we consumed
func_quote_for_eval ${1+"$@"}
- libtool_validate_options_result="$func_quote_for_eval_result"
+ libtool_validate_options_result=$func_quote_for_eval_result
}
func_add_hook func_validate_options libtool_validate_options
@@ -302,13 +302,13 @@ libtool_build_prerequisites ()
func_extract_trace LT_CONFIG_LTDL_DIR
- save_ifs="$IFS"
+ save_ifs=$IFS
IFS=:
set dummy $func_extract_trace_result
- IFS="$save_ifs"
+ IFS=$save_ifs
shift
- ltdl_dir="$1"
+ ltdl_dir=$1
func_check_configuration ltdl_dir \
"LT_CONFIG_LTDL_DIR([name of your libltdl directory])"
func_verbose "ltdl_dir='$ltdl_dir'"
@@ -359,7 +359,7 @@ libtool_readme_release_package_substitutions ()
# Perform substitutions to a temporary file
$SED -e "\
- s,address@hidden@,$package,g
+ s|address@hidden@|$package|g
" "$my_readme" > "${my_readme}T" \
&& mv "${my_readme}T" "$my_readme"
}
@@ -421,7 +421,7 @@ libtool_cleanup_empty_dirs ()
{
$debug_cmd
- my_gnulib_source="${source_base-lib}"
+ my_gnulib_source=${source_base-'lib'}
if test -d "$my_gnulib_source"; then
rm -f "$my_gnulib_source/.gitignore" "$my_gnulib_source/Makefile.am" ||
exit 1
rmdir "$my_gnulib_source" || exit 1
@@ -445,18 +445,18 @@ libtool_require_package_url ()
func_extract_trace AC_INIT
- save_IFS="$IFS"
+ save_IFS=$IFS
IFS=:
set dummy $func_extract_trace_result
- IFS="$save_IFS"
+ IFS=$save_IFS
shift
- test -n "$package_url " || package_url="$5"
+ test -n "$package_url " || package_url=$5
test -n "$package_url" || {
# How to extract the parameters for `make bootstrap-deps' from
# configure.ac. This is very specific to the way Libtool's
# configure.ac layout.
- sed_extract_package_url='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;
+ sed_extract_package_url='s|#.*$||; s|^dnl .*$||; s| dnl .*$||;
/AC_SUBST([[]*PACKAGE_URL/{
s|.*AC_SUBST([[ ]*PACKAGE_URL[] ]*,[[
]*|package_url="|
s|[]) ]*$|"|
diff --git a/build-aux/edit-readme-alpha b/build-aux/edit-readme-alpha
index ee6ca6b..c759998 100755
--- a/build-aux/edit-readme-alpha
+++ b/build-aux/edit-readme-alpha
@@ -38,7 +38,7 @@ EXIT_FAILURE=1
# the _XPG environment variable is not equal to 1 (one), the special
# positional parameter $0, within a function call, is the name of the
# function.
-progpath="$0"
+progpath=$0
# The name of this program:
progname=`echo "$progpath" |sed 's|^.*/||'`
@@ -57,7 +57,7 @@ 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'.
- test -w $file || {
+ test -w "$file" || {
echo "$progname: not editing non-writeable \`$file' (distcheck?)" >&2
continue
}
@@ -85,7 +85,7 @@ support script. Libtool hides the complexity of using shared
libraries\
behind a consistent, portable interface.' $file > $file.T
# Diagnose redirection failure.
- test -f $file.T || func_fatal_error "Unable to write $file.T"
+ test -f "$file.T" || func_fatal_error "Unable to write $file.T"
# Overwrite the original file with our edited version.
mv $file.T $file || func_fatal_error "Unable to edit $file"
diff --git a/build-aux/extract-trace b/build-aux/extract-trace
index a4322ec..b738257 100755
--- a/build-aux/extract-trace
+++ b/build-aux/extract-trace
@@ -1,10 +1,10 @@
#! /bin/sh
# Make sure we've evaluated the option-parser library.
-test -n "$progpath" || . `echo "$0" |${SED-sed} 's,[^/]*$,,'`"/options-parser"
+test -n "$progpath" || . `echo "$0" |${SED-sed} 's|[^/]*$||'`/options-parser
# Set a version string.
-scriptversion=2011-11-04.09; # UTC
+scriptversion=2011-11-21.10; # UTC
# Extract macro arguments from autotools input with GNU M4.
# Written by Gary V. Vaughan, 2010
@@ -75,7 +75,7 @@ func_autoconf_configure ()
{
$debug_cmd
- _G_sed_no_comment='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;'
+ _G_sed_no_comment='s|#.*$||; s|^dnl .*$||; s| dnl .*$||;'
_G_ac_init=
# If we were passed a genuine file, make sure it calls AC_INIT.
@@ -86,7 +86,7 @@ func_autoconf_configure ()
test -n "$_G_ac_init"
_G_status=$?
- test $_G_status -ne 0 \
+ test 0 -ne $_G_status \
&& func_verbose "\`$1' not using Autoconf"
(exit $_G_status)
@@ -161,7 +161,7 @@ func_tool_version_output ()
{ $_G_cmd --version </dev/null || $_G_cmd --version; } 2>/dev/null
_G_status=$?
- test $_G_status -ne 0 && test -n "$_G_fatal_error_msg" \
+ test 0 -ne $_G_status && test -n "$_G_fatal_error_msg" \
&& func_fatal_error "$_G_fatal_error_msg"
(exit $_G_status)
@@ -335,7 +335,7 @@ func_extract_trace ()
# "autoconf.mini" followed by any other files passed to this
# function is then scanned by sed to transform it into a colon
# delimited argument list assigned to a shell variable.
- _G_transform='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;'
+ _G_transform='s|#.*$||; s|^dnl .*$||; s| dnl .*$||;'
# Unfortunately, alternation in regexp addresses doesn't work in at
# least BSD (and hence Mac OS X) sed, so we have to append a capture
@@ -346,7 +346,7 @@ func_extract_trace ()
IFS=$_G_save
func_append _G_transform '
/^m4trace: -1- '"$_G_macro"'/ {
- s,^m4trace: -1- '"$_G_macro"'[([]*,,
+ s|^m4trace: -1- '"$_G_macro"'[([]*||
s|], [[]|:|g
s|[])]*$|:|
s|\(.\):$|\1|
diff --git a/build-aux/general.m4sh b/build-aux/general.m4sh
index 44eccec..566dc39 100644
--- a/build-aux/general.m4sh
+++ b/build-aux/general.m4sh
@@ -39,7 +39,7 @@ m4_divert_pop([KILL])M4SH_IN_HEADER([dnl
# the _XPG environment variable is not equal to 1 (one), the special
# positional parameter $0, within a function call, is the name of the
# function.
-progpath="$0"
+progpath=$0
])
M4SH_VERBATIM([[
@@ -70,19 +70,19 @@ lt_nl='
'
IFS=" $lt_nl"
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
+dirname='s|/[^/]*$||'
+basename='s|^.*/||'
# func_dirname file append nondir_replacement
# Compute the dirname of FILE. If nonempty, add APPEND to the result,
# otherwise set result to NONDIR_REPLACEMENT.
func_dirname ()
{
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
+ func_dirname_result=`$ECHO "$1" | $SED "$dirname"`
+ if test "X$func_dirname_result" = "X$1"; then
+ func_dirname_result=$3
else
- func_dirname_result="$func_dirname_result${2}"
+ func_dirname_result=$func_dirname_result$2
fi
} # func_dirname may be replaced by extended shell implementation
@@ -90,7 +90,7 @@ func_dirname ()
# func_basename file
func_basename ()
{
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+ func_basename_result=`$ECHO "$1" | $SED "$basename"`
} # func_basename may be replaced by extended shell implementation
@@ -109,13 +109,13 @@ func_basename ()
func_dirname_and_basename ()
{
# Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
+ func_dirname_result=`$ECHO "$1" | $SED -e "$dirname"`
+ if test "X$func_dirname_result" = "X$1"; then
+ func_dirname_result=$3
else
- func_dirname_result="$func_dirname_result${2}"
+ func_dirname_result=$func_dirname_result$2
fi
- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+ func_basename_result=`$ECHO "$1" | $SED -e "$basename"`
} # func_dirname_and_basename may be replaced by extended shell implementation
@@ -127,22 +127,22 @@ func_dirname_and_basename ()
# func_strip_suffix prefix name
func_stripname ()
{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%;
s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ case $2 in
+ .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
+ *) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
esac
} # func_stripname may be replaced by extended shell implementation
# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
+pathcar='s|^/\([^/]*\).*$|\1|'
+pathcdr='s|^/[^/]*||'
removedotparts=':dotsl
- s@/\./@/@g
+ s|/\./|/|g
t dotsl
- s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
+ s|/\.$|/|'
+collapseslashes='s|/\{1,\}|/|g'
+finalslash='s|/*$|/|'
# func_normal_abspath PATH
# Remove doubled-up and trailing slashes, "." path components,
@@ -189,7 +189,7 @@ func_normal_abspath ()
-e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
while :; do
# Processed it all yet?
- if test "$func_normal_abspath_tpath" = / ; then
+ if test / = "$func_normal_abspath_tpath"; then
# If we ascended to the root using ".." the result may be empty now.
if test -z "$func_normal_abspath_result" ; then
func_normal_abspath_result=/
@@ -251,8 +251,8 @@ func_relative_path ()
;;
*)
func_dirname $func_relative_path_tlibdir
- func_relative_path_tlibdir=${func_dirname_result}
- if test "x$func_relative_path_tlibdir" = x ; then
+ func_relative_path_tlibdir=$func_dirname_result
+ if test -z "$func_relative_path_tlibdir"; then
# Have to descend all the way to the root!
func_relative_path_result=../$func_relative_path_result
func_relative_path_tcancelled=$func_relative_path_tbindir
@@ -267,12 +267,12 @@ func_relative_path ()
func_stripname '' '/' "$func_relative_path_result"
func_relative_path_result=$func_stripname_result
func_stripname '/' '/' "$func_relative_path_tcancelled"
- if test "x$func_stripname_result" != x ; then
-
func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+ if test -n "$func_stripname_result"; then
+ func_relative_path_result=$func_relative_path_result/$func_stripname_result
fi
# Normalisation. If bindir is libdir, return `.' else relative path.
- if test ! -z "$func_relative_path_result"; then
+ if test -n "$func_relative_path_result"; then
func_stripname './' '' "$func_relative_path_result"
func_relative_path_result=$func_stripname_result
fi
@@ -290,24 +290,24 @@ case $progpath in
*[\\/]*)
progdir=$func_dirname_result
progdir=`cd "$progdir" && pwd`
- progpath="$progdir/$progname"
+ progpath=$progdir/$progname
;;
*)
- save_IFS="$IFS"
+ save_IFS=$IFS
IFS=${PATH_SEPARATOR-:}
for progdir in $PATH; do
- IFS="$save_IFS"
+ IFS=$save_IFS
test -x "$progdir/$progname" && break
done
- IFS="$save_IFS"
+ IFS=$save_IFS
test -n "$progdir" || progdir=`pwd`
- progpath="$progdir/$progname"
+ progpath=$progdir/$progname
;;
esac
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
+Xsed="$SED -e 1s/^X//"
sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
@@ -315,7 +315,7 @@ double_quote_subst='s/\(["`\\]\)/\\\1/g'
# Sed substitution that turns a string into a regex matching for the
# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
# Sed substitution that converts a w32 file name or path
# which contains forward slashes, into one that contains
@@ -420,21 +420,21 @@ func_grep ()
# Make sure the entire path to DIRECTORY-PATH is available.
func_mkdir_p ()
{
- my_directory_path="$1"
+ my_directory_path=$1
my_dir_list=
- if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+ if test -n "$my_directory_path" && test : != "$opt_dry_run"; then
# Protect directory names starting with `-'
case $my_directory_path in
- -*) my_directory_path="./$my_directory_path" ;;
+ -*) my_directory_path=./$my_directory_path ;;
esac
# While some portion of DIR does not yet exist...
while test ! -d "$my_directory_path"; do
# ...make a list in topmost first order. Use a colon delimited
# list incase some portion of path contains whitespace.
- my_dir_list="$my_directory_path:$my_dir_list"
+ my_dir_list=$my_directory_path:$my_dir_list
# If the last portion added has no slash in it, the list is done
case $my_directory_path in */*) ;; *) break ;; esac
@@ -442,17 +442,17 @@ func_mkdir_p ()
# ...otherwise throw away the child directory and loop
my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
done
- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+ my_dir_list=`$ECHO "$my_dir_list" | $SED 's|:*$||'`
- save_mkdir_p_IFS="$IFS"; IFS=':'
+ save_mkdir_p_IFS=$IFS; IFS=:
for my_dir in $my_dir_list; do
- IFS="$save_mkdir_p_IFS"
+ IFS=$save_mkdir_p_IFS
# mkdir can fail with a `File exist' error if two processes
# try to create one of the directories concurrently. Don't
# stop in that case!
$MKDIR "$my_dir" 2>/dev/null || :
done
- IFS="$save_mkdir_p_IFS"
+ IFS=$save_mkdir_p_IFS
# Bail out if we (or some other process) failed to create a directory.
test -d "$my_directory_path" || \
@@ -467,19 +467,19 @@ func_mkdir_p ()
# given, STRING is the basename for that directory.
func_mktempdir ()
{
- my_template="${TMPDIR-/tmp}/${1-$progname}"
+ my_template=${TMPDIR-/tmp}/${1-$progname}
- if test "$opt_dry_run" = ":"; then
+ if test : = "$opt_dry_run"; then
# Return a directory name, but don't create it in dry-run mode
- my_tmpdir="${my_template}-$$"
+ my_tmpdir=$my_template-$$
else
# If mktemp works, use that first and foremost
- my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+ my_tmpdir=`mktemp -d "$my_template-XXXXXXXX" 2>/dev/null`
if test ! -d "$my_tmpdir"; then
# Failing that, at least try and use $RANDOM to avoid a race
- my_tmpdir="${my_template}-${RANDOM-0}$$"
+ my_tmpdir=$my_template-${RANDOM-0}$$
save_mktempdir_umask=`umask`
umask 0077
@@ -508,7 +508,7 @@ func_quote_for_eval ()
*[\\\`\"\$]*)
func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED
"$sed_quote_subst"` ;;
*)
- func_quote_for_eval_unquoted_result="$1" ;;
+ func_quote_for_eval_unquoted_result=$1 ;;
esac
case $func_quote_for_eval_unquoted_result in
@@ -518,10 +518,10 @@ func_quote_for_eval ()
# Many Bourne shells cannot handle close brackets correctly
# in scan sets, so we specify it separately.
*[\@<:@\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*@:>@*|"")
- func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+ func_quote_for_eval_result=\"$func_quote_for_eval_unquoted_result\"
;;
*)
- func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+ func_quote_for_eval_result=$func_quote_for_eval_unquoted_result
esac
}
@@ -536,7 +536,7 @@ func_quote_for_expand ()
my_arg=`$ECHO "$1" | $SED \
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
- my_arg="$1" ;;
+ my_arg=$1 ;;
esac
case $my_arg in
@@ -545,11 +545,11 @@ func_quote_for_expand ()
# Many Bourne shells cannot handle close brackets correctly
# in scan sets, so we specify it separately.
*[\@<:@\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*@:>@*|"")
- my_arg="\"$my_arg\""
+ my_arg=\"$my_arg\"
;;
esac
- func_quote_for_expand_result="$my_arg"
+ func_quote_for_expand_result=$my_arg
}
@@ -559,8 +559,8 @@ func_quote_for_expand ()
# is given, then evaluate it.
func_show_eval ()
{
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ my_cmd=$1
+ my_fail_exp=${2-':'}
${opt_silent-false} || {
func_quote_for_expand "$my_cmd"
@@ -570,7 +570,7 @@ func_show_eval ()
if ${opt_dry_run-false}; then :; else
eval "$my_cmd"
my_status=$?
- if test "$my_status" -eq 0; then :; else
+ if test 0 -eq $my_status; then :; else
eval "(exit $my_status); $my_fail_exp"
fi
fi
@@ -583,8 +583,8 @@ func_show_eval ()
# is given, then evaluate it. Use the saved locale for evaluation.
func_show_eval_locale ()
{
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ my_cmd=$1
+ my_fail_exp=${2-':'}
${opt_silent-false} || {
func_quote_for_expand "$my_cmd"
@@ -596,7 +596,7 @@ func_show_eval_locale ()
$my_cmd"
my_status=$?
eval "$lt_safe_locale"
- if test "$my_status" -eq 0; then :; else
+ if test 0 -eq "$my_status"; then :; else
eval "(exit $my_status); $my_fail_exp"
fi
fi
diff --git a/build-aux/getopt.m4sh b/build-aux/getopt.m4sh
index b76694e..27a8352 100644
--- a/build-aux/getopt.m4sh
+++ b/build-aux/getopt.m4sh
@@ -239,7 +239,7 @@ m4_define([m4go_shortnoargs], [-\?*|-h*])
# injecting new arguments into the command line before the
# processing loop terminates. For example:
#
-# `eval set -- `cat $rcfile` ${1+"$@"}'
+# eval set dummy `cat $rcfile` ${1+"$@"}; shift
#
# Note that, because we look inside the content of INITn to
# determine whether there are newlines to be stripped, double
@@ -385,15 +385,15 @@ m4_define([_m4go_option],
[ test [$]# = 0 && func_missing_arg $opt && break
])m4_n(m4_bmatch([$3],
[\^], [ func_quote_for_eval "[$]1"
- optarg="$func_quote_for_eval_result"],
- [[?!;address@hidden, [ optarg="[$]1"]))[]dnl
+ optarg=$func_quote_for_eval_result],
+ [[?!;address@hidden, [ optarg=[$]1]))[]dnl
m4_n(m4_bmatch([$3],
[+], [ $1_num=`expr 1 + ${$1_num-0}`
eval $1_${$1_num}=\"$optarg\"],
[?], [m4_bmatch([$3],
address@hidden,
[m4go_expand([m4go_optional_file_arg([$1])])],
[m4go_expand([m4go_optional_arg([$1])])])],
- address@hidden, [ $1="$optarg"],
+ address@hidden, [ $1=$optarg],
[;], [ $1="${$1+[$]$1
}$optarg"],
[~], [ $1=false],
@@ -422,7 +422,7 @@ m4_define([m4go_optional_arg],
[ if test [$]# -gt 0; then
case $optarg in # ((
-*) ;;
- *) $1="$optarg"; shift ;;
+ *) $1=$optarg; shift ;;
esac
fi])
@@ -444,7 +444,7 @@ m4_define([m4go_optional_file_arg],
[ if test [$]# -gt 0; then
case $optarg in # ((
-*) ;;
- *) $1="$optarg"
+ *) $1=$optarg
test -r "$optarg" || {
func_error "$opt: cannot read file
\`$optarg'."
exit_cmd=exit
@@ -465,7 +465,7 @@ m4_define([m4go_optional_file_arg],
m4_define([m4go_printopts],
[
# Option defaults:
-debug_cmd="${debug_cmd-:}"
+debug_cmd=${debug_cmd-':'}
m4go_defaults
# Parse options once, thoroughly. This comes as soon as possible in the
@@ -473,7 +473,7 @@ m4go_defaults
{
# this just eases exit handling
while test [$]# -gt 0; do
- opt="[$]1"
+ opt=[$]1
shift
case $opt in
--debug|-x) debug_cmd='set -x'
diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg
index f6e8051..8df0e86 100755
--- a/build-aux/git-hooks/commit-msg
+++ b/build-aux/git-hooks/commit-msg
@@ -6,13 +6,13 @@
: ${SED="sed"}
test set = ${ECHO+'set'} = set || ECHO='printf %s\n'
-basename="$SED -e "'s|^.*/||'
+basename='s|^.*/||'
nl='
'
-progpath="$0"
-progname=`$ECHO "$progpath" |$basename`
+progpath=$0
+progname=`$ECHO "$progpath" |$SED -e "$basename"`
log_file=$1
export log_file
@@ -44,7 +44,7 @@ fn_rewrite ()
fn_error "$*"
# And again as a comment in the log_file ready for re-editing
- $ECHO "$*" |$SED 's,^,# ,'
+ $ECHO "$*" |$SED 's|^|# |'
echo
cat "$log_file"
}
@@ -79,7 +79,7 @@ fn_check_msg ()
# Flag duplicated Copyright-paperwork-exempt lines.
count=`grep "$CPR_re" "$log_file" 2>/dev/null \
- |wc |sed -e 's,^[ ]*,,;s,[ ].*$,,'`
+ |wc |sed -e 's|^[ ]*||;s|[ ].*$||'`
test 2 -gt "$count" || {
$ECHO 'More than one Copyright-paperwork-exempt line.'
@@ -87,12 +87,12 @@ fn_check_msg ()
}
# Make sure Copyright-paperwork-exempt line is valid.
- if grep "${CPR_re}[Nn]" "$log_file" >/dev/null 2>&1; then
+ if grep "$CPR_re[Nn]" "$log_file" >/dev/null 2>&1; then
$ECHO "\
\`Copyright-paperwork-exempt: No' is redundant, please remove."
return_status=1
else
- not_yes=`grep "${CPR_re}" "$log_file" 2>/dev/null \
+ not_yes=`grep "$CPR_re" "$log_file" 2>/dev/null \
|grep -v "${CPR_re}Yes\$"`
test -n "$not_yes" && {
diff --git a/build-aux/git-log-fix b/build-aux/git-log-fix
index e03fe48..9ac3ced 100644
--- a/build-aux/git-log-fix
+++ b/build-aux/git-log-fix
@@ -5,76 +5,76 @@
a5ef08182ce0fb80b8adcff5872f190afd915908
# Date: Wed Nov 16 12:13:55 2011 +0700
# Fix a typo.
-s,bootstraps,bootstrap's,
+s|bootstraps|bootstrap's|
88224124e4f57166cdcc78be29730372762a147e
# Date: Tue Nov 15 16:44:15 2011 +0700
# Fix a typo.
-s,todays,today's,
+s|todays|today's|
e8db92c345b99acd9c6984a321fc241ed1d01d23
# Date: Tue Nov 15 13:26:53 2011 +0700
# Email address of Reporters is in THANKS.
-s,(Reported by .*?) *<.*>,$1.,
+s|(Reported by .*?) *<.*>|$1.|
0fe4d0740effaec9d08ee9683fb493d8ad0bd8b5
# Date: Mon Oct 17 16:43:18 2011 +0700
# No empty lines in a single commit.
-s,\n\n,\n,g;
+s|\n\n|\n|g;
# Fix a typo.
-s,soure,source,
+s|soure|source|
789817d512111d063981446efc7493ce87696bb3
# Date: Mon Oct 17 12:40:55 2011 +0700
# No empty lines in a single commit.
-s,\n\n,\n,g
+s|\n\n|\n|g
49ae2888b43cad358e2ff60a69722341116e7b40
# Date: Sun Oct 2 10:02:18 2011 -0500
# No leading tabs in git log message.
-s,\n\t,\n,g
+s|\n\t|\n|g
920da81be698974faa50bd36a60248e2c18c4fd5
# Date: Sun Sep 25 17:39:04 2011 -0500
# No leading tabs in git log message.
-s,\n\t,\n,g;
+s|\n\t|\n|g;
# No empty lines in a single commit.
-s,\n\n,\n,g
+s|\n\n|\n|g
dc28c2bfbcb4879bc04a73186d72ec0e7ef2ad4c
# Date: Thu Sep 1 18:45:03 2011 -0500
# Typo in name.
-s,Davd,David,
+s|Davd|David|
1ea9302bd1eadf25b466fcd7e8697e4bef111493
# Date: Sun Apr 10 10:17:21 2011 +0200
# Add back missing annotation:
-s,$,\nCopyright-paperwork-exempt: Yes,
+s|$|\nCopyright-paperwork-exempt: Yes|
1b76054f4763a28ae1b01fbeee86ba0c524d1923
# Date: Mon Mar 14 08:40:50 2011 +0100
# Refill to 64 columns (72 in ChangeLog including leading \t):
-s,to add all\nnecessary,to\nadd all necessary,;
-s,support\. Currently,support.\nCurrently,;
-s,filters\n,filters ,;
-s,the case with,the\ncase with,;
-s,This change\nhandles,This change handles,;
-s,the situation for,the situation\nfor,;
-s,thread\nsupport was,thread support\nwas,;
+s|to add all\nnecessary|to\nadd all necessary|;
+s|support\. Currently|support.\nCurrently|;
+s|filters\n|filters |;
+s|the case with|the\ncase with|;
+s|This change\nhandles|This change handles|;
+s|the situation for|the situation\nfor|;
+s|thread\nsupport was|thread support\nwas|;
# Indent urls slightly:
-s,\nhttp://,\n http://,g;
+s|\nhttp://|\n http://|g;
# No empty lines in a single commit:
-s,\n\n,\n,g;
+s|\n\n|\n|g;
# Add back missing annotation, and co-author:
-s,$,\nCopyright-paperwork-exempt: Yes,;
-s,$,\nCo-authored-by: Rhys Ulerich <address@hidden>,;
+s|$|\nCopyright-paperwork-exempt: Yes|;
+s|$|\nCo-authored-by: Rhys Ulerich <address@hidden>|;
e94c6d6e0359d92f08f491f57e0ef3371e978952
# Date: Thu Jan 20 19:35:14 2011 +0100
# Add back missing annotation:
-s,$,\nCopyright-paperwork-exempt: Yes,
+s|$|\nCopyright-paperwork-exempt: Yes|
9167aecabd12c5afe7a65d45dc73f8c92ab42f05
# Date: Sun Jan 9 19:51:28 2011 +0100
# Add back missing annotation:
-s,$,\nCopyright-paperwork-exempt: Yes,
+s|$|\nCopyright-paperwork-exempt: Yes|
diff --git a/build-aux/ltmain.m4sh b/build-aux/ltmain.m4sh
index 5e8fb25..160d8af 100644
--- a/build-aux/ltmain.m4sh
+++ b/build-aux/ltmain.m4sh
@@ -132,14 +132,14 @@ m4_define([M4SH_IN_HEADER], [$1])dnl
m4_include([getopt.m4sh])
M4SH_VERBATIM([[
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
# Global variables.
nonopt=
preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
extracted_archives=
extracted_serial=0
@@ -152,7 +152,7 @@ exec_cmd=
# Append VALUE to the end of shell variable VAR.
func_append ()
{
- eval "${1}=\$${1}\${2}"
+ eval "$1=\$$1\$2"
} # func_append may be replaced by extended shell implementation
# func_append_quoted var value
@@ -160,15 +160,15 @@ func_append ()
# by a space.
func_append_quoted ()
{
- func_quote_for_eval "${2}"
- eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+ func_quote_for_eval "$2"
+ eval "$1=\$$1\\ \$func_quote_for_eval_result"
} # func_append_quoted may be replaced by extended shell implementation
# func_arith arithmetic-term...
func_arith ()
{
- func_arith_result=`expr "address@hidden"`
+ func_arith_result=`expr "$@"`
} # func_arith may be replaced by extended shell implementation
@@ -176,21 +176,21 @@ func_arith ()
# STRING may not start with a hyphen.
func_len ()
{
- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
} # func_len may be replaced by extended shell implementation
# func_lo2o object
func_lo2o ()
{
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+ func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
} # func_lo2o may be replaced by extended shell implementation
# func_xform libobj-or-source
func_xform ()
{
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+ func_xform_result=`$ECHO "$1" | $SED 's/\.[^.]*$/.lo/'`
} # func_xform may be replaced by extended shell implementation
@@ -228,12 +228,12 @@ func_config ()
func_features ()
{
echo "host: $host"
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
echo "enable shared libraries"
else
echo "disable shared libraries"
fi
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
echo "enable static libraries"
else
echo "disable static libraries"
@@ -249,11 +249,11 @@ func_features ()
func_enable_tag ()
{
# Global variable:
- tagname="$1"
+ tagname=$1
re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
- sed_extractcf="/$re_begincf/,/$re_endcf/p"
+ sed_extractcf=/$re_begincf/,/$re_endcf/p
# Validate tagname.
case $tagname in
@@ -389,12 +389,12 @@ M4SH_GETOPTS(
[
# save first non-option argument
if test "$[]#" -gt 0; then
- nonopt="$opt"
+ nonopt=$opt
shift
fi
# preserve --debug
- test "$debug_cmd" = : || func_append preserve_args " --debug"
+ test : = "$debug_cmd" || func_append preserve_args " --debug"
case $host in
*cygwin* | *mingw* | *pw32* | *cegcc*)
@@ -410,22 +410,22 @@ M4SH_GETOPTS(
# Sanity checks first:
func_check_version_match
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
- fi
+ test yes != "$build_libtool_libs" \
+ && test yes != "$build_old_libs" \
+ && func_fatal_configuration "not configured to build any kind of library"
# Darwin sucks
eval std_shrext=\"$shrext_cmds\"
# Only execute mode is allowed to have -dlopen flags.
- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+ if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
func_error "unrecognized option \`-dlopen'"
$ECHO "$help" 1>&2
exit $EXIT_FAILURE
fi
# Change the help message to a mode-specific one.
- generic_help="$help"
+ generic_help=$help
help="Try \`$progname --help --mode=$opt_mode' for more information."
}
])
@@ -461,13 +461,13 @@ func_lalib_unsafe_p ()
for lalib_p_l in 1 2 3 4
do
read lalib_p_line
- case "$lalib_p_line" in
+ case $lalib_p_line in
\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
esac
done
exec 0<&5 5<&-
fi
- test "$lalib_p" = yes
+ test yes = "$lalib_p"
}
# func_ltwrapper_script_p file
@@ -501,7 +501,7 @@ func_ltwrapper_scriptname ()
{
func_dirname_and_basename "$1" "" "."
func_stripname '' '.exe' "$func_basename_result"
-
func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+
func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
}
# func_ltwrapper_p file
@@ -568,10 +568,10 @@ func_resolve_sysroot ()
# store the result into func_replace_sysroot_result.
func_replace_sysroot ()
{
- case "$lt_sysroot:$1" in
+ case $lt_sysroot:$1 in
?*:"$lt_sysroot"*)
func_stripname "$lt_sysroot" '' "$1"
- func_replace_sysroot_result="=$func_stripname_result"
+ func_replace_sysroot_result='='$func_stripname_result
;;
*)
# Including no sysroot.
@@ -608,7 +608,7 @@ func_infer_tag ()
for z in $available_tags; do
if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" >
/dev/null; then
# Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^#
### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+ eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ###
END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
@@ -649,15 +649,15 @@ func_infer_tag ()
# but don't create it if we're doing a dry run.
func_write_libtool_object ()
{
- write_libobj=${1}
- if test "$build_libtool_libs" = yes; then
- write_lobj=\'${2}\'
+ write_libobj=$1
+ if test yes = "$build_libtool_libs"; then
+ write_lobj=\'$2\'
else
write_lobj=none
fi
- if test "$build_old_libs" = yes; then
- write_oldobj=\'${3}\'
+ if test yes = "$build_old_libs"; then
+ write_oldobj=\'$3\'
else
write_oldobj=none
fi
@@ -677,7 +677,7 @@ pic_object=$write_lobj
non_pic_object=$write_oldobj
EOF
- $MV "${write_libobj}T" "${write_libobj}"
+ $MV "${write_libobj}T" "$write_libobj"
}
}
@@ -699,7 +699,7 @@ func_convert_core_file_wine_to_w32 ()
{
$debug_cmd
- func_convert_core_file_wine_to_w32_result="$1"
+ func_convert_core_file_wine_to_w32_result=$1
if test -n "$1"; then
# Unfortunately, winepath does not exit with a non-zero error code, so we
# are forced to check the contents of stdout. On the other hand, if the
@@ -707,7 +707,7 @@ func_convert_core_file_wine_to_w32 ()
# *an error message* to stdout. So we must check for both error code of
# zero AND non-empty stdout, which explains the odd construction:
func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}";
then
+ if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp";
then
func_convert_core_file_wine_to_w32_result=`$ECHO
"$func_convert_core_file_wine_to_w32_tmp" |
$SED -e "$lt_sed_naive_backslashify"`
else
@@ -733,7 +733,7 @@ func_convert_core_path_wine_to_w32 ()
$debug_cmd
# unfortunately, winepath doesn't convert paths, only file names
- func_convert_core_path_wine_to_w32_result=""
+ func_convert_core_path_wine_to_w32_result=
if test -n "$1"; then
oldIFS=$IFS
IFS=:
@@ -742,7 +742,7 @@ func_convert_core_path_wine_to_w32 ()
func_convert_core_file_wine_to_w32
"$func_convert_core_path_wine_to_w32_f"
if test -n "$func_convert_core_file_wine_to_w32_result" ; then
if test -z "$func_convert_core_path_wine_to_w32_result"; then
-
func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+
func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
else
func_append func_convert_core_path_wine_to_w32_result
";$func_convert_core_file_wine_to_w32_result"
fi
@@ -814,7 +814,7 @@ func_convert_file_check ()
func_error " \`$1'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback:
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
fi
}
# end func_convert_file_check
@@ -839,7 +839,7 @@ func_convert_path_check ()
func_to_host_path_result=`echo "$3" |
$SED -e "$lt_replace_pathsep_chars"`
else
- func_to_host_path_result="$3"
+ func_to_host_path_result=$3
fi
fi
}
@@ -854,7 +854,7 @@ func_convert_path_front_back_pathsep ()
$debug_cmd
case $4 in
- $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+ $1 ) func_to_host_path_result=$3$func_to_host_path_result
;;
esac
case $4 in
@@ -911,7 +911,7 @@ func_to_tool_file ()
# Copy ARG to func_to_host_file_result.
func_convert_file_noop ()
{
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
}
# end func_convert_file_noop
@@ -924,10 +924,10 @@ func_convert_file_msys_to_w32 ()
{
$debug_cmd
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_msys_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+ func_to_host_file_result=$func_convert_core_msys_to_w32_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -941,7 +941,7 @@ func_convert_file_cygwin_to_w32 ()
{
$debug_cmd
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
if test -n "$1"; then
# because $build is cygwin, we call "the" cygpath in $PATH; no need to use
# LT_CYGPATH in this case.
@@ -959,10 +959,10 @@ func_convert_file_nix_to_w32 ()
{
$debug_cmd
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_file_wine_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+ func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -976,11 +976,11 @@ func_convert_file_msys_to_cygwin ()
{
$debug_cmd
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_msys_to_w32 "$1"
func_cygpath -u "$func_convert_core_msys_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
+ func_to_host_file_result=$func_cygpath_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -995,12 +995,12 @@ func_convert_file_nix_to_cygwin ()
{
$debug_cmd
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
if test -n "$1"; then
# convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
func_convert_core_file_wine_to_w32 "$1"
func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
+ func_to_host_file_result=$func_cygpath_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1038,7 +1038,7 @@ func_init_to_host_path_cmd ()
if test -z "$to_host_path_cmd"; then
func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
- to_host_path_cmd="func_convert_path_${func_stripname_result}"
+ to_host_path_cmd=func_convert_path_$func_stripname_result
fi
}
@@ -1060,7 +1060,7 @@ func_to_host_path ()
# Copy ARG to func_to_host_path_result.
func_convert_path_noop ()
{
- func_to_host_path_result="$1"
+ func_to_host_path_result=$1
}
# end func_convert_path_noop
@@ -1073,7 +1073,7 @@ func_convert_path_msys_to_w32 ()
{
$debug_cmd
- func_to_host_path_result="$1"
+ func_to_host_path_result=$1
if test -n "$1"; then
# Remove leading and trailing path separator characters from ARG. MSYS
# behavior is inconsistent here; cygpath turns them into '.;' and ';.';
@@ -1081,7 +1081,7 @@ func_convert_path_msys_to_w32 ()
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+ func_to_host_path_result=$func_convert_core_msys_to_w32_result
func_convert_path_check : ";" \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1097,7 +1097,7 @@ func_convert_path_cygwin_to_w32 ()
{
$debug_cmd
- func_to_host_path_result="$1"
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
@@ -1118,13 +1118,13 @@ func_convert_path_nix_to_w32 ()
{
$debug_cmd
- func_to_host_path_result="$1"
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+ func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
func_convert_path_check : ";" \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1140,14 +1140,14 @@ func_convert_path_msys_to_cygwin ()
{
$debug_cmd
- func_to_host_path_result="$1"
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
+ func_to_host_path_result=$func_cygpath_result
func_convert_path_check : : \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1164,7 +1164,7 @@ func_convert_path_nix_to_cygwin ()
{
$debug_cmd
- func_to_host_path_result="$1"
+ func_to_host_path_result=$1
if test -n "$1"; then
# Remove leading and trailing path separator characters from
# ARG. msys behavior is inconsistent here, cygpath turns them
@@ -1173,7 +1173,7 @@ func_convert_path_nix_to_cygwin ()
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
+ func_to_host_path_result=$func_cygpath_result
func_convert_path_check : : \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1189,7 +1189,7 @@ func_mode_compile ()
# Get the compilation command and the source file.
base_compile=
- srcfile="$nonopt" # always keep a non-empty value in "srcfile"
+ srcfile=$nonopt # always keep a non-empty value in "srcfile"
suppress_opt=yes
suppress_output=
arg_mode=normal
@@ -1202,12 +1202,12 @@ func_mode_compile ()
case $arg_mode in
arg )
# do not "continue". Instead, add this to base_compile
- lastarg="$arg"
+ lastarg=$arg
arg_mode=normal
;;
target )
- libobj="$arg"
+ libobj=$arg
arg_mode=normal
continue
;;
@@ -1246,12 +1246,12 @@ func_mode_compile ()
func_stripname '-Wc,' '' "$arg"
args=$func_stripname_result
lastarg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for arg in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_append_quoted lastarg "$arg"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
@@ -1264,8 +1264,8 @@ func_mode_compile ()
# Accept the current argument as the source file.
# The previous "srcfile" becomes the current argument.
#
- lastarg="$srcfile"
- srcfile="$arg"
+ lastarg=$srcfile
+ srcfile=$arg
;;
esac # case $arg
;;
@@ -1286,7 +1286,7 @@ func_mode_compile ()
# Get the name of the library object.
test -z "$libobj" && {
func_basename "$srcfile"
- libobj="$func_basename_result"
+ libobj=$func_basename_result
}
;;
esac
@@ -1315,8 +1315,8 @@ func_mode_compile ()
for arg in $later; do
case $arg in
-shared)
- test "$build_libtool_libs" != yes && \
- func_fatal_configuration "cannot build a shared library"
+ test yes = "$build_libtool_libs" \
+ || func_fatal_configuration "cannot build a shared library"
build_old_libs=no
continue
;;
@@ -1344,15 +1344,15 @@ func_mode_compile ()
&& $ECHO "X$libobj" | $GREP '[@:>@~#^*{};<>?"'"'"' &()|`$@<:@]' \
&& func_warning "libobj name \`$libobj' may not contain shell special
characters."
func_dirname_and_basename "$obj" "/" ""
- objname="$func_basename_result"
- xdir="$func_dirname_result"
- lobj=${xdir}$objdir/$objname
+ objname=$func_basename_result
+ xdir=$func_dirname_result
+ lobj=$xdir$objdir/$objname
test -z "$base_compile" && \
func_fatal_help "you must specify a compilation command"
# Delete any leftover library objects.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
removelist="$obj $lobj $libobj ${libobj}T"
else
removelist="$lobj $libobj ${libobj}T"
@@ -1364,16 +1364,16 @@ func_mode_compile ()
pic_mode=default
;;
esac
- if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+ if test yes = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
# non-PIC code in shared libraries is not supported
pic_mode=default
fi
# Calculate the filename of the output object if compiler does
# not support -o with -c
- if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
- lockfile="$output_obj.lock"
+ if test no = "$compiler_c_o"; then
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+ lockfile=$output_obj.lock
else
output_obj=
need_locks=no
@@ -1382,12 +1382,12 @@ func_mode_compile ()
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
- if test "$need_locks" = yes; then
+ if test yes = "$need_locks"; then
until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
func_echo "Waiting for $lockfile to be removed"
sleep 2
done
- elif test "$need_locks" = warn; then
+ elif test warn = "$need_locks"; then
if test -f "$lockfile"; then
$ECHO "\
*** ERROR, $lockfile exists and contains:
@@ -1417,11 +1417,11 @@ compiler."
qsrcfile=$func_quote_for_eval_result
# Only build a PIC object if we are building libtool libraries.
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
# Without this assignment, base_compile gets emptied.
fbsd_hideous_sh_bug=$base_compile
- if test "$pic_mode" != no; then
+ if test no != "$pic_mode"; then
command="$base_compile $qsrcfile $pic_flag"
else
# Don't build PIC code
@@ -1438,7 +1438,7 @@ compiler."
func_show_eval_locale "$command" \
'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
$ECHO "\
*** ERROR, $lockfile contains:
@@ -1465,20 +1465,20 @@ compiler."
fi
# Allow error messages only from the first compilation.
- if test "$suppress_opt" = yes; then
+ if test yes = "$suppress_opt"; then
suppress_output=' >/dev/null 2>&1'
fi
fi
# Only build a position-dependent object if we build old libraries.
- if test "$build_old_libs" = yes; then
- if test "$pic_mode" != yes; then
+ if test yes = "$build_old_libs"; then
+ if test yes != "$pic_mode"; then
# Don't build PIC code
command="$base_compile $qsrcfile$pie_flag"
else
command="$base_compile $qsrcfile $pic_flag"
fi
- if test "$compiler_c_o" = yes; then
+ if test yes = "$compiler_c_o"; then
func_append command " -o $obj"
fi
@@ -1487,7 +1487,7 @@ compiler."
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
$ECHO "\
*** ERROR, $lockfile contains:
@@ -1518,7 +1518,7 @@ compiler."
func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
# Unlock the critical section if it was locked
- if test "$need_locks" != no; then
+ if test no != "$need_locks"; then
removelist=$lockfile
$RM "$lockfile"
fi
@@ -1528,7 +1528,7 @@ compiler."
}
$opt_help || {
- test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+ test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
}
func_mode_help ()
@@ -1691,7 +1691,7 @@ required, except when creating a convenience library.
If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
using \`ar' and \`ranlib', or on Windows using \`lib'.
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+If OUTPUT-FILE ends in \`.lo' or \`.$objext', then a reloadable object file
is created, otherwise an executable program is created."
;;
@@ -1720,7 +1720,7 @@ Otherwise, only FILE itself is deleted using RM."
# Now that we've collected a possible --mode arg, show help if necessary
if $opt_help; then
- if test "$opt_help" = :; then
+ if test : = "$opt_help"; then
func_mode_help
else
{
@@ -1756,7 +1756,7 @@ func_mode_execute ()
$debug_cmd
# The first argument is the command name.
- cmd="$nonopt"
+ cmd=$nonopt
test -z "$cmd" && \
func_fatal_help "you must specify a COMMAND"
@@ -1789,7 +1789,7 @@ func_mode_execute ()
fi
func_dirname "$file" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
if test -f "$dir/$objdir/$dlname"; then
func_append dir "/$objdir"
@@ -1803,7 +1803,7 @@ func_mode_execute ()
*.lo)
# Just add the directory containing the .lo file.
func_dirname "$file" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
;;
*)
@@ -1814,7 +1814,7 @@ func_mode_execute ()
# Get the absolute pathname.
absdir=`cd "$dir" && pwd`
- test -n "$absdir" && dir="$absdir"
+ test -n "$absdir" && dir=$absdir
# Now add the directory to shlibpath_var.
if eval "test -z \"\$$shlibpath_var\""; then
@@ -1826,7 +1826,7 @@ func_mode_execute ()
# This variable tells wrapper scripts just to set shlibpath_var
# rather than running their programs.
- libtool_execute_magic="$magic"
+ libtool_execute_magic=$magic
# Check if any of the arguments is a wrapper script.
args=
@@ -1839,12 +1839,12 @@ func_mode_execute ()
if func_ltwrapper_script_p "$file"; then
func_source "$file"
# Transform arg to wrapped name.
- file="$progdir/$program"
+ file=$progdir/$program
elif func_ltwrapper_executable_p "$file"; then
func_ltwrapper_scriptname "$file"
func_source "$func_ltwrapper_scriptname_result"
# Transform arg to wrapped name.
- file="$progdir/$program"
+ file=$progdir/$program
fi
;;
esac
@@ -1852,7 +1852,15 @@ func_mode_execute ()
func_append_quoted args "$file"
done
- if test "X$opt_dry_run" = Xfalse; then
+ if $opt_dry_run; then
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+ echo "export $shlibpath_var"
+ fi
+ $ECHO "$cmd$args"
+ exit $EXIT_SUCCESS
+ else
if test -n "$shlibpath_var"; then
# Export the shlibpath_var.
eval "export $shlibpath_var"
@@ -1869,19 +1877,11 @@ func_mode_execute ()
done
# Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
- else
- # Display what would be done.
- if test -n "$shlibpath_var"; then
- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- echo "export $shlibpath_var"
- fi
- $ECHO "$cmd$args"
- exit $EXIT_SUCCESS
+ exec_cmd=\$cmd$args
fi
}
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
# func_mode_finish arg...
@@ -1926,7 +1926,7 @@ func_mode_finish ()
else
tmpdir=`func_mktempdir`
for lib in $libs; do
- sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+ sed -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
> $tmpdir/tmp-la
mv -f $tmpdir/tmp-la $lib
done
@@ -2001,7 +2001,7 @@ func_mode_finish ()
exit $EXIT_SUCCESS
}
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
# func_mode_install arg...
@@ -2011,9 +2011,10 @@ func_mode_install ()
# There may be an optional sh(1) argument at the beginning of
# install_prog (especially on Windows NT).
- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
# Allow the use of GNU shtool's install command.
- case $nonopt in *shtool*) :;; *) false;; esac; then
+ case $nonopt in *shtool*) :;; *) false;; esac
+ then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@ -2040,7 +2041,7 @@ func_mode_install ()
opts=
prev=
install_type=
- isdir=no
+ isdir=false
stripme=
no_mode=:
for arg
@@ -2053,7 +2054,7 @@ func_mode_install ()
fi
case $arg in
- -d) isdir=yes ;;
+ -d) isdir=: ;;
-f)
if $install_cp; then :; else
prev=$arg
@@ -2071,7 +2072,7 @@ func_mode_install ()
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
- if test "x$prev" = x-m && test -n "$install_override_mode"; then
+ if test X-m = "X$prev" && test -n "$install_override_mode"; then
arg2=$install_override_mode
no_mode=false
fi
@@ -2118,14 +2119,14 @@ func_mode_install ()
dest=$func_stripname_result
# Check to see that the destination is a directory.
- test -d "$dest" && isdir=yes
- if test "$isdir" = yes; then
- destdir="$dest"
+ test -d "$dest" && isdir=:
+ if $isdir; then
+ destdir=$dest
destname=
else
func_dirname_and_basename "$dest" "" "."
- destdir="$func_dirname_result"
- destname="$func_basename_result"
+ destdir=$func_dirname_result
+ destname=$func_basename_result
# Not a directory, so check to see that there is only one file specified.
set dummy $files; shift
@@ -2148,7 +2149,7 @@ func_mode_install ()
# This variable tells wrapper scripts just to set variables rather
# than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
staticlibs=
future_libdirs=
@@ -2190,7 +2191,7 @@ func_mode_install ()
fi
func_dirname "$file" "/" ""
- dir="$func_dirname_result"
+ dir=$func_dirname_result
func_append dir "$objdir"
if test -n "$relink_command"; then
@@ -2221,21 +2222,21 @@ func_mode_install ()
# See the names of the shared library.
set dummy $library_names; shift
if test -n "$1"; then
- realname="$1"
+ realname=$1
shift
- srcname="$realname"
- test -n "$relink_command" && srcname="$realname"T
+ srcname=$realname
+ test -n "$relink_command" && srcname=${realname}T
# Install the shared library and build the symlinks.
func_show_eval "$install_shared_prog $dir/$srcname
$destdir/$realname" \
'exit $?'
- tstripme="$stripme"
+ tstripme=$stripme
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
case $realname in
*.dll.a)
- tstripme=""
+ tstripme=
;;
esac
;;
@@ -2257,14 +2258,14 @@ func_mode_install ()
fi
# Do each command in the postinstall commands.
- lib="$destdir/$realname"
+ lib=$destdir/$realname
func_execute_cmds "$postinstall_cmds" 'exit $?'
fi
# Install the pseudo-library for information purposes.
func_basename "$file"
- name="$func_basename_result"
- instname="$dir/$name"i
+ name=$func_basename_result
+ instname=$dir/${name}i
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
@@ -2276,11 +2277,11 @@ func_mode_install ()
# Figure out destination file name, if it wasn't already specified.
if test -n "$destname"; then
- destfile="$destdir/$destname"
+ destfile=$destdir/$destname
else
func_basename "$file"
- destfile="$func_basename_result"
- destfile="$destdir/$destfile"
+ destfile=$func_basename_result
+ destfile=$destdir/$destfile
fi
# Deduce the name of the destination old-style object file.
@@ -2290,7 +2291,7 @@ func_mode_install ()
staticdest=$func_lo2o_result
;;
*.$objext)
- staticdest="$destfile"
+ staticdest=$destfile
destfile=
;;
*)
@@ -2303,7 +2304,7 @@ func_mode_install ()
func_show_eval "$install_prog $file $destfile" 'exit $?'
# Install the old object if enabled.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
# Deduce the name of the old-style object file.
func_lo2o "$file"
staticobj=$func_lo2o_result
@@ -2315,23 +2316,23 @@ func_mode_install ()
*)
# Figure out destination file name, if it wasn't already specified.
if test -n "$destname"; then
- destfile="$destdir/$destname"
+ destfile=$destdir/$destname
else
func_basename "$file"
- destfile="$func_basename_result"
- destfile="$destdir/$destfile"
+ destfile=$func_basename_result
+ destfile=$destdir/$destfile
fi
# If the file is missing, and there is a .exe on the end, strip it
# because it is most likely a libtool script we actually want to
# install
- stripped_ext=""
+ stripped_ext=
case $file in
*.exe)
if test ! -f "$file"; then
func_stripname '' '.exe' "$file"
file=$func_stripname_result
- stripped_ext=".exe"
+ stripped_ext=.exe
fi
;;
esac
@@ -2361,17 +2362,17 @@ func_mode_install ()
test -z "$generated_by_libtool_version" && \
func_fatal_error "invalid libtool wrapper script \`$wrapper'"
- finalize=yes
+ finalize=:
for lib in $notinst_deplibs; do
# Check to see that each library is installed.
libdir=
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite:
skip nested quoting test
+ libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
- finalize=no
+ finalize=false
fi
done
@@ -2379,13 +2380,13 @@ func_mode_install ()
func_source "$wrapper"
outputname=
- if test "$fast_install" = no && test -n "$relink_command"; then
+ if test no = "$fast_install" && test -n "$relink_command"; then
$opt_dry_run || {
- if test "$finalize" = yes; then
+ if $finalize; then
tmpdir=`func_mktempdir`
func_basename "$file$stripped_ext"
- file="$func_basename_result"
- outputname="$tmpdir/$file"
+ file=$func_basename_result
+ outputname=$tmpdir/$file
# Replace the output file specification.
relink_command=`$ECHO "$relink_command" | $SED
'address@hidden@%'"$outputname"'%g'`
@@ -2399,7 +2400,7 @@ func_mode_install ()
$opt_dry_run || ${RM}r "$tmpdir"
continue
fi
- file="$outputname"
+ file=$outputname
else
func_warning "cannot relink \`$file'"
fi
@@ -2438,10 +2439,10 @@ func_mode_install ()
for file in $staticlibs; do
func_basename "$file"
- name="$func_basename_result"
+ name=$func_basename_result
# Set up the ranlib parameters.
- oldlib="$destdir/$name"
+ oldlib=$destdir/$name
func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
tool_oldlib=$func_to_tool_file_result
@@ -2467,7 +2468,7 @@ func_mode_install ()
fi
}
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
@@ -2477,15 +2478,15 @@ func_generate_dlsyms ()
{
$debug_cmd
- my_outputname="$1"
- my_originator="$2"
- my_pic_p="${3-no}"
+ my_outputname=$1
+ my_originator=$2
+ my_pic_p=${3-false}
my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
my_dlsyms=
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
if test -n "$NM" && test -n "$global_symbol_pipe"; then
- my_dlsyms="${my_outputname}S.c"
+ my_dlsyms=${my_outputname}S.c
else
func_error "not configured to extract global symbols from dlpreopened
files"
fi
@@ -2496,7 +2497,7 @@ func_generate_dlsyms ()
"") ;;
*.c)
# Discover the nlist of each of the dlfiles.
- nlist="$output_objdir/${my_outputname}.nm"
+ nlist=$output_objdir/$my_outputname.nm
func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
@@ -2530,7 +2531,7 @@ extern \"C\" {
/* External symbol declarations for the compiler. */\
"
- if test "$dlself" = yes; then
+ if test yes = "$dlself"; then
func_verbose "generating symbol list for \`$output'"
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
@@ -2559,10 +2560,10 @@ extern \"C\" {
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- export_symbols="$output_objdir/$outputname.exp"
+ export_symbols=$output_objdir/$outputname.exp
$opt_dry_run || {
$RM $export_symbols
- eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p'
"'< "$nlist" > "$export_symbols"'
+ eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'<
"$nlist" > "$export_symbols"'
case $host in
*cygwin* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
@@ -2572,7 +2573,7 @@ extern \"C\" {
}
else
$opt_dry_run || {
- eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e
's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+ eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"'
< "$export_symbols" > "$output_objdir/$outputname.exp"'
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" >
"$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
@@ -2588,20 +2589,20 @@ extern \"C\" {
for dlprefile in $dlprefiles; do
func_verbose "extracting global C symbols from \`$dlprefile'"
func_basename "$dlprefile"
- name="$func_basename_result"
+ name=$func_basename_result
case $host in
*cygwin* | *mingw* | *cegcc* )
# if an import library, we need to obtain dlname
if func_win32_import_lib_p "$dlprefile"; then
func_tr_sh "$dlprefile"
eval "curr_lafile=\$libfile_$func_tr_sh_result"
- dlprefile_dlbasename=""
+ dlprefile_dlbasename=
if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
# Use subshell, to avoid clobbering current variable values
dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
if test -n "$dlprefile_dlname" ; then
func_basename "$dlprefile_dlname"
- dlprefile_dlbasename="$func_basename_result"
+ dlprefile_dlbasename=$func_basename_result
else
# no lafile. user explicitly requested -dlpreopen <import
library>.
$sharedlib_from_linklib_cmd "$dlprefile"
@@ -2719,9 +2720,7 @@ static const void *lt_preloaded_setup() {
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
*)
- if test "X$my_pic_p" != Xno; then
- pic_flag_for_symtable=" $pic_flag"
- fi
+ $my_pic_p && pic_flag_for_symtable=" $pic_flag"
;;
esac
;;
@@ -2741,7 +2740,7 @@ static const void *lt_preloaded_setup() {
func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S"
"${nlist}T"'
# Transform the symbol file into the correct name.
- symfileobj="$output_objdir/${my_outputname}S.$objext"
+ symfileobj=$output_objdir/${my_outputname}S.$objext
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
@@ -2784,7 +2783,7 @@ func_win32_libid ()
{
$debug_cmd
- win32_libid_type="unknown"
+ win32_libid_type=unknown
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
*ar\ archive\ import\ library*) # definitely import
@@ -2799,7 +2798,7 @@ func_win32_libid ()
$SED -n -e '
1,100{
/ I /{
- s,.*,import,
+ s|.*|import|
p
q
}
@@ -2951,7 +2950,7 @@ func_cygming_dll_for_implib_fallback ()
sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core
'.idata$6' "$1"`
else
# unknown
- sharedlib_from_linklib_result=""
+ sharedlib_from_linklib_result=
fi
}
@@ -2961,9 +2960,9 @@ func_extract_an_archive ()
{
$debug_cmd
- f_ex_an_ar_dir="$1"; shift
- f_ex_an_ar_oldlib="$1"
- if test "$lock_old_archive_extraction" = yes; then
+ f_ex_an_ar_dir=$1; shift
+ f_ex_an_ar_oldlib=$1
+ if test yes = "$lock_old_archive_extraction"; then
lockfile=$f_ex_an_ar_oldlib.lock
until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
func_echo "Waiting for $lockfile to be removed"
@@ -2972,7 +2971,7 @@ func_extract_an_archive ()
fi
func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
'stat=$?; rm -f "$lockfile"; exit $stat'
- if test "$lock_old_archive_extraction" = yes; then
+ if test yes = "$lock_old_archive_extraction"; then
$opt_dry_run || rm -f "$lockfile"
fi
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
@@ -2988,21 +2987,21 @@ func_extract_archives ()
{
$debug_cmd
- my_gentop="$1"; shift
+ my_gentop=$1; shift
my_oldlibs=${1+"$@"}
- my_oldobjs=""
- my_xlib=""
- my_xabs=""
- my_xdir=""
+ my_oldobjs=
+ my_xlib=
+ my_xabs=
+ my_xdir=
for my_xlib in $my_oldlibs; do
# Extract the objects.
case $my_xlib in
- [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
func_basename "$my_xlib"
- my_xlib="$func_basename_result"
+ my_xlib=$func_basename_result
my_xlib_u=$my_xlib
while :; do
case " $extracted_archives " in
@@ -3014,7 +3013,7 @@ func_extract_archives ()
esac
done
extracted_archives="$extracted_archives $my_xlib_u"
- my_xdir="$my_gentop/$my_xlib_u"
+ my_xdir=$my_gentop/$my_xlib_u
func_mkdir_p "$my_xdir"
@@ -3027,19 +3026,20 @@ func_extract_archives ()
cd $my_xdir || exit $?
darwin_archive=$my_xabs
darwin_curdir=`pwd`
- darwin_base_archive=`basename "$darwin_archive"`
+ func_basename "$darwin_archive"
+ darwin_base_archive=$func_basename_result
darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP
Architectures 2>/dev/null || true`
if test -n "$darwin_arches"; then
darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
darwin_arch=
func_verbose "$darwin_base_archive has multiple architectures
$darwin_arches"
for darwin_arch in $darwin_arches ; do
- func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- $LIPO -thin $darwin_arch -output
"unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
"${darwin_archive}"
- cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+ func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+ $LIPO -thin $darwin_arch -output
"unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
"$darwin_archive"
+ cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+ func_extract_an_archive "`pwd`" "$darwin_base_archive"
cd "$darwin_curdir"
- $RM
"unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+ $RM
"unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
done # $darwin_arches
## Okay now we've a bunch of thin objects, gotta fatten them up :)
darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name
\*.lo -print | $SED -e "$basename" | sort -u`
@@ -3064,7 +3064,7 @@ func_extract_archives ()
my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name
\*.lo -print | sort | $NL2SP`
done
- func_extract_archives_result="$my_oldobjs"
+ func_extract_archives_result=$my_oldobjs
}
@@ -3182,7 +3182,7 @@ func_parse_lt_options ()
# Print the debug banner immediately:
if test -n \"\$lt_option_debug\"; then
- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE)
$VERSION\" 1>&2
+ echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE)
$VERSION\" 1>&2
fi
}
@@ -3193,7 +3193,7 @@ func_lt_dump_args ()
lt_dump_args_N=1;
for lt_arg
do
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]:
\$lt_arg\"
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]:
\$lt_arg\"
lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
done
}
@@ -3207,7 +3207,7 @@ func_exec_program_core ()
*-*-mingw | *-*-os2* | *-cegcc*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]:
\$progdir\\\\\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]:
\$progdir\\\\\$program\" 1>&2
func_lt_dump_args \${1+\"address@hidden"} 1>&2
fi
exec \"\$progdir\\\\\$program\" \${1+\"address@hidden"}
@@ -3217,7 +3217,7 @@ func_exec_program_core ()
*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]:
\$progdir/\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]:
\$progdir/\$program\" 1>&2
func_lt_dump_args \${1+\"address@hidden"} 1>&2
fi
exec \"\$progdir/\$program\" \${1+\"address@hidden"}
@@ -3292,13 +3292,13 @@ func_exec_program ()
test -n \"\$absdir\" && thisdir=\"\$absdir\"
"
- if test "$fast_install" = yes; then
+ if test yes = "$fast_install"; then
$ECHO "\
program=lt-'$outputname'$exeext
progdir=\"\$thisdir/$objdir\"
if test ! -f \"\$progdir/\$program\" ||
- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\"
2>/dev/null | ${SED} 1q\`; \\
+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\"
2>/dev/null | $SED 1q\`; \\
test \"X\$file\" != \"X\$progdir/\$program\"; }; then
file=\"\$\$-\$program\"
@@ -3350,7 +3350,7 @@ func_exec_program ()
fi
# Export our shlibpath_var if we have one.
- if test "$shlibpath_overrides_runpath" = yes && test -n
"$shlibpath_var" && test -n "$temp_rpath"; then
+ if test yes = "$shlibpath_overrides_runpath" && test -n
"$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
# Add our own library path to $shlibpath_var
$shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
@@ -3555,7 +3555,7 @@ volatile const char * MAGIC_EXE = "$magic_exe";
const char * LIB_PATH_VARNAME = "$shlibpath_var";
EOF
- if test "$shlibpath_overrides_runpath" = yes && test -n
"$shlibpath_var" && test -n "$temp_rpath"; then
+ if test yes = "$shlibpath_overrides_runpath" && test -n
"$shlibpath_var" && test -n "$temp_rpath"; then
func_to_host_path "$temp_rpath"
cat <<EOF
const char * LIB_PATH_VALUE = "$func_to_host_path_result";
@@ -3579,7 +3579,7 @@ const char * EXE_PATH_VALUE = "";
EOF
fi
- if test "$fast_install" = yes; then
+ if test yes = "$fast_install"; then
cat <<EOF
const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
EOF
@@ -3625,7 +3625,7 @@ main (int argc, char *argv[])
if (STREQ (argv[i], dumpscript_opt))
{
EOF
- case "$host" in
+ case $host in
*mingw* | *cygwin* )
# make stdout use "unix" line endings
echo " setmode(1,_O_BINARY);"
@@ -4402,7 +4402,7 @@ func_mode_link ()
non_pic_objects=
precious_files_regex=
prefer_static_libs=no
- preload=no
+ preload=false
prev=
prevarg=
release=
@@ -4414,7 +4414,7 @@ func_mode_link ()
vinfo=
vinfo_number=no
weak_libs=
- single_module="${wl}-single_module"
+ single_module=$wl-single_module
func_infer_tag $base_compile
# We need to know -static, to get the right output filenames.
@@ -4422,15 +4422,15 @@ func_mode_link ()
do
case $arg in
-shared)
- test "$build_libtool_libs" != yes && \
- func_fatal_configuration "cannot build a shared library"
+ test yes != "$build_libtool_libs" \
+ && func_fatal_configuration "cannot build a shared library"
build_old_libs=no
break
;;
-all-static | -static | -static-libtool-libs)
case $arg in
-all-static)
- if test "$build_libtool_libs" = yes && test -z "$link_static_flag";
then
+ if test yes = "$build_libtool_libs" && test -z "$link_static_flag";
then
func_warning "complete static linking is impossible in this
configuration"
fi
if test -n "$link_static_flag"; then
@@ -4463,7 +4463,7 @@ func_mode_link ()
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
- arg="$1"
+ arg=$1
shift
func_quote_for_eval "$arg"
qarg=$func_quote_for_eval_unquoted_result
@@ -4480,21 +4480,21 @@ func_mode_link ()
case $prev in
bindir)
- bindir="$arg"
+ bindir=$arg
prev=
continue
;;
dlfiles|dlprefiles)
- if test "$preload" = no; then
+ $preload || {
# Add the symbol object into the linking commands.
func_append compile_command " @SYMFILE@"
func_append finalize_command " @SYMFILE@"
- preload=yes
- fi
+ preload=:
+ }
case $arg in
*.la | *.lo) ;; # We handle these cases below.
force)
- if test "$dlself" = no; then
+ if test no = "$dlself"; then
dlself=needless
export_dynamic=yes
fi
@@ -4502,9 +4502,9 @@ func_mode_link ()
continue
;;
self)
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
dlself=yes
- elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+ elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
dlself=yes
else
dlself=needless
@@ -4514,7 +4514,7 @@ func_mode_link ()
continue
;;
*)
- if test "$prev" = dlfiles; then
+ if test dlfiles = "$prev"; then
func_append dlfiles " $arg"
else
func_append dlprefiles " $arg"
@@ -4525,14 +4525,14 @@ func_mode_link ()
esac
;;
expsyms)
- export_symbols="$arg"
+ export_symbols=$arg
test -f "$arg" \
|| func_fatal_error "symbol file \`$arg' does not exist"
prev=
continue
;;
expsyms_regex)
- export_symbols_regex="$arg"
+ export_symbols_regex=$arg
prev=
continue
;;
@@ -4550,7 +4550,7 @@ func_mode_link ()
continue
;;
inst_prefix)
- inst_prefix_dir="$arg"
+ inst_prefix_dir=$arg
prev=
continue
;;
@@ -4574,21 +4574,21 @@ func_mode_link ()
if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none &&
- test "$non_pic_object" = none; then
+ test none = "$pic_object" &&
+ test none = "$non_pic_object"; then
func_fatal_error "cannot find name of object for \`$arg'"
fi
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
- if test "$pic_object" != none; then
+ if test none != "$pic_object"; then
# Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ pic_object=$xdir$pic_object
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test
"$dlopen_support" = yes; then
+ if test dlfiles = "$prev"; then
+ if test yes = "$build_libtool_libs" && test yes =
"$dlopen_support"; then
func_append dlfiles " $pic_object"
prev=
continue
@@ -4599,7 +4599,7 @@ func_mode_link ()
fi
# CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@@ -4607,23 +4607,23 @@ func_mode_link ()
# A PIC object.
func_append libobjs " $pic_object"
- arg="$pic_object"
+ arg=$pic_object
fi
# Non-PIC object.
- if test "$non_pic_object" != none; then
+ if test none != "$non_pic_object"; then
# Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+ non_pic_object=$xdir$non_pic_object
# A standard non-PIC object
func_append non_pic_objects " $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
+ if test -z "$pic_object" || test none = "$pic_object" ; then
+ arg=$non_pic_object
fi
else
# If the PIC object exists, use it instead.
# $xdir was prepended to $pic_object above.
- non_pic_object="$pic_object"
+ non_pic_object=$pic_object
func_append non_pic_objects " $non_pic_object"
fi
else
@@ -4631,7 +4631,7 @@ func_mode_link ()
if $opt_dry_run; then
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
@@ -4651,12 +4651,12 @@ func_mode_link ()
continue
;;
precious_regex)
- precious_files_regex="$arg"
+ precious_files_regex=$arg
prev=
continue
;;
release)
- release="-$arg"
+ release=-$arg
prev=
continue
;;
@@ -4668,7 +4668,7 @@ func_mode_link ()
func_fatal_error "only absolute run-paths are allowed"
;;
esac
- if test "$prev" = rpath; then
+ if test rpath = "$prev"; then
case "$rpath " in
*" $arg "*) ;;
*) func_append rpath " $arg" ;;
@@ -4683,7 +4683,7 @@ func_mode_link ()
continue
;;
shrext)
- shrext_cmds="$arg"
+ shrext_cmds=$arg
prev=
continue
;;
@@ -4723,7 +4723,7 @@ func_mode_link ()
esac
fi # test -n "$prev"
- prevarg="$arg"
+ prevarg=$arg
case $arg in
-all-static)
@@ -4769,7 +4769,7 @@ func_mode_link ()
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
func_fatal_error "more than one -exported-symbols argument is not
allowed"
fi
- if test "X$arg" = "X-export-symbols"; then
+ if test X-export-symbols = "X$arg"; then
prev=expsyms
else
prev=expsyms_regex
@@ -4817,7 +4817,7 @@ func_mode_link ()
absdir=`cd "$dir" && pwd`
test -z "$absdir" && \
func_fatal_error "cannot determine absolute directory name of
\`$dir'"
- dir="$absdir"
+ dir=$absdir
;;
esac
case "$deplibs " in
@@ -4852,7 +4852,7 @@ func_mode_link ()
;;
-l*)
- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ if test X-lc = "X$arg" || test X-lm = "X$arg"; then
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* |
*-*-haiku*)
# These systems don't actually have a C or math library (as such)
@@ -4860,11 +4860,11 @@ func_mode_link ()
;;
*-*-os2*)
# These systems don't actually have a C library (as such)
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
# Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
@@ -4873,14 +4873,14 @@ func_mode_link ()
;;
*-*-sco3.2v5* | *-*-sco5v6*)
# Causes problems with __ctype
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
# Compiler inserts libc in the correct place for threads to work
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
esac
- elif test "X$arg" = "X-lc_r"; then
+ elif test X-lc_r = "X$arg"; then
case $host in
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
# Do not include libc_r directly, use -pthread flag.
@@ -4921,7 +4921,7 @@ func_mode_link ()
;;
-multi_module)
- single_module="${wl}-multi_module"
+ single_module=$wl-multi_module
continue
;;
@@ -5041,14 +5041,14 @@ func_mode_link ()
func_stripname '-Wc,' '' "$arg"
args=$func_stripname_result
arg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for flag in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_quote_for_eval "$flag"
func_append arg " $func_quote_for_eval_result"
func_append compiler_flags " $func_quote_for_eval_result"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
@@ -5057,15 +5057,15 @@ func_mode_link ()
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
arg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for flag in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_quote_for_eval "$flag"
func_append arg " $wl$func_quote_for_eval_result"
func_append compiler_flags " $wl$func_quote_for_eval_result"
func_append linker_flags " $func_quote_for_eval_result"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
@@ -5088,7 +5088,7 @@ func_mode_link ()
# -msg_* for osf cc
-msg_*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
# Flags to be passed through unchanged, with rationale:
@@ -5108,7 +5108,7 @@ func_mode_link ()
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-O*|-flto*|-fwhopr*|-fuse-linker-plugin)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
func_append compile_command " $arg"
func_append finalize_command " $arg"
func_append compiler_flags " $arg"
@@ -5118,7 +5118,7 @@ func_mode_link ()
# Some other compiler flag.
-* | +*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
*.$objext)
@@ -5139,21 +5139,21 @@ func_mode_link ()
if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none &&
- test "$non_pic_object" = none; then
+ test none = "$pic_object" &&
+ test none = "$non_pic_object"; then
func_fatal_error "cannot find name of object for \`$arg'"
fi
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
- if test "$pic_object" != none; then
+ test none = "$pic_object" || {
# Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ pic_object=$xdir$pic_object
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" =
yes; then
+ if test dlfiles = "$prev"; then
+ if test yes = "$build_libtool_libs" && test yes =
"$dlopen_support"; then
func_append dlfiles " $pic_object"
prev=
continue
@@ -5164,7 +5164,7 @@ func_mode_link ()
fi
# CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
+ if test dlfiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@@ -5172,23 +5172,23 @@ func_mode_link ()
# A PIC object.
func_append libobjs " $pic_object"
- arg="$pic_object"
- fi
+ arg=$pic_object
+ }
# Non-PIC object.
- if test "$non_pic_object" != none; then
+ if test none != "$non_pic_object"; then
# Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+ non_pic_object=$xdir$non_pic_object
# A standard non-PIC object
func_append non_pic_objects " $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
+ if test -z "$pic_object" || test none = "$pic_object"; then
+ arg=$non_pic_object
fi
else
# If the PIC object exists, use it instead.
# $xdir was prepended to $pic_object above.
- non_pic_object="$pic_object"
+ non_pic_object=$pic_object
func_append non_pic_objects " $non_pic_object"
fi
else
@@ -5196,7 +5196,7 @@ func_mode_link ()
if $opt_dry_run; then
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
@@ -5220,11 +5220,11 @@ func_mode_link ()
# A libtool-controlled library.
func_resolve_sysroot "$arg"
- if test "$prev" = dlfiles; then
+ if test dlfiles = "$prev"; then
# This library was specified with -dlopen.
func_append dlfiles " $func_resolve_sysroot_result"
prev=
- elif test "$prev" = dlprefiles; then
+ elif test dlprefiles = "$prev"; then
# The library was specified with -dlpreopen.
func_append dlprefiles " $func_resolve_sysroot_result"
prev=
@@ -5239,7 +5239,7 @@ func_mode_link ()
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
esac # arg
@@ -5253,7 +5253,7 @@ func_mode_link ()
test -n "$prev" && \
func_fatal_help "the \`$prevarg' option requires an argument"
- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec";
then
+ if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec";
then
eval arg=\"$export_dynamic_flag_spec\"
func_append compile_command " $arg"
func_append finalize_command " $arg"
@@ -5262,12 +5262,12 @@ func_mode_link ()
oldlibs=
# calculate the name of the file, without its directory
func_basename "$output"
- outputname="$func_basename_result"
- libobjs_save="$libobjs"
+ outputname=$func_basename_result
+ libobjs_save=$libobjs
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/
/g\'\`
+ eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/
/g\'\`
else
shlib_search_path=
fi
@@ -5275,7 +5275,7 @@ func_mode_link ()
eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
func_dirname "$output" "/" ""
- output_objdir="$func_dirname_result$objdir"
+ output_objdir=$func_dirname_result$objdir
func_to_tool_file "$output_objdir/"
tool_output_objdir=$func_to_tool_file_result
# Create the object directory.
@@ -5306,7 +5306,7 @@ func_mode_link ()
func_append libs " $deplib"
done
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
libs="$predeps $libs $compiler_lib_search_path $postdeps"
# Compute libraries that are listed more than once in $predeps
@@ -5346,7 +5346,7 @@ func_mode_link ()
prog)
compile_deplibs=
finalize_deplibs=
- alldeplibs=no
+ alldeplibs=false
newdlfiles=
newdlprefiles=
passes="conv scan dlopen dlpreopen link"
@@ -5358,29 +5358,29 @@ func_mode_link ()
for pass in $passes; do
# The preopen pass in lib mode reverses $deplibs; put it back here
# so that -L comes before libs that need it for instance...
- if test "$linkmode,$pass" = "lib,link"; then
+ if test lib,link = "$linkmode,$pass"; then
## FIXME: Find the place where the list is rebuilt in the wrong
## order, and fix it there properly
tmp_deplibs=
for deplib in $deplibs; do
tmp_deplibs="$deplib $tmp_deplibs"
done
- deplibs="$tmp_deplibs"
+ deplibs=$tmp_deplibs
fi
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan"; then
- libs="$deplibs"
+ if test lib,link = "$linkmode,$pass" ||
+ test prog,scan = "$linkmode,$pass"; then
+ libs=$deplibs
deplibs=
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
case $pass in
- dlopen) libs="$dlfiles" ;;
- dlpreopen) libs="$dlprefiles" ;;
+ dlopen) libs=$dlfiles ;;
+ dlpreopen) libs=$dlprefiles ;;
link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
- if test "$linkmode,$pass" = "lib,dlpreopen"; then
+ if test lib,dlpreopen = "$linkmode,$pass"; then
# Collect and forward deplibs of preopened libtool libs
for lib in $dlprefiles; do
# Ignore non-libtool-libs
@@ -5401,26 +5401,26 @@ func_mode_link ()
esac
done
done
- libs="$dlprefiles"
+ libs=$dlprefiles
fi
- if test "$pass" = dlopen; then
+ if test dlopen = "$pass"; then
# Collect dlpreopened libraries
- save_deplibs="$deplibs"
+ save_deplibs=$deplibs
deplibs=
fi
for deplib in $libs; do
lib=
- found=no
+ found=false
case $deplib in
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
func_append compiler_flags " $deplib"
- if test "$linkmode" = lib ; then
+ if test lib = "$linkmode"; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
* ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -5430,13 +5430,13 @@ func_mode_link ()
continue
;;
-l*)
- if test "$linkmode" != lib && test "$linkmode" != prog; then
+ if test lib != "$linkmode" && test prog != "$linkmode"; then
func_warning "\`-l' is ignored for archives/objects"
continue
fi
func_stripname '-l' '' "$deplib"
name=$func_stripname_result
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
searchdirs="$newlib_search_path $lib_search_path
$compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
else
searchdirs="$newlib_search_path $lib_search_path
$sys_lib_search_path $shlib_search_path"
@@ -5444,31 +5444,22 @@ func_mode_link ()
for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
- lib="$searchdir/lib${name}${search_ext}"
+ lib=$searchdir/lib$name$search_ext
if test -f "$lib"; then
- if test "$search_ext" = ".la"; then
- found=yes
+ if test .la = "$search_ext"; then
+ found=:
else
- found=no
+ found=false
fi
break 2
fi
done
done
- if test "$found" != yes; then
- # deplib doesn't seem to be a libtool library
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib
$newdependency_libs"
- fi
- continue
- else # deplib is a libtool library
+ if $found; then
+ # deplib is a libtool library
# If $allow_libtool_libs_with_static_runtimes && $deplib is a
stdlib,
# We need to do some special things here, and not later.
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $deplib "*)
if func_lalib_p "$lib"; then
@@ -5476,19 +5467,19 @@ func_mode_link ()
old_library=
func_source "$lib"
for l in $old_library $library_names; do
- ll="$l"
+ ll=$l
done
if test "X$ll" = "X$old_library" ; then # only static version
available
- found=no
+ found=false
func_dirname "$lib" "" "."
- ladir="$func_dirname_result"
+ ladir=$func_dirname_result
lib=$ladir/$old_library
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib
$newdependency_libs"
+ test lib = "$linkmode" && newdependency_libs="$deplib
$newdependency_libs"
fi
continue
fi
@@ -5497,15 +5488,25 @@ func_mode_link ()
*) ;;
esac
fi
+ else
+ # deplib doesn't seem to be a libtool library
+ if test prog,link = "$linkmode,$pass"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ test lib = "$linkmode" && newdependency_libs="$deplib
$newdependency_libs"
+ fi
+ continue
fi
;; # -l
*.ltframework)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- if test "$linkmode" = lib ; then
+ if test lib = "$linkmode"; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
* ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -5518,18 +5519,18 @@ func_mode_link ()
case $linkmode in
lib)
deplibs="$deplib $deplibs"
- test "$pass" = conv && continue
+ test conv = "$pass" && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
func_append newlib_search_path " $func_resolve_sysroot_result"
;;
prog)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
continue
fi
- if test "$pass" = scan; then
+ if test scan = "$pass"; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -5546,7 +5547,7 @@ func_mode_link ()
continue
;; # -L
-R*)
- if test "$pass" = link; then
+ if test link = "$pass"; then
func_stripname '-R' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
dir=$func_resolve_sysroot_result
@@ -5564,7 +5565,7 @@ func_mode_link ()
lib=$func_resolve_sysroot_result
;;
*.$libext)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
continue
fi
@@ -5575,21 +5576,26 @@ func_mode_link ()
case " $dlpreconveniencelibs " in
*" $deplib "*) ;;
*)
- valid_a_lib=no
+ valid_a_lib=false
case $deplibs_check_method in
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1
\(.*\)"`
if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
- valid_a_lib=yes
+ valid_a_lib=:
fi
;;
pass_all)
- valid_a_lib=yes
+ valid_a_lib=:
;;
esac
- if test "$valid_a_lib" != yes; then
+ if $valid_a_lib; then
+ echo
+ $ECHO "*** Warning: Linking the shared library $output against
the"
+ $ECHO "*** static library $deplib is not portable!"
+ deplibs="$deplib $deplibs"
+ else
echo
$ECHO "*** Warning: Trying to link with static lib archive
$deplib."
echo "*** I have the capability to make that library
automatically link in when"
@@ -5597,18 +5603,13 @@ func_mode_link ()
echo "*** shared version of the library, which you do not
appear to have"
echo "*** because the file extensions .$libext of this argument
makes me believe"
echo "*** that it is just a static archive that I should not
use here."
- else
- echo
- $ECHO "*** Warning: Linking the shared library $output against
the"
- $ECHO "*** static library $deplib is not portable!"
- deplibs="$deplib $deplibs"
fi
;;
esac
continue
;;
prog)
- if test "$pass" != link; then
+ if test link != "$pass"; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -5619,10 +5620,10 @@ func_mode_link ()
esac # linkmode
;; # *.$libext
*.lo | *.$objext)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
- elif test "$linkmode" = prog; then
- if test "$pass" = dlpreopen || test "$dlopen_support" != yes ||
test "$build_libtool_libs" = no; then
+ elif test prog = "$linkmode"; then
+ if test dlpreopen = "$pass" || test yes != "$dlopen_support" ||
test no = "$build_libtool_libs"; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
func_append newdlprefiles " $deplib"
@@ -5635,22 +5636,20 @@ func_mode_link ()
continue
;;
%DEPLIBS%)
- alldeplibs=yes
+ alldeplibs=:
continue
;;
esac # case $deplib
- if test "$found" = yes || test -f "$lib"; then :
- else
- func_fatal_error "cannot find the library \`$lib' or unhandled
argument \`$deplib'"
- fi
+ $found || test -f "$lib" \
+ || func_fatal_error "cannot find the library \`$lib' or unhandled
argument \`$deplib'"
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$lib" \
|| func_fatal_error "\`$lib' is not a valid libtool archive"
func_dirname "$lib" "" "."
- ladir="$func_dirname_result"
+ ladir=$func_dirname_result
dlname=
dlopen=
@@ -5680,14 +5679,14 @@ func_mode_link ()
done
fi
dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^
$]*\).ltframework% -framework \1%g'`
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan" ||
- { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ if test lib,link = "$linkmode,$pass" ||
+ test prog,scan = "$linkmode,$pass" ||
+ { test prog != "$linkmode" && test lib != "$linkmode"; }; then
test -n "$dlopen" && func_append dlfiles " $dlopen"
test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
fi
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
if test -z "$libdir"; then
@@ -5697,7 +5696,7 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
- elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ elif test prog != "$linkmode" && test lib != "$linkmode"; then
func_fatal_error "\`$lib' is not a convenience library"
fi
tmp_libs=
@@ -5717,12 +5716,12 @@ func_mode_link ()
# Get the name of the library we link against.
linklib=
if test -n "$old_library" &&
- { test "$prefer_static_libs" = yes ||
- test "$prefer_static_libs,$installed" = "built,no"; }; then
+ { test yes = "$prefer_static_libs" ||
+ test built,no = "$prefer_static_libs,$installed"; }; then
linklib=$old_library
else
for l in $old_library $library_names; do
- linklib="$l"
+ linklib=$l
done
fi
if test -z "$linklib"; then
@@ -5730,13 +5729,13 @@ func_mode_link ()
fi
# This library was specified with -dlopen.
- if test "$pass" = dlopen; then
- if test -z "$libdir"; then
- func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
- fi
+ if test dlopen = "$pass"; then
+ test -n "$libdir" \
+ || func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
if test -z "$dlname" ||
- test "$dlopen_support" != yes ||
- test "$build_libtool_libs" = no; then
+ test yes != "$dlopen_support" ||
+ test no = "$build_libtool_libs"
+ then
# If there is no dlname, no dlopen support or we're linking
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
@@ -5750,40 +5749,40 @@ func_mode_link ()
# We need an absolute path.
case $ladir in
- [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
*)
abs_ladir=`cd "$ladir" && pwd`
if test -z "$abs_ladir"; then
func_warning "cannot determine absolute directory name of \`$ladir'"
func_warning "passing it literally to the linker, although it might
fail"
- abs_ladir="$ladir"
+ abs_ladir=$ladir
fi
;;
esac
func_basename "$lib"
- laname="$func_basename_result"
+ laname=$func_basename_result
# Find the relevant object directory and library name.
- if test "X$installed" = Xyes; then
+ if test yes = "$installed"; then
if test ! -f "$lt_sysroot$libdir/$linklib" && test -f
"$abs_ladir/$linklib"; then
func_warning "library \`$lib' was moved."
- dir="$ladir"
- absdir="$abs_ladir"
- libdir="$abs_ladir"
+ dir=$ladir
+ absdir=$abs_ladir
+ libdir=$abs_ladir
else
- dir="$lt_sysroot$libdir"
- absdir="$lt_sysroot$libdir"
+ dir=$lt_sysroot$libdir
+ absdir=$lt_sysroot$libdir
fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ test yes = "$hardcode_automatic" && avoidtemprpath=yes
else
if test ! -f "$ladir/$objdir/$linklib" && test -f
"$abs_ladir/$linklib"; then
- dir="$ladir"
- absdir="$abs_ladir"
+ dir=$ladir
+ absdir=$abs_ladir
# Remove this search path later
func_append notinst_path " $abs_ladir"
else
- dir="$ladir/$objdir"
- absdir="$abs_ladir/$objdir"
+ dir=$ladir/$objdir
+ absdir=$abs_ladir/$objdir
# Remove this search path later
func_append notinst_path " $abs_ladir"
fi
@@ -5792,11 +5791,11 @@ func_mode_link ()
name=$func_stripname_result
# This library was specified with -dlpreopen.
- if test "$pass" = dlpreopen; then
- if test -z "$libdir" && test "$linkmode" = prog; then
+ if test dlpreopen = "$pass"; then
+ if test -z "$libdir" && test prog = "$linkmode"; then
func_fatal_error "only libraries may -dlpreopen a convenience
library: \`$lib'"
fi
- case "$host" in
+ case $host in
# special handling for platforms with PE-DLLs.
*cygwin* | *mingw* | *cegcc* )
# Linker will automatically link against shared library if both
@@ -5840,9 +5839,9 @@ func_mode_link ()
if test -z "$libdir"; then
# Link the convenience library
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
deplibs="$dir/$old_library $deplibs"
- elif test "$linkmode,$pass" = "prog,link"; then
+ elif test prog,link = "$linkmode,$pass"; then
compile_deplibs="$dir/$old_library $compile_deplibs"
finalize_deplibs="$dir/$old_library $finalize_deplibs"
else
@@ -5852,14 +5851,14 @@ func_mode_link ()
fi
- if test "$linkmode" = prog && test "$pass" != link; then
+ if test prog = "$linkmode" && test link != "$pass"; then
func_append newlib_search_path " $ladir"
deplibs="$lib $deplibs"
- linkalldeplibs=no
- if test "$link_all_deplibs" != no || test -z "$library_names" ||
- test "$build_libtool_libs" = no; then
- linkalldeplibs=yes
+ linkalldeplibs=false
+ if test no != "$link_all_deplibs" || test -z "$library_names" ||
+ test no = "$build_libtool_libs"; then
+ linkalldeplibs=:
fi
tmp_libs=
@@ -5871,7 +5870,7 @@ func_mode_link ()
;;
esac
# Need to link against all dependency_libs?
- if test "$linkalldeplibs" = yes; then
+ if $linkalldeplibs; then
deplibs="$deplib $deplibs"
else
# Need to hardcode shared library paths
@@ -5888,15 +5887,15 @@ func_mode_link ()
continue
fi # $linkmode = prog...
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
if test -n "$library_names" &&
- { { test "$prefer_static_libs" = no ||
- test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ { { test no = "$prefer_static_libs" ||
+ test built,yes = "$prefer_static_libs,$installed"; } ||
test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
- case "$temp_rpath:" in
+ case $temp_rpath: in
*"$absdir:"*) ;;
*) func_append temp_rpath "$absdir:" ;;
esac
@@ -5925,9 +5924,9 @@ func_mode_link ()
esac
fi # $linkmode,$pass = prog,link...
- if test "$alldeplibs" = yes &&
- { test "$deplibs_check_method" = pass_all ||
- { test "$build_libtool_libs" = yes &&
+ if $alldeplibs &&
+ { test pass_all = "$deplibs_check_method" ||
+ { test yes = "$build_libtool_libs" &&
test -n "$library_names"; }; }; then
# We only need to search for static libraries
continue
@@ -5936,11 +5935,11 @@ func_mode_link ()
link_static=no # Whether the deplib will be linked statically
use_static_libs=$prefer_static_libs
- if test "$use_static_libs" = built && test "$installed" = yes; then
+ if test built = "$use_static_libs" && test yes = "$installed"; then
use_static_libs=no
fi
if test -n "$library_names" &&
- { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ { test no = "$use_static_libs" || test -z "$old_library"; }; then
case $host in
*cygwin* | *mingw* | *cegcc*)
# No point in relinking DLLs because paths are not encoded
@@ -5948,7 +5947,7 @@ func_mode_link ()
need_relink=no
;;
*)
- if test "$installed" = no; then
+ if test no = "$installed"; then
func_append notinst_deplibs " $lib"
need_relink=yes
fi
@@ -5958,24 +5957,24 @@ func_mode_link ()
# Warn about portability, can't link against -module's on some
# systems (darwin). Don't bleat about dlopened modules though!
- dlopenmodule=""
+ dlopenmodule=
for dlpremoduletest in $dlprefiles; do
if test "X$dlpremoduletest" = "X$lib"; then
- dlopenmodule="$dlpremoduletest"
+ dlopenmodule=$dlpremoduletest
break
fi
done
- if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test
"$pass" = link; then
+ if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test
link = "$pass"; then
echo
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
$ECHO "*** Warning: Linking the executable $output against the
loadable module"
else
$ECHO "*** Warning: Linking the shared library $output against
the loadable module"
fi
$ECHO "*** $linklib is not portable!"
fi
- if test "$linkmode" = lib &&
- test "$hardcode_into_libs" = yes; then
+ if test lib = "$linkmode" &&
+ test yes = "$hardcode_into_libs"; then
# Hardcode the library path.
# Skip directories that are in the system default run-time
# search path.
@@ -6003,30 +6002,30 @@ func_mode_link ()
# figure out the soname
set dummy $library_names
shift
- realname="$1"
+ realname=$1
shift
libname=`eval "\\$ECHO \"$libname_spec\""`
# use dlname if we got it. it's perfectly good, no?
if test -n "$dlname"; then
- soname="$dlname"
+ soname=$dlname
elif test -n "$soname_spec"; then
# bleh windows
case $host in
*cygwin* | mingw* | *cegcc*)
func_arith $current - $age
major=$func_arith_result
- versuffix="-$major"
+ versuffix=-$major
;;
esac
eval soname=\"$soname_spec\"
else
- soname="$realname"
+ soname=$realname
fi
# Make a new name for the extract_expsyms_cmds to use
- soroot="$soname"
+ soroot=$soname
func_basename "$soroot"
- soname="$func_basename_result"
+ soname=$func_basename_result
func_stripname 'lib' '.dll' "$soname"
newlib=libimp-$func_stripname_result.a
@@ -6047,20 +6046,20 @@ func_mode_link ()
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
- if test "$linkmode" = prog || test "$opt_mode" != relink; then
+ if test prog = "$linkmode" || test relink != "$opt_mode"; then
add_shlibpath=
add_dir=
add=
lib_linked=yes
case $hardcode_action in
immediate | unsupported)
- if test "$hardcode_direct" = no; then
- add="$dir/$linklib"
+ if test no = "$hardcode_direct"; then
+ add=$dir/$linklib
case $host in
- *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
- *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+ *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+ *-*-sysv4*uw2*) add_dir=-L$dir ;;
*-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
- *-*-unixware7*) add_dir="-L$dir" ;;
+ *-*-unixware7*) add_dir=-L$dir ;;
*-*-darwin* )
# if the lib is a (non-dlopened) module then we cannot
# link against it, someone is ignoring the earlier warnings
@@ -6073,32 +6072,32 @@ func_mode_link ()
echo "*** And there doesn't seem to be a static
archive available"
echo "*** The link will probably fail, sorry"
else
- add="$dir/$old_library"
+ add=$dir/$old_library
fi
elif test -n "$old_library"; then
- add="$dir/$old_library"
+ add=$dir/$old_library
fi
fi
esac
- elif test "$hardcode_minus_L" = no; then
+ elif test no = "$hardcode_minus_L"; then
case $host in
- *-*-sunos*) add_shlibpath="$dir" ;;
+ *-*-sunos*) add_shlibpath=$dir ;;
esac
- add_dir="-L$dir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = no; then
- add_shlibpath="$dir"
- add="-l$name"
+ add_dir=-L$dir
+ add=-l$name
+ elif test no = "$hardcode_shlibpath_var"; then
+ add_shlibpath=$dir
+ add=-l$name
else
lib_linked=no
fi
;;
relink)
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
- add="$dir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$absdir"
+ if test yes = "$hardcode_direct" &&
+ test no = "$hardcode_direct_absolute"; then
+ add=$dir/$linklib
+ elif test yes = "$hardcode_minus_L"; then
+ add_dir=-L$absdir
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -6107,10 +6106,10 @@ func_mode_link ()
;;
esac
fi
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
- add_shlibpath="$dir"
- add="-l$name"
+ add=-l$name
+ elif test yes = "$hardcode_shlibpath_var"; then
+ add_shlibpath=$dir
+ add=-l$name
else
lib_linked=no
fi
@@ -6118,7 +6117,7 @@ func_mode_link ()
*) lib_linked=no ;;
esac
- if test "$lib_linked" != yes; then
+ if test yes != "$lib_linked"; then
func_fatal_configuration "unsupported hardcode properties"
fi
@@ -6128,15 +6127,15 @@ func_mode_link ()
*) func_append compile_shlibpath "$add_shlibpath:" ;;
esac
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
test -n "$add" && compile_deplibs="$add $compile_deplibs"
else
test -n "$add_dir" && deplibs="$add_dir $deplibs"
test -n "$add" && deplibs="$add $deplibs"
- if test "$hardcode_direct" != yes &&
- test "$hardcode_minus_L" != yes &&
- test "$hardcode_shlibpath_var" = yes; then
+ if test yes != "$hardcode_direct" &&
+ test yes != "$hardcode_minus_L" &&
+ test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
*) func_append finalize_shlibpath "$libdir:" ;;
@@ -6145,33 +6144,33 @@ func_mode_link ()
fi
fi
- if test "$linkmode" = prog || test "$opt_mode" = relink; then
+ if test prog = "$linkmode" || test relink = "$opt_mode"; then
add_shlibpath=
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
- add="$libdir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$libdir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
+ if test yes = "$hardcode_direct" &&
+ test no = "$hardcode_direct_absolute"; then
+ add=$libdir/$linklib
+ elif test yes = "$hardcode_minus_L"; then
+ add_dir=-L$libdir
+ add=-l$name
+ elif test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
*) func_append finalize_shlibpath "$libdir:" ;;
esac
- add="-l$name"
- elif test "$hardcode_automatic" = yes; then
+ add=-l$name
+ elif test yes = "$hardcode_automatic"; then
if test -n "$inst_prefix_dir" &&
test -f "$inst_prefix_dir$libdir/$linklib" ; then
- add="$inst_prefix_dir$libdir/$linklib"
+ add=$inst_prefix_dir$libdir/$linklib
else
- add="$libdir/$linklib"
+ add=$libdir/$linklib
fi
else
# We cannot seem to hardcode it, guess we'll fake it.
- add_dir="-L$libdir"
+ add_dir=-L$libdir
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -6180,10 +6179,10 @@ func_mode_link ()
;;
esac
fi
- add="-l$name"
+ add=-l$name
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
test -n "$add_dir" && finalize_deplibs="$add_dir
$finalize_deplibs"
test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
else
@@ -6191,21 +6190,21 @@ func_mode_link ()
test -n "$add" && deplibs="$add $deplibs"
fi
fi
- elif test "$linkmode" = prog; then
+ elif test prog = "$linkmode"; then
# Here we assume that one of hardcode_direct or hardcode_minus_L
# is not unsupported. This is valid on all known static and
# shared platforms.
- if test "$hardcode_direct" != unsupported; then
- test -n "$old_library" && linklib="$old_library"
+ if test unsupported != "$hardcode_direct"; then
+ test -n "$old_library" && linklib=$old_library
compile_deplibs="$dir/$linklib $compile_deplibs"
finalize_deplibs="$dir/$linklib $finalize_deplibs"
else
compile_deplibs="-l$name -L$dir $compile_deplibs"
finalize_deplibs="-l$name -L$dir $finalize_deplibs"
fi
- elif test "$build_libtool_libs" = yes; then
+ elif test yes = "$build_libtool_libs"; then
# Not a shared library
- if test "$deplibs_check_method" != pass_all; then
+ if test pass_all = "$deplibs_check_method"; then
# We're trying link a shared library against a static one
# but the system doesn't support it.
@@ -6216,7 +6215,7 @@ func_mode_link ()
echo "*** I have the capability to make that library automatically
link in when"
echo "*** you link to this library. But I can only do this if you
have a"
echo "*** shared version of the library, which you do not appear to
have."
- if test "$module" = yes; then
+ if test yes = "$module"; then
echo "*** But as you try to build a module library, libtool will
still create "
echo "*** a static module, that should work as long as the
dlopening application"
echo "*** is linked with the -dlopen flag to resolve symbols at
runtime."
@@ -6227,7 +6226,7 @@ func_mode_link ()
echo "*** not find such a program. So, this module is probably
useless."
echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi
- if test "$build_old_libs" = no; then
+ if test no = "$build_old_libs"; then
build_libtool_libs=module
build_old_libs=yes
else
@@ -6240,11 +6239,11 @@ func_mode_link ()
fi
fi # link shared/static library?
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
if test -n "$dependency_libs" &&
- { test "$hardcode_into_libs" != yes ||
- test "$build_old_libs" = yes ||
- test "$link_static" = yes; }; then
+ { test yes != "$hardcode_into_libs" ||
+ test yes = "$build_old_libs" ||
+ test yes = "$link_static"; }; then
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
@@ -6258,12 +6257,12 @@ func_mode_link ()
*) func_append temp_deplibs " $libdir";;
esac
done
- dependency_libs="$temp_deplibs"
+ dependency_libs=$temp_deplibs
fi
func_append newlib_search_path " $absdir"
# Link against this library
- test "$link_static" = no && newdependency_libs="$abs_ladir/$laname
$newdependency_libs"
+ test no = "$link_static" && newdependency_libs="$abs_ladir/$laname
$newdependency_libs"
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
@@ -6282,12 +6281,12 @@ func_mode_link ()
func_append tmp_libs " $func_resolve_sysroot_result"
done
- if test "$link_all_deplibs" != no; then
+ if test no != "$link_all_deplibs"; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
path=
case $deplib in
- -L*) path="$deplib" ;;
+ -L*) path=$deplib ;;
*.la)
func_resolve_sysroot "$deplib"
deplib=$func_resolve_sysroot_result
@@ -6295,12 +6294,12 @@ func_mode_link ()
dir=$func_dirname_result
# We need an absolute path.
case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
*)
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
func_warning "cannot determine absolute directory name of
\`$dir'"
- absdir="$dir"
+ absdir=$dir
fi
;;
esac
@@ -6308,35 +6307,35 @@ func_mode_link ()
case $host in
*-*-darwin*)
depdepl=
- eval deplibrary_names=`${SED} -n -e
's/^library_names=\(.*\)$/\1/p' $deplib`
+ eval deplibrary_names=`$SED -n -e
's/^library_names=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do
depdepl=$tmp
done
if test -f "$absdir/$objdir/$depdepl" ; then
- depdepl="$absdir/$objdir/$depdepl"
- darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR
== 2) {print $1;exit}}'`
+ depdepl=$absdir/$objdir/$depdepl
+ darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR ==
2) {print $1;exit}}'`
if test -z "$darwin_install_name"; then
- darwin_install_name=`${OTOOL64} -L $depdepl | awk
'{if (NR == 2) {print $1;exit}}'`
+ darwin_install_name=`$OTOOL64 -L $depdepl | awk
'{if (NR == 2) {print $1;exit}}'`
fi
- func_append compiler_flags " ${wl}-dylib_file
${wl}${darwin_install_name}:${depdepl}"
- func_append linker_flags " -dylib_file
${darwin_install_name}:${depdepl}"
+ func_append compiler_flags " $wl-dylib_file
$wl$darwin_install_name:$depdepl"
+ func_append linker_flags " -dylib_file
$darwin_install_name:$depdepl"
path=
fi
fi
;;
*)
- path="-L$absdir/$objdir"
+ path=-L$absdir/$objdir
;;
esac
else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
test "$absdir" != "$libdir" && \
func_warning "\`$deplib' seems to be moved"
- path="-L$absdir"
+ path=-L$absdir
fi
;;
esac
@@ -6348,23 +6347,23 @@ func_mode_link ()
fi # link_all_deplibs != no
fi # linkmode = lib
done # for deplib in $libs
- if test "$pass" = link; then
- if test "$linkmode" = "prog"; then
+ if test link = "$pass"; then
+ if test prog = "$linkmode"; then
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
compiler_flags="$compiler_flags "`$ECHO "
$new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework
\1%g'`
fi
fi
- dependency_libs="$newdependency_libs"
- if test "$pass" = dlpreopen; then
+ dependency_libs=$newdependency_libs
+ if test dlpreopen = "$pass"; then
# Link the dlpreopened libraries before other libraries
for deplib in $save_deplibs; do
deplibs="$deplib $deplibs"
done
fi
- if test "$pass" != dlopen; then
- if test "$pass" != conv; then
+ if test dlopen != "$pass"; then
+ test conv = "$pass" || {
# Make sure lib_search_path contains only unique directories.
lib_search_path=
for dir in $newlib_search_path; do
@@ -6374,12 +6373,12 @@ func_mode_link ()
esac
done
newlib_search_path=
- fi
+ }
- if test "$linkmode,$pass" != "prog,link"; then
- vars="deplibs"
- else
+ if test prog,link = "$linkmode,$pass"; then
vars="compile_deplibs finalize_deplibs"
+ else
+ vars=deplibs
fi
for var in $vars dependency_libs; do
# Add libraries to $var in reverse order
@@ -6443,7 +6442,7 @@ func_mode_link ()
for i in $dependency_libs ; do
case " $predeps $postdeps $compiler_lib_search_path " in
*" $i "*)
- i=""
+ i=
;;
esac
if test -n "$i" ; then
@@ -6452,16 +6451,16 @@ func_mode_link ()
done
dependency_libs=$tmp_libs
done # for pass
- if test "$linkmode" = prog; then
- dlfiles="$newdlfiles"
+ if test prog = "$linkmode"; then
+ dlfiles=$newdlfiles
fi
- if test "$linkmode" = prog || test "$linkmode" = lib; then
- dlprefiles="$newdlprefiles"
+ if test prog = "$linkmode" || test lib = "$linkmode"; then
+ dlprefiles=$newdlprefiles
fi
case $linkmode in
oldlib)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
func_warning "\`-dlopen' is ignored for archives"
fi
@@ -6487,7 +6486,7 @@ func_mode_link ()
# Now set the variables for building old libraries.
build_libtool_libs=no
- oldlibs="$output"
+ oldlibs=$output
func_append objs "$old_deplibs"
;;
@@ -6501,10 +6500,10 @@ func_mode_link ()
eval libname=\"$libname_spec\"
;;
*)
- test "$module" = no && \
- func_fatal_help "libtool library \`$output' must begin with \`lib'"
+ test yes = "$module" \
+ || func_fatal_help "libtool library \`$output' must begin with \`lib'"
- if test "$need_lib_prefix" != no; then
+ if test no != "$need_lib_prefix"; then
# Add the "lib" prefix for modules if required
func_stripname '' '.la' "$outputname"
name=$func_stripname_result
@@ -6518,7 +6517,7 @@ func_mode_link ()
esac
if test -n "$objs"; then
- if test "$deplibs_check_method" != pass_all; then
+ if test pass_all != "$deplibs_check_method"; then
func_fatal_error "cannot build libtool library \`$output' from
non-libtool objects on this host:$objs"
else
echo
@@ -6528,19 +6527,19 @@ func_mode_link ()
fi
fi
- test "$dlself" != no && \
- func_warning "\`-dlopen self' is ignored for libtool libraries"
+ test no = "$dlself" \
+ || func_warning "\`-dlopen self' is ignored for libtool libraries"
set dummy $rpath
shift
test "$#" -gt 1 && \
func_warning "ignoring multiple \`-rpath's for a libtool library"
- install_libdir="$1"
+ install_libdir=$1
oldlibs=
if test -z "$rpath"; then
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
# Building a libtool convenience library.
# Some compilers have problems with a `.al' extension so
# convenience libraries should have the same extension an
@@ -6558,10 +6557,10 @@ func_mode_link ()
else
# Parse the version information argument.
- save_ifs="$IFS"; IFS=':'
+ save_ifs=$IFS; IFS=:
set dummy $vinfo 0 0 0
shift
- IFS="$save_ifs"
+ IFS=$save_ifs
test -n "$7" && \
func_fatal_help "too many parameters to \`-version-info'"
@@ -6572,9 +6571,9 @@ func_mode_link ()
case $vinfo_number in
yes)
- number_major="$1"
- number_minor="$2"
- number_revision="$3"
+ number_major=$1
+ number_minor=$2
+ number_revision=$3
#
# There are really only two kinds -- those that
# use the current revision as the major version
@@ -6587,27 +6586,27 @@ func_mode_link ()
darwin|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
- age="$number_minor"
- revision="$number_revision"
+ age=$number_minor
+ revision=$number_revision
;;
freebsd-aout|freebsd-elf|qnx|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
+ current=$number_major
+ revision=$number_minor
+ age=0
;;
irix|nonstopux)
func_arith $number_major + $number_minor
current=$func_arith_result
- age="$number_minor"
- revision="$number_minor"
+ age=$number_minor
+ revision=$number_minor
lt_irix_increment=no
;;
esac
;;
no)
- current="$1"
- revision="$2"
- age="$3"
+ current=$1
+ revision=$2
+ age=$3
;;
esac
@@ -6653,26 +6652,26 @@ func_mode_link ()
# verstring for coding it into the library header
func_arith $current - $age
major=.$func_arith_result
- versuffix="$major.$age.$revision"
+ versuffix=$major.$age.$revision
# Darwin ld doesn't like 0 for these options...
func_arith $current + 1
minor_current=$func_arith_result
- xlcverstring="${wl}-compatibility_version ${wl}$minor_current
${wl}-current_version ${wl}$minor_current.$revision"
+ xlcverstring="$wl-compatibility_version $wl$minor_current
$wl-current_version $wl$minor_current.$revision"
verstring="-compatibility_version $minor_current -current_version
$minor_current.$revision"
;;
freebsd-aout)
- major=".$current"
- versuffix=".$current.$revision";
+ major=.$current
+ versuffix=.$current.$revision
;;
freebsd-elf)
- major=".$current"
- versuffix=".$current"
+ major=.$current
+ versuffix=.$current
;;
irix | nonstopux)
- if test "X$lt_irix_increment" = "Xno"; then
+ if test no = "$lt_irix_increment"; then
func_arith $current - $age
else
func_arith $current - $age + 1
@@ -6683,57 +6682,57 @@ func_mode_link ()
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
esac
- verstring="$verstring_prefix$major.$revision"
+ verstring=$verstring_prefix$major.$revision
# Add in all the interfaces that we are compatible with.
loop=$revision
- while test "$loop" -ne 0; do
+ while test 0 -ne "$loop"; do
func_arith $revision - $loop
iface=$func_arith_result
func_arith $loop - 1
loop=$func_arith_result
- verstring="$verstring_prefix$major.$iface:$verstring"
+ verstring=$verstring_prefix$major.$iface:$verstring
done
# Before this point, $major must not contain `.'.
major=.$major
- versuffix="$major.$revision"
+ versuffix=$major.$revision
;;
linux) # correct to gnu/linux during the next big refactor
func_arith $current - $age
major=.$func_arith_result
- versuffix="$major.$age.$revision"
+ versuffix=$major.$age.$revision
;;
osf)
func_arith $current - $age
major=.$func_arith_result
- versuffix=".$current.$age.$revision"
- verstring="$current.$age.$revision"
+ versuffix=.$current.$age.$revision
+ verstring=$current.$age.$revision
# Add in all the interfaces that we are compatible with.
loop=$age
- while test "$loop" -ne 0; do
+ while test 0 -ne "$loop"; do
func_arith $current - $loop
iface=$func_arith_result
func_arith $loop - 1
loop=$func_arith_result
- verstring="$verstring:${iface}.0"
+ verstring=$verstring:$iface.0
done
# Make executables depend on our current version.
- func_append verstring ":${current}.0"
+ func_append verstring ":$current.0"
;;
qnx)
- major=".$current"
- versuffix=".$current"
+ major=.$current
+ versuffix=.$current
;;
sunos)
- major=".$current"
- versuffix=".$current.$revision"
+ major=.$current
+ versuffix=.$current.$revision
;;
windows)
@@ -6741,7 +6740,7 @@ func_mode_link ()
# extension on DOS 8.3 file systems.
func_arith $current - $age
major=$func_arith_result
- versuffix="-$major"
+ versuffix=-$major
;;
*)
@@ -6759,42 +6758,42 @@ func_mode_link ()
verstring=
;;
*)
- verstring="0.0"
+ verstring=0.0
;;
esac
- if test "$need_version" = no; then
+ if test no = "$need_version"; then
versuffix=
else
- versuffix=".0.0"
+ versuffix=.0.0
fi
fi
# Remove version info from name if versioning should be avoided
- if test "$avoid_version" = yes && test "$need_version" = no; then
+ if test yes,no = "$avoid_version,$need_version"; then
major=
versuffix=
- verstring=""
+ verstring=
fi
# Check to see if the archive will have undefined symbols.
- if test "$allow_undefined" = yes; then
- if test "$allow_undefined_flag" = unsupported; then
+ if test yes = "$allow_undefined"; then
+ if test unsupported = "$allow_undefined_flag"; then
func_warning "undefined symbols not allowed in $host shared
libraries"
build_libtool_libs=no
build_old_libs=yes
fi
else
# Don't allow undefined symbols.
- allow_undefined_flag="$no_undefined_flag"
+ allow_undefined_flag=$no_undefined_flag
fi
fi
- func_generate_dlsyms "$libname" "$libname" "yes"
+ func_generate_dlsyms "$libname" "$libname" :
func_append libobjs " $symfileobj"
- test "X$libobjs" = "X " && libobjs=
+ test " " = "$libobjs" && libobjs=
- if test "$opt_mode" != relink; then
+ if test relink != "$opt_mode"; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
@@ -6803,8 +6802,8 @@ func_mode_link ()
case $p in
*.$objext | *.gcno)
;;
- $output_objdir/$outputname | $output_objdir/$libname.* |
$output_objdir/${libname}${release}.*)
- if test "X$precious_files_regex" != "X"; then
+ $output_objdir/$outputname | $output_objdir/$libname.* |
$output_objdir/$libname$release.*)
+ if test -n "$precious_files_regex"; then
if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null
2>&1
then
continue
@@ -6820,11 +6819,11 @@ func_mode_link ()
fi
# Now set the variables for building old libraries.
- if test "$build_old_libs" = yes && test "$build_libtool_libs" !=
convenience ; then
+ if test yes = "$build_old_libs" && test convenience !=
"$build_libtool_libs"; then
func_append oldlibs " $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d;
$lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d;
$lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
@@ -6845,13 +6844,13 @@ func_mode_link ()
*) func_append finalize_rpath " $libdir" ;;
esac
done
- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes;
then
+ if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs";
then
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
# Make sure dlfiles contains only unique files that won't be dlpreopened
- old_dlfiles="$dlfiles"
+ old_dlfiles=$dlfiles
dlfiles=
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
@@ -6861,7 +6860,7 @@ func_mode_link ()
done
# Make sure dlprefiles contains only unique files
- old_dlprefiles="$dlprefiles"
+ old_dlprefiles=$dlprefiles
dlprefiles=
for lib in $old_dlprefiles; do
case "$dlprefiles " in
@@ -6870,7 +6869,7 @@ func_mode_link ()
esac
done
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
if test -n "$rpath"; then
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* |
*-cegcc* | *-*-haiku*)
@@ -6894,7 +6893,7 @@ func_mode_link ()
;;
*)
# Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
+ if test yes = "$build_libtool_need_lc"; then
func_append deplibs " -lc"
fi
;;
@@ -6910,9 +6909,9 @@ func_mode_link ()
# I'm not sure if I'm treating the release correctly. I think
# release should show up in the -l (ie -lgmp5) so we don't want to
# add it in twice. Is that correct?
- release=""
- versuffix=""
- major=""
+ release=
+ versuffix=
+ major=
newdeplibs=
droppeddeps=no
case $deplibs_check_method in
@@ -6941,11 +6940,11 @@ EOF
-l*)
func_stripname -l '' "$i"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ;
then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $i "*)
func_append newdeplibs " $i"
- i=""
+ i=
;;
esac
fi
@@ -6984,11 +6983,11 @@ EOF
$opt_dry_run || $RM conftest
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes"
; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $i "*)
func_append newdeplibs " $i"
- i=""
+ i=
;;
esac
fi
@@ -7034,11 +7033,11 @@ EOF
-l*)
func_stripname -l '' "$a_deplib"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ;
then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $a_deplib "*)
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
;;
esac
fi
@@ -7049,9 +7048,9 @@ EOF
else
libnameglob=$libname
fi
- test "$want_nocaseglob" = yes && nocaseglob=`shopt -p
nocaseglob`
+ test yes = "$want_nocaseglob" && nocaseglob=`shopt -p
nocaseglob`
for i in $lib_search_path $sys_lib_search_path
$shlib_search_path; do
- if test "$want_nocaseglob" = yes; then
+ if test yes = "$want_nocaseglob"; then
shopt -s nocaseglob
potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
$nocaseglob
@@ -7069,19 +7068,19 @@ EOF
# We might still enter an endless loop, since a link
# loop can be closed while we follow links,
# but so what?
- potlib="$potent_lib"
+ potlib=$potent_lib
while test -h "$potlib" 2>/dev/null; do
- potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
case $potliblink in
- [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "$potlib" | $SED
's,[^/]*$,,'`"$potliblink";;
+ [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+ *) potlib=`$ECHO "$potlib" | $SED
's|[^/]*$||'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
$SED -e 10q |
$EGREP "$file_magic_regex" > /dev/null; then
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
break 2
fi
done
@@ -7118,11 +7117,11 @@ EOF
-l*)
func_stripname -l '' "$a_deplib"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ;
then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $a_deplib "*)
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
;;
esac
fi
@@ -7131,11 +7130,11 @@ EOF
for i in $lib_search_path $sys_lib_search_path
$shlib_search_path; do
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
- potlib="$potent_lib" # see symlink-check above in
file_magic test
+ potlib=$potent_lib # see symlink-check above in file_magic
test
if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
break 2
fi
done
@@ -7165,18 +7164,18 @@ EOF
done # Gone through all deplibs.
;;
none | unknown | *)
- newdeplibs=""
+ newdeplibs=
tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
for i in $predeps $postdeps ; do
# can't use Xsed below, because $i might contain '/'
- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
done
fi
case $tmp_deplibs in
*[!\ \ ]*)
echo
- if test "X$deplibs_check_method" = "Xnone"; then
+ if test none = "$deplibs_check_method"; then
echo "*** Warning: inter-library dependencies are not supported
in this platform."
else
echo "*** Warning: inter-library dependencies are not known to be
supported."
@@ -7200,8 +7199,8 @@ EOF
;;
esac
- if test "$droppeddeps" = yes; then
- if test "$module" = yes; then
+ if test yes = "$droppeddeps"; then
+ if test yes = "$module"; then
echo
echo "*** Warning: libtool could not satisfy all declared
inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool
will create"
@@ -7214,8 +7213,8 @@ EOF
echo "*** not find such a program. So, this module is probably
useless."
echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
+ if test no = "$build_old_libs"; then
+ oldlibs=$output_objdir/$libname.$libext
build_libtool_libs=module
build_old_libs=yes
else
@@ -7226,14 +7225,14 @@ EOF
echo "*** automatically added whenever a program is linked with
this library"
echo "*** or is declared to -dlopen it."
- if test "$allow_undefined" = no; then
+ if test no = "$allow_undefined"; then
echo
echo "*** Since this library must not contain undefined symbols,"
echo "*** because either the platform does not support them or"
echo "*** it was explicitly requested with -no-undefined,"
echo "*** libtool will only create a static version of it."
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
+ if test no = "$build_old_libs"; then
+ oldlibs=$output_objdir/$libname.$libext
build_libtool_libs=module
build_old_libs=yes
else
@@ -7279,7 +7278,7 @@ EOF
*) func_append new_libs " $deplib" ;;
esac
done
- deplibs="$new_libs"
+ deplibs=$new_libs
# All the library-specific variables (install_libdir is set above).
library_names=
@@ -7287,25 +7286,25 @@ EOF
dlname=
# Test again, we may have decided not to build it any more
- if test "$build_libtool_libs" = yes; then
- # Remove ${wl} instances when linking with ld.
+ if test yes = "$build_libtool_libs"; then
+ # Remove $wl instances when linking with ld.
# FIXME: should test the right _cmds variable.
case $archive_cmds in
*\$LD\ *) wl= ;;
esac
- if test "$hardcode_into_libs" = yes; then
+ if test yes = "$hardcode_into_libs"; then
# Hardcode the library paths
hardcode_libdirs=
dep_rpath=
- rpath="$finalize_rpath"
- test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+ rpath=$finalize_rpath
+ test relink = "$opt_mode" || rpath=$compile_rpath$rpath
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
func_replace_sysroot "$libdir"
libdir=$func_replace_sysroot_result
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case
$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -7330,7 +7329,7 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
fi
if test -n "$runpath_var" && test -n "$perm_rpath"; then
@@ -7344,8 +7343,8 @@ EOF
test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
fi
- shlibpath="$finalize_shlibpath"
- test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ shlibpath=$finalize_shlibpath
+ test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export
$shlibpath_var"
fi
@@ -7355,19 +7354,19 @@ EOF
eval library_names=\"$library_names_spec\"
set dummy $library_names
shift
- realname="$1"
+ realname=$1
shift
if test -n "$soname_spec"; then
eval soname=\"$soname_spec\"
else
- soname="$realname"
+ soname=$realname
fi
if test -z "$dlname"; then
dlname=$soname
fi
- lib="$output_objdir/$realname"
+ lib=$output_objdir/$realname
linknames=
for link
do
@@ -7381,7 +7380,7 @@ EOF
delfiles=
if test -n "$export_symbols" && test -n "$include_expsyms"; then
$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
- export_symbols="$output_objdir/$libname.uexp"
+ export_symbols=$output_objdir/$libname.uexp
func_append delfiles " $export_symbols"
fi
@@ -7390,14 +7389,14 @@ EOF
cygwin* | mingw* | cegcc*)
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
# exporting using user supplied symfile
- if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
# and it's NOT already a .def file. Must figure out
# which of the given symbols are data symbols and tag
# them as such. So, trigger use of export_symbols_cmds.
# export_symbols gets reassigned inside the "prepare
# the list of exported symbols" if statement, so the
# include_expsyms logic still works.
- orig_export_symbols="$export_symbols"
+ orig_export_symbols=$export_symbols
export_symbols=
always_export_symbols=yes
fi
@@ -7407,14 +7406,14 @@ EOF
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- if test "$always_export_symbols" = yes || test -n
"$export_symbols_regex"; then
+ if test yes = "$always_export_symbols" || test -n
"$export_symbols_regex"; then
func_verbose "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
+ export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd1 in $cmds; do
- IFS="$save_ifs"
+ IFS=$save_ifs
# Take the normal branch if the nm_file_list_spec branch
# doesn't work or if tool conversion is not needed.
case $nm_file_list_spec~$to_tool_file_cmd in
@@ -7428,7 +7427,7 @@ EOF
try_normal_branch=no
;;
esac
- if test "$try_normal_branch" = yes \
+ if test yes = "$try_normal_branch" \
&& { test "$len" -lt "$max_cmd_len" \
|| test "$max_cmd_len" -le -1; }
then
@@ -7439,7 +7438,7 @@ EOF
output_la=$func_basename_result
save_libobjs=$libobjs
save_output=$output
- output=${output_objdir}/${output_la}.nm
+ output=$output_objdir/$output_la.nm
func_to_tool_file "$output"
libobjs=$nm_file_list_spec$func_to_tool_file_result
func_append delfiles " $output"
@@ -7462,8 +7461,8 @@ EOF
break
fi
done
- IFS="$save_ifs"
- if test -n "$export_symbols_regex" && test "X$skipped_export" !=
"X:"; then
+ IFS=$save_ifs
+ if test -n "$export_symbols_regex" && : != "$skipped_export"; then
func_show_eval '$EGREP -e "$export_symbols_regex"
"$export_symbols" > "${export_symbols}T"'
func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
fi
@@ -7471,12 +7470,12 @@ EOF
fi
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- tmp_export_symbols="$export_symbols"
- test -n "$orig_export_symbols" &&
tmp_export_symbols="$orig_export_symbols"
+ tmp_export_symbols=$export_symbols
+ test -n "$orig_export_symbols" &&
tmp_export_symbols=$orig_export_symbols
$opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >>
"$tmp_export_symbols"'
fi
- if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols";
then
+ if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
# The given exports_symbols file has to be filtered, so filter it.
func_verbose "filter symbol list for \`$libname.la' to tag DATA
exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots of
@@ -7499,11 +7498,11 @@ EOF
;;
esac
done
- deplibs="$tmp_deplibs"
+ deplibs=$tmp_deplibs
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec" &&
- test "$compiler_needs_object" = yes &&
+ test yes = "$compiler_needs_object" &&
test -z "$libobjs"; then
# extract the archives, so we have objects to list.
# TODO: could optimize this to just extract one archive.
@@ -7514,7 +7513,7 @@ EOF
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
test "X$libobjs" = "X " && libobjs=
else
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $convenience
@@ -7523,18 +7522,18 @@ EOF
fi
fi
- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
func_append linker_flags " $flag"
fi
# Make a backup of the uninstalled library when relinking
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV
$realname ${realname}U)' || exit $?
fi
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
+ if test yes = "$module" && test -n "$module_cmds" ; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
eval test_cmds=\"$module_expsym_cmds\"
cmds=$module_expsym_cmds
@@ -7552,7 +7551,7 @@ EOF
fi
fi
- if test "X$skipped_export" != "X:" &&
+ if test : != "$skipped_export" &&
func_len " $test_cmds" &&
len=$func_len_result &&
test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
@@ -7585,8 +7584,8 @@ EOF
last_robj=
k=1
- if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test
"$with_gnu_ld" = yes; then
- output=${output_objdir}/${output_la}.lnkscript
+ if test -n "$save_libobjs" && test : != "$skipped_export" && test yes
= "$with_gnu_ld"; then
+ output=$output_objdir/$output_la.lnkscript
func_verbose "creating GNU ld script: $output"
echo 'INPUT (' > $output
for obj in $save_libobjs
@@ -7598,14 +7597,14 @@ EOF
func_append delfiles " $output"
func_to_tool_file "$output"
output=$func_to_tool_file_result
- elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" &&
test "X$file_list_spec" != X; then
- output=${output_objdir}/${output_la}.lnk
+ elif test -n "$save_libobjs" && test : != "$skipped_export" && test
-n "$file_list_spec"; then
+ output=$output_objdir/$output_la.lnk
func_verbose "creating linker input file list: $output"
: > $output
set x $save_libobjs
shift
firstobj=
- if test "$compiler_needs_object" = yes; then
+ if test yes = "$compiler_needs_object"; then
firstobj="$1 "
shift
fi
@@ -7620,7 +7619,7 @@ EOF
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
- output=$output_objdir/$output_la-${k}.$objext
+ output=$output_objdir/$output_la-$k.$objext
eval test_cmds=\"$reload_cmds\"
func_len " $test_cmds"
len0=$func_len_result
@@ -7632,13 +7631,13 @@ EOF
func_len " $obj"
func_arith $len + $func_len_result
len=$func_arith_result
- if test "X$objlist" = X ||
+ if test -z "$objlist" ||
test "$len" -lt "$max_cmd_len"; then
func_append objlist " $obj"
else
# The command $test_cmds is almost too long, add a
# command to the queue.
- if test "$k" -eq 1 ; then
+ if test 1 -eq "$k"; then
# The first file doesn't have a previous command to add.
reload_objs=$objlist
eval concat_cmds=\"$reload_cmds\"
@@ -7648,10 +7647,10 @@ EOF
reload_objs="$objlist $last_robj"
eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM
$last_robj\"
fi
- last_robj=$output_objdir/$output_la-${k}.$objext
+ last_robj=$output_objdir/$output_la-$k.$objext
func_arith $k + 1
k=$func_arith_result
- output=$output_objdir/$output_la-${k}.$objext
+ output=$output_objdir/$output_la-$k.$objext
objlist=" $obj"
func_len " $last_robj"
func_arith $len0 + $func_len_result
@@ -7663,9 +7662,9 @@ EOF
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
reload_objs="$objlist $last_robj"
- eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+ eval concat_cmds=\"\$concat_cmds$reload_cmds\"
if test -n "$last_robj"; then
- eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
func_append delfiles " $output"
@@ -7673,9 +7672,9 @@ EOF
output=
fi
- if ${skipped_export-false}; then
+ ${skipped_export-false} && {
func_verbose "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
+ export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
libobjs=$output
# Append the command to create the export file.
@@ -7684,15 +7683,15 @@ EOF
if test -n "$last_robj"; then
eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
- fi
+ }
test -n "$save_libobjs" &&
func_verbose "creating a temporary reloadable object file:
$output"
# Loop through the commands generated above and execute them.
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd in $concat_cmds; do
- IFS="$save_ifs"
+ IFS=$save_ifs
$opt_silent || {
func_quote_for_expand "$cmd"
eval "func_echo $func_quote_for_expand_result"
@@ -7701,7 +7700,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -7710,7 +7709,7 @@ EOF
exit $lt_exit
}
done
- IFS="$save_ifs"
+ IFS=$save_ifs
if test -n "$export_symbols_regex" && ${skipped_export-false}; then
func_show_eval '$EGREP -e "$export_symbols_regex"
"$export_symbols" > "${export_symbols}T"'
@@ -7718,10 +7717,10 @@ EOF
fi
fi
- if ${skipped_export-false}; then
+ ${skipped_export-false} && {
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- tmp_export_symbols="$export_symbols"
- test -n "$orig_export_symbols" &&
tmp_export_symbols="$orig_export_symbols"
+ tmp_export_symbols=$export_symbols
+ test -n "$orig_export_symbols" &&
tmp_export_symbols=$orig_export_symbols
$opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >>
"$tmp_export_symbols"'
fi
@@ -7738,7 +7737,7 @@ EOF
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter <
$orig_export_symbols > $export_symbols
fi
- fi
+ }
libobjs=$output
# Restore the value of output.
@@ -7752,7 +7751,7 @@ EOF
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
+ if test yes = "$module" && test -n "$module_cmds" ; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
cmds=$module_expsym_cmds
else
@@ -7774,7 +7773,7 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
@@ -7782,9 +7781,9 @@ EOF
test "X$libobjs" = "X " && libobjs=
fi
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd in $cmds; do
- IFS="$save_ifs"
+ IFS=$save_ifs
eval cmd=\"$cmd\"
$opt_silent || {
func_quote_for_expand "$cmd"
@@ -7794,7 +7793,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -7803,10 +7802,10 @@ EOF
exit $lt_exit
}
done
- IFS="$save_ifs"
+ IFS=$save_ifs
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV
$realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
@@ -7826,15 +7825,15 @@ EOF
done
# If -module or -export-dynamic was specified, set the dlname.
- if test "$module" = yes || test "$export_dynamic" = yes; then
+ if test yes = "$module" || test yes = "$export_dynamic"; then
# On all known operating systems, these are identical.
- dlname="$soname"
+ dlname=$soname
fi
fi
;;
obj)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
func_warning "\`-dlopen' is ignored for objects"
fi
@@ -7866,7 +7865,7 @@ EOF
;;
*)
libobj=
- obj="$output"
+ obj=$output
;;
esac
@@ -7889,7 +7888,7 @@ EOF
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" |
$SED 's|,| |g'`
else
- gentop="$output_objdir/${obj}x"
+ gentop=$output_objdir/${obj}x
func_append generated " $gentop"
func_extract_archives $gentop $convenience
@@ -7898,12 +7897,12 @@ EOF
fi
# If we're not building shared, we need to use non_pic_objs
- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+ test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED
"/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ###
testsuite: skip nested quoting test
+ reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED
"/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
- output="$obj"
+ output=$obj
func_execute_cmds "$reload_cmds" 'exit $?'
# Exit if we aren't doing a library object file.
@@ -7915,7 +7914,7 @@ EOF
exit $EXIT_SUCCESS
fi
- if test "$build_libtool_libs" != yes; then
+ test yes = "$build_libtool_libs" || {
if test -n "$gentop"; then
func_show_eval '${RM}r "$gentop"'
fi
@@ -7925,12 +7924,12 @@ EOF
# $show "echo timestamp > $libobj"
# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
exit $EXIT_SUCCESS
- fi
+ }
- if test -n "$pic_flag" || test "$pic_mode" != default; then
+ if test -n "$pic_flag" || test default != "$pic_mode"; then
# Only do commands if we really have different PIC objects.
reload_objs="$libobjs $reload_conv_objs"
- output="$libobj"
+ output=$libobj
func_execute_cmds "$reload_cmds" 'exit $?'
fi
@@ -7952,11 +7951,9 @@ EOF
test -n "$release" && \
func_warning "\`-release' is ignored for programs"
- test "$preload" = yes \
- && test "$dlopen_support" = unknown \
- && test "$dlopen_self" = unknown \
- && test "$dlopen_self_static" = unknown && \
- func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen
support."
+ $preload \
+ && test unknown,unknown,unknown =
"$dlopen_support,$dlopen_self,$dlopen_self_static" \
+ && func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen
support."
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
@@ -7970,11 +7967,11 @@ EOF
*-*-darwin*)
# Don't allow lazy linking, it breaks C++ global constructors
# But is supposedly fixed on 10.4 or later (yay!).
- if test "$tagname" = CXX ; then
+ if test CXX = "$tagname"; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
- func_append compile_command " ${wl}-bind_at_load"
- func_append finalize_command " ${wl}-bind_at_load"
+ func_append compile_command " $wl-bind_at_load"
+ func_append finalize_command " $wl-bind_at_load"
;;
esac
fi
@@ -8010,7 +8007,7 @@ EOF
*) func_append new_libs " $deplib" ;;
esac
done
- compile_deplibs="$new_libs"
+ compile_deplibs=$new_libs
func_append compile_command " $compile_deplibs"
@@ -8034,7 +8031,7 @@ EOF
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case
$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8057,7 +8054,7 @@ EOF
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+ testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
@@ -8074,10 +8071,10 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- compile_rpath="$rpath"
+ compile_rpath=$rpath
rpath=
hardcode_libdirs=
@@ -8085,7 +8082,7 @@ EOF
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case
$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8110,45 +8107,43 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- finalize_rpath="$rpath"
+ finalize_rpath=$rpath
- if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ if test -n "$libobjs" && test yes = "$build_old_libs"; then
# Transform all the library objects into standard objects.
compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" |
$NL2SP`
finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" |
$NL2SP`
fi
- func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+ func_generate_dlsyms "$outputname" "@PROGRAM@" false
# template prelinking step
if test -n "$prelink_cmds"; then
func_execute_cmds "$prelink_cmds" 'exit $?'
fi
- wrappers_required=yes
+ wrappers_required=:
case $host in
*cegcc* | *mingw32ce*)
# Disable wrappers for cegcc and mingw32ce hosts, we are cross
compiling anyway.
- wrappers_required=no
+ wrappers_required=false
;;
*cygwin* | *mingw* )
- if test "$build_libtool_libs" != yes; then
- wrappers_required=no
- fi
+ test yes = "$build_libtool_libs" || wrappers_required=false
;;
*)
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- wrappers_required=no
+ if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+ wrappers_required=false
fi
;;
esac
- if test "$wrappers_required" = no; then
+ $wrappers_required || {
# Replace the output file specification.
compile_command=`$ECHO "$compile_command" | $SED
'address@hidden@%'"$output"'%g'`
- link_command="$compile_command$compile_rpath"
+ link_command=$compile_command$compile_rpath
# We have no uninstalled library dependencies, so finalize right now.
exit_status=0
@@ -8161,12 +8156,12 @@ EOF
fi
# Delete the generated files.
- if test -f "$output_objdir/${outputname}S.${objext}"; then
- func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+ if test -f "$output_objdir/${outputname}S.$objext"; then
+ func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
fi
exit $exit_status
- fi
+ }
if test -n "$compile_shlibpath$finalize_shlibpath"; then
compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\"
$compile_command"
@@ -8196,9 +8191,9 @@ EOF
fi
fi
- if test "$no_install" = yes; then
+ if test yes = "$no_install"; then
# We don't need to create a wrapper script.
- link_command="$compile_var$compile_command$compile_rpath"
+ link_command=$compile_var$compile_command$compile_rpath
# Replace the output file specification.
link_command=`$ECHO "$link_command" | $SED
'address@hidden@%'"$output"'%g'`
# Delete the old output file.
@@ -8215,27 +8210,28 @@ EOF
exit $EXIT_SUCCESS
fi
- if test "$hardcode_action" = relink; then
- # Fast installation is not supported
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
+ case $hardcode_action,$fast_install in
+ relink,*)
+ # Fast installation is not supported
+ link_command=$compile_var$compile_command$compile_rpath
+ relink_command=$finalize_var$finalize_command$finalize_rpath
- func_warning "this platform does not like uninstalled shared libraries"
- func_warning "\`$output' will be relinked during installation"
- else
- if test "$fast_install" != no; then
- link_command="$finalize_var$compile_command$finalize_rpath"
- if test "$fast_install" = yes; then
- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath"
| $SED 'address@hidden@%\$progdir/\$file%g'`
- else
- # fast_install is set to needless
- relink_command=
- fi
- else
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
- fi
- fi
+ func_warning "this platform does not like uninstalled shared
libraries"
+ func_warning "\`$output' will be relinked during installation"
+ ;;
+ *,yes)
+ link_command=$finalize_var$compile_command$finalize_rpath
+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" |
$SED 'address@hidden@%\$progdir/\$file%g'`
+ ;;
+ *,no)
+ link_command=$compile_var$compile_command$compile_rpath
+ relink_command=$finalize_var$finalize_command$finalize_rpath
+ ;;
+ *,needless)
+ link_command=$finalize_var$compile_command$finalize_rpath
+ relink_command=
+ ;;
+ esac
# Replace the output file specification.
link_command=`$ECHO "$link_command" | $SED
'address@hidden@%'"$output_objdir/$outputname"'%g'`
@@ -8292,8 +8288,8 @@ EOF
func_dirname_and_basename "$output" "" "."
output_name=$func_basename_result
output_path=$func_dirname_result
- cwrappersource="$output_path/$objdir/lt-$output_name.c"
- cwrapper="$output_path/$output_name.exe"
+ cwrappersource=$output_path/$objdir/lt-$output_name.c
+ cwrapper=$output_path/$output_name.exe
$RM $cwrappersource $cwrapper
trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
@@ -8337,25 +8333,27 @@ EOF
# See if we need to build an old-fashioned archive.
for oldlib in $oldlibs; do
- if test "$build_libtool_libs" = convenience; then
- oldobjs="$libobjs_save $symfileobj"
- addlibs="$convenience"
- build_libtool_libs=no
- else
- if test "$build_libtool_libs" = module; then
- oldobjs="$libobjs_save"
+ case $build_libtool_libs in
+ convenience)
+ oldobjs="$libobjs_save $symfileobj"
+ addlibs=$convenience
build_libtool_libs=no
- else
+ ;;
+ module)
+ oldobjs=$libobjs_save
+ addlibs=$old_convenience
+ build_libtool_libs=no
+ ;;
+ *)
oldobjs="$old_deplibs $non_pic_objects"
- if test "$preload" = yes && test -f "$symfileobj"; then
- func_append oldobjs " $symfileobj"
- fi
- fi
- addlibs="$old_convenience"
- fi
+ $preload && test -f "$symfileobj" \
+ && func_append oldobjs " $symfileobj"
+ addlibs=$old_convenience
+ ;;
+ esac
if test -n "$addlibs"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $addlibs
@@ -8363,13 +8361,13 @@ EOF
fi
# Do each command in the archive commands.
- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" =
yes; then
+ if test -n "$old_archive_from_new_cmds" && test yes =
"$build_libtool_libs"; then
cmds=$old_archive_from_new_cmds
else
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
@@ -8390,7 +8388,7 @@ EOF
:
else
echo "copying selected object files to avoid basename conflicts..."
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
@@ -8399,7 +8397,7 @@ EOF
for obj in $save_oldobjs
do
func_basename "$obj"
- objbase="$func_basename_result"
+ objbase=$func_basename_result
case " $oldobjs " in
" ") oldobjs=$obj ;;
*[\ /]"$objbase "*)
@@ -8472,14 +8470,14 @@ EOF
RANLIB=$save_RANLIB
fi
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
objlist=
len=$len0
fi
done
RANLIB=$save_RANLIB
oldobjs=$objlist
- if test "X$oldobjs" = "X" ; then
+ if test -z "$oldobjs"; then
eval cmds=\"\$concat_cmds\"
else
eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
@@ -8496,7 +8494,7 @@ EOF
case $output in
*.la)
old_library=
- test "$build_old_libs" = yes && old_library="$libname.$libext"
+ test yes = "$build_old_libs" && old_library=$libname.$libext
func_verbose "creating $output"
# Preserve any variables that may affect compiler behavior
@@ -8513,27 +8511,27 @@ EOF
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink
$libtool_args @inst_prefix_dir@)"
relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
- if test "$hardcode_automatic" = yes ; then
+ if test yes = "$hardcode_automatic"; then
relink_command=
fi
# Only create the output if not a dry run.
$opt_dry_run || {
for installed in no yes; do
- if test "$installed" = yes; then
+ if test yes = "$installed"; then
if test -z "$install_libdir"; then
break
fi
- output="$output_objdir/$outputname"i
+ output=$output_objdir/${outputname}i
# Replace all uninstalled libtool libraries with the installed ones
newdependency_libs=
for deplib in $dependency_libs; do
case $deplib in
*.la)
func_basename "$deplib"
- name="$func_basename_result"
+ name=$func_basename_result
func_resolve_sysroot "$deplib"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p'
$func_resolve_sysroot_result`
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p'
$func_resolve_sysroot_result`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
@@ -8551,15 +8549,15 @@ EOF
*) func_append newdependency_libs " $deplib" ;;
esac
done
- dependency_libs="$newdependency_libs"
+ dependency_libs=$newdependency_libs
newdlfiles=
for lib in $dlfiles; do
case $lib in
*.la)
func_basename "$lib"
- name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ name=$func_basename_result
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
@@ -8567,7 +8565,7 @@ EOF
*) func_append newdlfiles " $lib" ;;
esac
done
- dlfiles="$newdlfiles"
+ dlfiles=$newdlfiles
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
@@ -8577,34 +8575,34 @@ EOF
# didn't already link the preopened objects directly into
# the library:
func_basename "$lib"
- name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ name=$func_basename_result
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
;;
esac
done
- dlprefiles="$newdlprefiles"
+ dlprefiles=$newdlprefiles
else
newdlfiles=
for lib in $dlfiles; do
case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
*) abs=`pwd`"/$lib" ;;
esac
func_append newdlfiles " $abs"
done
- dlfiles="$newdlfiles"
+ dlfiles=$newdlfiles
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
*) abs=`pwd`"/$lib" ;;
esac
func_append newdlprefiles " $abs"
done
- dlprefiles="$newdlprefiles"
+ dlprefiles=$newdlprefiles
fi
$RM $output
# place dlname in correct position for cygwin
@@ -8620,8 +8618,7 @@ EOF
case $host,$output,$installed,$module,$dlname in
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll |
*cegcc*,*lai,yes,no,*.dll)
# If a -bindir argument was supplied, place the dll there.
- if test "x$bindir" != x ;
- then
+ if test -n "$bindir"; then
func_relative_path "$install_libdir" "$bindir"
tdlname=$func_relative_path_result/$dlname
else
@@ -8672,7 +8669,7 @@ dlpreopen='$dlprefiles'
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
- if test "$installed" = no && test "$need_relink" = yes; then
+ if test no,yes = "$installed,$need_relink"; then
$ECHO >> $output "\
relink_command=\"$relink_command\""
fi
@@ -8687,8 +8684,9 @@ relink_command=\"$relink_command\""
exit $EXIT_SUCCESS
}
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
- func_mode_link ${1+"$@"}
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+ func_mode_link ${1+"$@"}
+fi
# func_mode_uninstall arg...
@@ -8696,19 +8694,19 @@ func_mode_uninstall ()
{
$debug_cmd
- RM="$nonopt"
+ RM=$nonopt
files=
- rmforce=
+ rmforce=false
exit_status=0
# This variable tells wrapper scripts just to set variables rather
# than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
for arg
do
case $arg in
- -f) func_append RM " $arg"; rmforce=yes ;;
+ -f) func_append RM " $arg"; rmforce=: ;;
-*) func_append RM " $arg" ;;
*) func_append files " $arg" ;;
esac
@@ -8721,18 +8719,18 @@ func_mode_uninstall ()
for file in $files; do
func_dirname "$file" "" "."
- dir="$func_dirname_result"
- if test "X$dir" = X.; then
- odir="$objdir"
+ dir=$func_dirname_result
+ if test . = "$dir"; then
+ odir=$objdir
else
- odir="$dir/$objdir"
+ odir=$dir/$objdir
fi
func_basename "$file"
- name="$func_basename_result"
- test "$opt_mode" = uninstall && odir="$dir"
+ name=$func_basename_result
+ test uninstall = "$opt_mode" && odir=$dir
# Remember odir for removal later, being careful to avoid duplicates
- if test "$opt_mode" = clean; then
+ if test clean = "$opt_mode"; then
case " $rmdirs " in
*" $odir "*) ;;
*) func_append rmdirs " $odir" ;;
@@ -8747,11 +8745,11 @@ func_mode_uninstall ()
elif test -d "$file"; then
exit_status=1
continue
- elif test "$rmforce" = yes; then
+ elif $rmforce; then
continue
fi
- rmfiles="$file"
+ rmfiles=$file
case $name in
*.la)
@@ -8765,7 +8763,7 @@ func_mode_uninstall ()
done
test -n "$old_library" && func_append rmfiles " $odir/$old_library"
- case "$opt_mode" in
+ case $opt_mode in
clean)
case " $library_names " in
*" $dlname "*) ;;
@@ -8776,12 +8774,12 @@ func_mode_uninstall ()
uninstall)
if test -n "$library_names"; then
# Do each command in the postuninstall commands.
- func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes ||
exit_status=1'
+ func_execute_cmds "$postuninstall_cmds" '$rmforce ||
exit_status=1'
fi
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
- func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" =
yes || exit_status=1'
+ func_execute_cmds "$old_postuninstall_cmds" '$rmforce ||
exit_status=1'
fi
# FIXME: should reinstall the best remaining shared library.
;;
@@ -8797,21 +8795,19 @@ func_mode_uninstall ()
func_source $dir/$name
# Add PIC object to the list of files to remove.
- if test -n "$pic_object" &&
- test "$pic_object" != none; then
+ if test -n "$pic_object" && test none != "$pic_object"; then
func_append rmfiles " $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
- if test -n "$non_pic_object" &&
- test "$non_pic_object" != none; then
+ if test -n "$non_pic_object" && test none != "$non_pic_object"; then
func_append rmfiles " $dir/$non_pic_object"
fi
fi
;;
*)
- if test "$opt_mode" = clean ; then
+ if test clean = "$opt_mode"; then
noexename=$name
case $file in
*.exe)
@@ -8838,12 +8834,12 @@ func_mode_uninstall ()
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
- func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
- if test "$fast_install" = yes && test -n "$relink_command"; then
+ func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+ if test yes = "$fast_install" && test -n "$relink_command"; then
func_append rmfiles " $odir/lt-$name"
fi
if test "X$noexename" != "X$name" ; then
- func_append rmfiles " $odir/lt-${noexename}.c"
+ func_append rmfiles " $odir/lt-$noexename.c"
fi
fi
fi
@@ -8852,7 +8848,7 @@ func_mode_uninstall ()
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
- # Try to remove the ${objdir}s in the directories where we deleted files
+ # Try to remove the $objdir's in the directories where we deleted files
for dir in $rmdirs; do
if test -d "$dir"; then
func_show_eval "rmdir $dir >/dev/null 2>&1"
@@ -8862,11 +8858,12 @@ func_mode_uninstall ()
exit $exit_status
}
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
- func_mode_uninstall ${1+"$@"}
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+ func_mode_uninstall ${1+"$@"}
+fi
test -z "$opt_mode" && {
- help="$generic_help"
+ help=$generic_help
func_fatal_help "you must specify a MODE"
}
diff --git a/build-aux/options-parser b/build-aux/options-parser
index 7a3cf6d..5d5d8ed 100644
--- a/build-aux/options-parser
+++ b/build-aux/options-parser
@@ -1,7 +1,7 @@
#! /bin/sh
# Set a version string for this script.
-scriptversion=2011-11-16.05; # UTC
+scriptversion=2011-11-20.12; # UTC
# A pluggable option parser for Bourne shell.
# Written by Gary V. Vaughan, 2010
@@ -131,7 +131,7 @@ usage_message="\
"
# Additional text appended to `usage_message' in response to `--help'.
-long_help_message=""
+long_help_message=
# Help message printed before fatal option parsing errors.
fatal_help='Try \`$progname --help'\'' for more information.'
@@ -164,11 +164,11 @@ EXIT_SKIP=77 # $? = 77 is used to indicate a skipped
test to automake.
# putting `$debug_cmd' at the start of all your functions, you can get
# bash to show function call trace with:
# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash bootstrap
-debug_cmd="${debug_cmd-:}"
+debug_cmd=${debug_cmd-":"}
exit_cmd=:
-dirname="$SED -e "'s|/[^/]*$||'
-basename="$SED -e "'s|^.*/||'
+dirname='s|/[^/]*$||'
+basename='s|^.*/||'
nl='
'
@@ -178,10 +178,10 @@ nl='
# the _XPG environment variable is not equal to 1 (one), the special
# positional parameter $0, within a function call, is the name of the
# function.
-progpath="$0"
+progpath=$0
# The name of this program.
-progname=`echo "$progpath" |$basename`
+progname=`echo "$progpath" |$SED "$basename"`
## ------------------------- ##
@@ -272,7 +272,7 @@ func_run_hooks ()
*) func_fatal_error "\`$1' does not support hook funcions.n" ;;
esac
- eval _G_hook_fns="\$$1_hooks"; shift
+ eval _G_hook_fns=\$$1_hooks; shift
for _G_hook in $_G_hook_fns; do
eval $_G_hook '"$@"'
@@ -303,7 +303,7 @@ func_run_hooks ()
# $debug_cmd
#
# # Extend the existing usage message.
-# usage_message="$usage_message"'
+# usage_message=$usage_message'
# -s, --silent don'\''t print informational messages
# '
#
@@ -376,7 +376,7 @@ func_options ()
${func_validate_options_result+"$func_validate_options_result"}
# save modified positional parameters for caller
- func_options_result="$func_run_hooks_result"
+ func_options_result=$func_run_hooks_result
}
@@ -555,13 +555,13 @@ func_error ()
$require_term_colors
_G_message=$*
- _G_prefix="$progname: ${tc_standout}${tc_red}error${tc_reset}: "
+ _G_prefix="$progname: $tc_standout${tc_red}error$tc_reset: "
save_IFS=$IFS
IFS=$nl
for _G_line in $_G_message; do
IFS=$save_IFS
- echo "$_G_prefix${tc_bold}$_G_line${tc_reset}" 1>&2
+ echo "$_G_prefix$tc_bold$_G_line$tc_reset" 1>&2
_G_prefix="$progname: "
done
IFS=$save_IFS
@@ -638,7 +638,7 @@ func_quote_for_eval ()
*[\\\`\"\$]*)
_G_unquoted_arg=`printf '%s\n' "$1" |$SED "$_G_sed_quote_subst"` ;;
*)
- _G_unquoted_arg="$1" ;;
+ _G_unquoted_arg=$1 ;;
esac
case $_G_unquoted_arg in
@@ -648,10 +648,10 @@ func_quote_for_eval ()
# Many Bourne shells cannot handle close brackets correctly
# in scan sets, so we specify it separately.
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- _G_quoted_arg="\"$_G_unquoted_arg\""
+ _G_quoted_arg=\"$_G_unquoted_arg\"
;;
*)
- _G_quoted_arg="$_G_unquoted_arg" ;;
+ _G_quoted_arg=$_G_unquoted_arg ;;
esac
test -n "$func_quote_for_eval_result" \
&& func_append func_quote_for_eval_result " "
@@ -675,7 +675,7 @@ then
func_split_equals_lhs=${1%%=*}
func_split_equals_rhs=${1#*=}
test "x$func_split_equals_lhs" = "x$1" \
- && func_split_equals_rhs=""
+ && func_split_equals_rhs=
}'
else
# ...otherwise fall back to using expr, which is often a shell builtin.
@@ -684,7 +684,7 @@ else
$debug_cmd
func_split_equals_lhs=`expr "x$1" : 'x\([^=]*)'`
- func_split_equals_rhs=""
+ func_split_equals_rhs=
test "x$func_split_equals_lhs" = "x$1" \
|| func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
}
diff --git a/cfg.mk b/cfg.mk
index 6a1748c..dc89660 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -55,11 +55,182 @@ local-checks-to-skip = \
# trailing_blank: flags valid rfc3676 separators
# unmarked_diagnostics: libtool isn't internationalized
+
+# Check for correct usage of $cc_basename in libtool.m4.
+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 \`*'." \
+ $(_sc_say_and_exit) } || :
+
+# 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' \
+ $(_sc_say_and_exit) } || :; \
+ else :; \
+ fi || :
+
+# Use a consistent dirname and basename idiom.
+sc_prohibit_bare_basename:
+ @prohibit='\|[ ]*\$$(base|dir)name' \
+ 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...'
\
+ $(_sc_search_regexp)
+
+# 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 ['" \
+ $(_sc_search_regexp)
+
+# Check for quotes within backquotes within quotes "`"bar"`"
+exclude_file_name_regexp--sc_prohibit_nested_quotes = ^cfg.mk$$
+sc_prohibit_nested_quotes:
+ @prohibit='"[^`"]*`[^"`]*"[^"`]*".*`[^`"]*"' \
+ halt='found nested double quotes' \
+ $(_sc_search_regexp_or_exclude)
+
+# Commas in filenames are quite common, so using them routinely for sed is
+# asking for trouble!
+sc_prohibit_sed_s_comma:
+ @explicit='($$SED|sed)[ ]+(-e[ ]+)?['\''"]?s,' \
+ implicit='['\''";][ ]*s,[^,]*,[^,]*,g?['\''";]' \
+ literal='^[ ]*s,[^,]*,[^,]*,g?['\''";]?$$' \
+ prohibit='('$$implicit'|'$$explicit'|'$$literal')' \
+ halt='found use of comma separator in sed substitution' \
+ $(_sc_search_regexp)
+
+# Check for using shift after set dummy (same or following line).
+exclude_file_name_regexp--sc_prohibit_set_dummy_without_shift = ^cfg.mk$$
+sc_prohibit_set_dummy_without_shift:
+ @files=$$($(VC_LIST_EXCEPT)); \
+ if test -n "$$files"; then \
+ grep -nE '(set dummy|shift)' $$files | \
+ sed -n '/set[ ][ ]*dummy/{ \
+ /set.*dummy.*;.*shift/d; \
+ N; \
+ /\n.*shift/D; \
+ p; \
+ }' | grep -n . && {
\
+ msg="use \`shift' after \`set dummy'" \
+ $(_sc_say_and_exit) } || :; \
+ else :; \
+ fi || :
+
+# Check for using set -- instead of set dummy
+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 -- ...'" \
+ $(_sc_search_regexp)
+
+# Check for using test X"... instead of test "X...
+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"'\' \
+ $(_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 ='" \
+ $(_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 $$'\' \
+ $(_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'" \
+ $(_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'" \
+ $(_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'),
+# when the other operand is a constant -- just swap them, and remove the
+# 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'\' \
+ $(_sc_search_regexp)
+
+# Check for opening brace on next line in shell function definition.
+exclude_file_name_regexp--sc_require_function_nl_brace = (^HACKING|\.[ch])$$
+sc_require_function_nl_brace:
+ @for file in $$($(VC_LIST_EXCEPT)); do \
+ sed -n '/^func_[^ ]*[ ]*(/{ \
+ N; \
+ /^func_[^ ]* ()\n{$$/d; \
+ p; \
+ }' $$file | grep -E . && { \
+ msg="found malformed function_definition in $$file" \
+ $(_sc_say_and_exit) } || :; \
+ done
+
sc_trailing_blank-non-rfc3676:
@prohibit='([^-][^-][ ][ ]*|^[ ][ ]*)$$' \
halt='found trailing blank(s)' \
$(_sc_search_regexp)
+# Avoid useless quotes around assignments with no shell metacharacters.
+# Backtick and dollar expansions are not resplit on the RHS of an
+# assignment, so those metachars are not listed in the prohibit regex,
+# although @ is listed, since it most likely indicates that something
+# will be spliced in before the shell executes, and it may need to be
+# quoted if it contains any metacharacters after splicing.
+define _sc_search_regexp_or_exclude
+ files=$$($(VC_LIST_EXCEPT)); \
+ if test -n "$$files"; then \
+ grep -nE "$$prohibit" $$files | grep -v '## exclude from $@' \
+ && { msg="$$halt" $(_sc_say_and_exit) } || :; \
+ else :; \
+ fi || :;
+endef
+
+exclude_file_name_regexp--sc_useless_braces_in_variable_derefs = /cvsu$$
+sc_useless_braces_in_variable_derefs:
+ @prohibit='\$${[0-9A-Za-z_]+}[^0-9A-Za-z_]' \
+ halt='found spurious braces around variable dereference' \
+ $(_sc_search_regexp)
+
+sc_useless_quotes_in_assignment:
+ @prohibit='^[ ]*[A-Za-z_][A-Za-z0-9_]*="[^
!#&()*;<>address@hidden|}]*"$$' \
+ halt='found spurious quotes around assignment value' \
+ $(_sc_search_regexp_or_exclude)
+
+# Avoid useless quotes around case arguments such as:
+# case "$foo" in ...
+exclude_file_name_regexp--sc_useless_quotes_in_case = ^cfg.mk$$
+sc_useless_quotes_in_case:
+ @prohibit='case "[^ "]*"[ ][ ]*in' \
+ halt='found spurious quotes around case argument' \
+ $(_sc_search_regexp)
+
# List syntax-check exempted files.
exclude_file_name_regexp--sc_bindtextdomain = ^tests/.*demo[0-9]*/.*\.c$$
exclude_file_name_regexp--sc_error_message_uppercase = \
diff --git a/configure.ac b/configure.ac
index 5c07723..0fe1802 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,7 +94,7 @@ AM_SILENT_RULES([yes])
# You can set autobuild_mode at configure time to specify a "unique"
# string for this build.
: ${autobuild_mode=default}
-AB_VERSION="AC_PACKAGE_VERSION"
+AB_VERSION='AC_PACKAGE_VERSION'
AB_INIT([$autobuild_mode])
@@ -109,12 +109,12 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES],
['$(srcdir)/.version'])
## Libtool specific configuration. ##
## ------------------------------- ##
-AC_SUBST([aclocaldir], ["\${datadir}/aclocal"])
-AC_SUBST([pkgdatadir], ["\${datadir}/$PACKAGE"])
+AC_SUBST([aclocaldir], ["\$(datadir)/aclocal"])
+AC_SUBST([pkgdatadir], ["\$(datadir)/$PACKAGE"])
AC_ARG_ENABLE(ltdl-install,
[AS_HELP_STRING([--disable-ltdl-install], [do not install libltdl])])
-if test x"${enable_ltdl_install+set}" != xset; then
+if test set != "${enable_ltdl_install+set}"; then
enable_ltdl_install=yes
fi
@@ -132,7 +132,7 @@ AC_SUBST([CONF_SUBDIRS])
DIST_MAKEFILE_LIST=
for dir in $CONF_SUBDIRS; do
- DIST_MAKEFILE_LIST="${DIST_MAKEFILE_LIST}$dir/Makefile "
+ DIST_MAKEFILE_LIST="$DIST_MAKEFILE_LIST$dir/Makefile "
done
AC_SUBST([DIST_MAKEFILE_LIST])
@@ -200,7 +200,7 @@ END
cd ..
rm -rf conftest.dir
])
-if test $lt_cv_make_order_only = yes; then
+if test yes = "$lt_cv_make_order_only"; then
ORDER='|'
else
ORDER=''
diff --git a/doc/libtool.texi b/doc/libtool.texi
index cdb0cd7..da5497e 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -4756,16 +4756,16 @@ LT_INIT([dlopen])
LTDL_INIT
# The lt_dladvise_init symbol was added with libtool-2.2
-if test "x$with_included_ltdl" != "xyes"; then
- save_CFLAGS="$CFLAGS"
- save_LDFLAGS="$LDFLAGS"
+if test yes != "$with_included_ltdl"; then
+ save_CFLAGS=$CFLAGS
+ save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS $LTDLINCL"
LDFLAGS="$LDFLAGS $LIBLTDL"
AC_CHECK_LIB([ltdl], [lt_dladvise_init],
[],
[AC_MSG_ERROR([installed libltdl is too old])])
- LDFLAGS="$save_LDFLAGS"
- CFLAGS="$save_CFLAGS"
+ LDFLAGS=$save_LDFLAGS
+ CFLAGS=$save_CFLAGS
fi
@end example
diff --git a/libltdl/configure.ac b/libltdl/configure.ac
index 662a0ff..58cfac9 100644
--- a/libltdl/configure.ac
+++ b/libltdl/configure.ac
@@ -58,7 +58,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
## ------------------------------- ##
## Libtool specific configuration. ##
## ------------------------------- ##
-pkgdatadir='${datadir}'"/${PACKAGE}"
+pkgdatadir='$datadir'"/$PACKAGE"
## ----------------------- ##
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index be44973..31bbf3e 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -125,7 +125,7 @@ M4SH_GETOPTS(
# be careful that --ltdl=foo --ltdl=bar results in ltdl_dir=bar:
case $opt_ltdl in
false|:) ;; # a bare '--ltdl' followed by another option
- *) ltdl_dir=`$ECHO "$optarg" |$SED 's,/*$,,'` ;;
+ *) ltdl_dir=`$ECHO "$optarg" |$SED 's|/*$||'` ;;
esac
opt_ltdl=:],
[
@@ -164,7 +164,7 @@ func_whisper ()
}
# func_whisper_once msg_var
-# Call func_whisper with the value of MSG_VAR, and then set MSG_VAR="" so
+# Call func_whisper with the value of MSG_VAR, and then set MSG_VAR='' so
# that subsequent calls will have no effect.
func_whisper_once ()
{
@@ -175,7 +175,7 @@ func_whisper_once ()
if test -n "$my_msg"; then
func_whisper "$my_msg"
- eval $1=""
+ eval $1=
fi
fi
}
@@ -321,12 +321,12 @@ func_included_files ()
{
$debug_cmd
- my_searchfile="$1"
+ my_searchfile=$1
my_include_regex=
my_sed_include='
/^m4@&address@hidden(\[.*\])$/ {
- s,^m4@&address@hidden(\[\(.*\)\])$,\1,
+ s|^m4@&address@hidden(\[\(.*\)\])$|\1|
p
}
d'
@@ -350,11 +350,11 @@ func_serial ()
{
$debug_cmd
- my_filename="$1"
- my_macro_regex="$2"
+ my_filename=$1
+ my_macro_regex=$2
my_sed_serial='
/^# serial [1-9][0-9.]*[ ]*'"$my_macro_regex"'[ ]*$/ {
- s,^# serial \([1-9][0-9.]*\).*$,\1,
+ s|^# serial \([1-9][0-9.]*\).*$|\1|
q
}
d'
@@ -366,7 +366,7 @@ func_serial ()
my_filebase=$func_basename_result
for my_file in `func_included_files "$my_filename"`; do
if test -z "$my_macro_regex" ||
- test "$my_filename" = aclocal.m4 ||
+ test aclocal.m4 = "$my_filename" ||
test "X$my_macro_regex" = "X$my_filebase" ||
func_grep '^AC_DEFUN(\@<:@'"$my_macro_regex" "$my_file"
then
@@ -390,8 +390,8 @@ func_serial_max ()
{
$debug_cmd
- my_serial1="$1"
- my_serial2="$2"
+ my_serial1=$1
+ my_serial2=$2
my_sed_dot='s/\..*$//g'
my_sed_rest='s/^[0-9][1-9]*\.*//'
@@ -413,16 +413,16 @@ func_serial_max ()
&& break
test -z "$my_serial1_part" \
- && { func_serial_max_result="$2"; break; }
+ && { func_serial_max_result=$2; break; }
test -z "$my_serial2_part" \
- && { func_serial_max_result="$1"; break; }
+ && { func_serial_max_result=$1; break; }
test "$my_serial1_part" -gt "$my_serial2_part" \
- && { func_serial_max_result="$1"; break; }
+ && { func_serial_max_result=$1; break; }
test "$my_serial2_part" -gt "$my_serial1_part" \
- && { func_serial_max_result="$2"; break; }
+ && { func_serial_max_result=$2; break; }
my_serial1=`$ECHO "$my_serial1" | $SED "$my_sed_rest"`
my_serial2=`$ECHO "$my_serial2" | $SED "$my_sed_rest"`
@@ -440,14 +440,14 @@ func_serial_update_check ()
$require_ac_ltdl_dir
$require_ac_macro_dir
- my_srcfile="$1"
- my_src_serial="$2"
- my_destfile="$3"
- my_dest_serial="$4"
+ my_srcfile=$1
+ my_src_serial=$2
+ my_destfile=$3
+ my_dest_serial=$4
my_update_p=:
if test -f "$my_destfile"; then
- test "X$my_src_serial" = "X0" && {
+ test 0 = "$my_src_serial" && {
func_warning "no serial number on \`$my_srcfile', not copying."
return
}
@@ -467,7 +467,7 @@ func_serial_update_check ()
fi
fi
- func_serial_update_check_result="$my_update_p"
+ func_serial_update_check_result=$my_update_p
}
@@ -480,8 +480,8 @@ func_aclocal_update_check ()
my_filename=$1
- my_srcfile="$aclocaldir/$1"
- my_destfile="aclocal.m4"
+ my_srcfile=$aclocaldir/$1
+ my_destfile=aclocal.m4
case $my_filename in
libtool.m4)
@@ -490,9 +490,9 @@ func_aclocal_update_check ()
# Strictly, this libtoolize ought not to have to deal with ancient
# serial formats, but we accept them here to be complete:
- test "X$my_src_serial" = "X0" &&
+ test 0 = "$my_src_serial" &&
my_src_serial=`func_serial "$my_srcfile" 'A[CM]_PROG_LIBTOOL'`
- test "X$my_dest_serial" = "X0" &&
+ test 0 = "$my_dest_serial" &&
my_dest_serial=`func_serial "$my_destfile" 'A[CM]_PROG_LIBTOOL'`
;;
ltdl.m4)
@@ -508,7 +508,7 @@ func_aclocal_update_check ()
func_serial_update_check \
"$my_srcfile" "$my_src_serial" "$my_destfile" "$my_dest_serial"
- func_aclocal_update_check_result="$func_serial_update_check_result"
+ func_aclocal_update_check_result=$func_serial_update_check_result
}
@@ -521,17 +521,17 @@ func_serial_update ()
{
$debug_cmd
- my_filename="$1"
- my_srcdir="$2"
- my_destdir="$3"
- my_msg_var="$4"
- my_macro_regex="$5"
- my_old_macro_regex="$6"
+ my_filename=$1
+ my_srcdir=$2
+ my_destdir=$3
+ my_msg_var=$4
+ my_macro_regex=$5
+ my_old_macro_regex=$6
my_serial_update_p=:
my_return_status=1
- my_srcfile="$my_srcdir/$my_filename"
- my_destfile="$my_destdir/$my_filename"
+ my_srcfile=$my_srcdir/$my_filename
+ my_destfile=$my_destdir/$my_filename
test -f "$my_srcfile" || func_fatal_error "\`$my_srcfile' does not exist."
@@ -541,15 +541,15 @@ func_serial_update ()
# Strictly, this libtoolize ought not to have to deal with ancient
# serial formats, but we accept them here to be complete:
- test "X$my_src_serial" = "X0" &&
+ test 0 = "$my_src_serial" &&
my_src_serial=`func_serial "$my_srcfile" "$my_old_macro_regex"`
- test "X$my_dest_serial" = "X0" &&
+ test 0 = "$my_dest_serial" &&
my_dest_serial=`func_serial "$my_destfile" "$my_old_macro_regex"`
func_serial_update_check \
"$my_srcfile" "$my_src_serial" "$my_destfile" "$my_dest_serial"
- my_serial_update_p="$func_serial_update_check_result"
+ my_serial_update_p=$func_serial_update_check_result
fi
if $my_serial_update_p || $opt_force; then
@@ -597,14 +597,14 @@ func_keyword_update ()
{
$debug_cmd
- my_filename="$1"
- my_srcdir="$2"
- my_destdir="$3"
- my_sed_script="$4"
- my_msg_var="$5"
+ my_filename=$1
+ my_srcdir=$2
+ my_destdir=$3
+ my_sed_script=$4
+ my_msg_var=$5
- my_srcfile="$my_srcdir/$my_filename"
- my_destfile="$my_destdir/$my_filename"
+ my_srcfile=$my_srcdir/$my_filename
+ my_destfile=$my_destdir/$my_filename
my_keyword_update_p=:
@@ -622,7 +622,7 @@ func_keyword_update ()
func_serial_update_check \
"$my_srcfile" "$my_src_serial" "$my_destfile" "$my_dest_serial"
- my_keyword_update_p="$func_serial_update_check_result"
+ my_keyword_update_p=$func_serial_update_check_result
fi
if $my_keyword_update_p || $opt_force; then
@@ -644,7 +644,7 @@ func_ltmain_update ()
my_sed_ltmain='
/^package_revision='\''*[0-9][1-9.]*'\''*/ {
- s,^package_revision='\''*\([0-9.]*\)'\''*[ ]*$,\1,
+ s|^package_revision='\''*\([0-9.]*\)'\''*[ ]*$|\1|
p
}
d'
@@ -665,8 +665,8 @@ func_config_update ()
my_sed_config='
/^timestamp='\''*[0-9][1-9-]*'\''*/ {
- s,^timestamp='\''*\([0-9-]*\)'\''*,\1,
- s/-/./g
+ s|^timestamp='\''*\([0-9-]*\)'\''*|\1|
+ s|-|.|g
p
}
d'
@@ -687,9 +687,9 @@ func_install_update ()
my_sed_install='
/^scriptversion='\''*[0-9][1-9.-]*'\''*/ {
- s,[#;].*,,
- s,^scriptversion='\''*\([0-9.-]*\)'\''*,\1,
- s/-/./g
+ s|[#;].*||
+ s|^scriptversion='\''*\([0-9.-]*\)'\''*|\1|
+ s|-|.|g
p
}
d'
@@ -938,7 +938,7 @@ func_nonemptydir_p ()
{
$debug_cmd
- my_dirvar="$1"
+ my_dirvar=$1
my_dir=`eval echo "\\\$$my_dirvar"`
# Is it a directory at all?
@@ -1005,9 +1005,9 @@ func_check_macros ()
func_echo "Remember to add \`LT_INIT' to $configure_ac."
# Suggest using LTDL_INIT if appropriate:
- $opt_ltdl && if test x$seen_ltdl != x:; then
+ $opt_ltdl && if test : != "$seen_ltdl"; then
case $ltdl_mode in
- subproject) ltdl_init_args="" ;;
+ subproject) ltdl_init_args= ;;
*) ltdl_init_args="([$ltdl_mode])" ;;
esac
func_echo "Remember to add \`LTDL_INIT$ltdl_init_args' to $configure_ac."
@@ -1021,7 +1021,7 @@ func_check_macros ()
# For nonrecursive mode, warn about continued use of Makefile.inc:
# FIXME: Remove in 2013
# (along with last minute rename in func_install_pkgltdl_files)
- if test "x$ltdl_mode" = "xnonrecursive"; then
+ if test nonrecursive = "$ltdl_mode"; then
if func_grep "^-\?include $ltdl_dir/Makefile.inc\$" Makefile.am;
then
func_error "Use of \`include $ltdl_dir/Makefile.inc' is deprecated!"
@@ -1031,7 +1031,7 @@ func_check_macros ()
fi
# Suggest modern idioms for storing autoconf macros:
- $ac_config_macro_dir_advised || if test -z "$ac_macro_dir" || test
x"$macro_dir" = x.; then
+ $ac_config_macro_dir_advised || if test -z "$ac_macro_dir" || test . =
"$macro_dir"; then
func_echo "Consider adding \`AC_CONFIG_MACRO_DIR([m4])' to $configure_ac
and"
func_echo "rerunning $progname, to keep the correct libtool macros
in-tree."
ac_config_macro_dir_advised=:
@@ -1051,7 +1051,7 @@ func_check_macros ()
# 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 &&
+ $SED 's|dnl .*$||; s|# .*$||' "$configure_ac" | grep AC_PROG_RANLIB
>/dev/null &&
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
@@ -1075,7 +1075,7 @@ func_autoconf_configure ()
{
$debug_cmd
- _G_sed_no_comment='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;'
+ _G_sed_no_comment='s|#.*$||; s|^dnl .*$||; s| dnl .*$||;'
_G_ac_init=
# If we were passed a genuine file, make sure it calls AC_INIT.
@@ -1086,7 +1086,7 @@ func_autoconf_configure ()
test -n "$_G_ac_init"
_G_status=$?
- test "$_G_status" -ne 0 \
+ test 0 -ne $_G_status \
&& func_verbose "\`$1' not using Autoconf"
(exit $_G_status)
@@ -1261,8 +1261,8 @@ func_require_Makefile_am_filter ()
recursive)
Makefile_am_filter='
/^[^#]/{
- s,(LIBOBJS),(ltdl_LIBOBJS),g
- s,(LTLIBOBJS),(ltdl_LTLIBOBJS),g
+ s|(LIBOBJS)|(ltdl_LIBOBJS)|g
+ s|(LTLIBOBJS)|(ltdl_LTLIBOBJS)|g
}'
;;
@@ -1278,9 +1278,9 @@ $ltdl_am_macro_dir" |$SED "$sed_make_literal_regex"`
Makefile_am_filter="
/^ACLOCAL_AMFLAGS = /{
- s, -I $my_am_macro_dir_regex\$, -I $ltdl_relative_macro_dir,
+ s| -I $my_am_macro_dir_regex\$| -I $ltdl_relative_macro_dir|
}
- s,dir)/$my_am_macro_dir_regex,dir)/$ltdl_relative_macro_dir,g"
+ s|dir)/$my_am_macro_dir_regex|dir)/$ltdl_relative_macro_dir|g"
}
test "$ltdl_ac_aux_dir" = "$ltdl_relative_aux_dir" || {
@@ -1288,8 +1288,8 @@ $ltdl_am_macro_dir" |$SED "$sed_make_literal_regex"`
$ltdl_ac_aux_dir" |$SED "$sed_make_literal_regex"`
Makefile_am_filter="$Makefile_am_filter
- s,$my_aux_dir_regex,$ltdl_relative_aux_dir,g
- s,/\./,/,g
+ s|$my_aux_dir_regex|$ltdl_relative_aux_dir|g
+ s|/\./|/|g
"
}
;;
@@ -1313,23 +1313,23 @@ func_require_Makefile_inc_filter ()
# Note that we strip comments right here, rather than rely on
# using a $SED that allows comments.
- my_uscore=`$ECHO "$ltdl_dir" | $SED 's,[/.+-],_,g'`
+ my_uscore=`$ECHO "$ltdl_dir" | $SED 's|[/.+-]|_|g'`
Makefile_inc_filter=`$ECHO '
/^[^#]/{
# Use only libltdl conditional objects.
- s,(LIBOBJS),(ltdl_LIBOBJS),g
- s,(LTLIBOBJS),(ltdl_LTLIBOBJS),g
+ s|(LIBOBJS)|(ltdl_LIBOBJS)|g
+ s|(LTLIBOBJS)|(ltdl_LTLIBOBJS)|g
# Convert libltdl path and variable sections to $ltdl_dir.
- s,libltdl_,@address@hidden,
- s,libltdl/,@ltdl_dir@/,
- s,: libltdl/,: @ltdl_dir@/,
- s, -Ilibltdl , address@hidden@ ,
- s,\$(libltdl_,\$(@address@hidden,
- s,)/libltdl ,)/@ltdl_dir@ ,
- s,@my_uscore@,'"$my_uscore"',g
- s,@ltdl_dir@,'"$ltdl_dir"',g
+ s|libltdl_|@address@hidden|
+ s|libltdl/|@ltdl_dir@/|
+ s|: libltdl/|: @ltdl_dir@/|
+ s| -Ilibltdl | address@hidden@ |
+ s|\$(libltdl_|\$(@address@hidden|
+ s|)/libltdl |)/@ltdl_dir@ |
+ s|@my_uscore@|'"$my_uscore"'|g
+ s|@ltdl_dir@|'"$ltdl_dir"'|g
}' | $SED '/^[ ]*#/d;/^$/d'`
@@ -1388,7 +1388,7 @@ cannot expand unknown variable in LT_CONFIG_LTDL_DIR
argument."
fi
# Strip trailing slashes.
- ac_ltdl_dir=`echo "$ac_ltdl_dir" |$SED 's,/*$,,'`
+ ac_ltdl_dir=`echo "$ac_ltdl_dir" |$SED 's|/*$||'`
require_ac_ltdl_dir=:
}
@@ -1480,7 +1480,7 @@ $ltdl_am_macro_dir" |$SED "$sed_make_literal_regex"`
# undefined macro.
aclocal_m4_filter="
/^[m]4_include(/{
- s,$my_am_macro_dir_regex,$ltdl_relative_macro_dir,g
+ s|$my_am_macro_dir_regex|$ltdl_relative_macro_dir|g
}"
}
@@ -1510,7 +1510,7 @@ func_require_aux_dir ()
$require_ltdl_dir
$require_ltdl_mode
- test subproject = "$ltdl_mode" && aux_dir="$ltdl_dir"
+ test subproject = "$ltdl_mode" && aux_dir=$ltdl_dir
}
}
@@ -1570,7 +1570,7 @@ func_require_configure_ac_filter ()
$ltdl_ac_aux_dir" |$SED "$sed_make_literal_regex"`
configure_ac_filter="
- s,$my_aux_dir_regex,$ltdl_relative_aux_dir,g
+ s|$my_aux_dir_regex|$ltdl_relative_aux_dir|g
"
}
@@ -1672,7 +1672,7 @@ func_require_macro_dir ()
$require_ltdl_dir
$require_ltdl_mode
- test subproject = "$ltdl_mode" && macro_dir="$ltdl_dir/m4"
+ test subproject = "$ltdl_mode" && macro_dir=$ltdl_dir/m4
}
# Use ./m4 as the last resort.
@@ -1753,17 +1753,17 @@ func_require_seen_libtool ()
pkgmacro_files="@pkgmacro_files@"
# Locations for important files:
- address@hidden@
- address@hidden@
- address@hidden@
- address@hidden@
- address@hidden@
+ prefix="@prefix@"
+ datadir="@datadir@"
+ pkgauxdir="@pkgauxdir@"
+ pkgltdldir="@pkgdatadir@"
+ aclocaldir="@aclocaldir@"
# Allow the user to override the master libtoolize repository:
if test -n "$_lt_pkgdatadir"; then
- pkgauxdir="$_lt_pkgdatadir/build-aux"
- pkgltdldir="$_lt_pkgdatadir/libltdl"
- aclocaldir="$_lt_pkgdatadir/m4"
+ pkgauxdir=$_lt_pkgdatadir/build-aux
+ pkgltdldir=$_lt_pkgdatadir/libltdl
+ aclocaldir=$_lt_pkgdatadir/m4
fi
func_nonemptydir_p pkgauxdir
func_nonemptydir_p pkgltdldir
diff --git a/m4/argz.m4 b/m4/argz.m4
index d1f4ec5..1722e0f 100644
--- a/m4/argz.m4
+++ b/m4/argz.m4
@@ -44,7 +44,7 @@ AS_IF([test -z "$ARGZ_H"],
[[case $host_os in #(
*cygwin*)
lt_cv_sys_argz_works=no
- if test "$cross_compiling" != no; then
+ if test no != "$cross_compiling"; then
lt_cv_sys_argz_works="guessing no"
else
lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/'
@@ -55,18 +55,18 @@ AS_IF([test -z "$ARGZ_H"],
lt_os_major=${2-0}
lt_os_minor=${3-0}
lt_os_micro=${4-0}
- if test "$lt_os_major" -gt 1 \
- || { test "$lt_os_major" -eq 1 \
- && { test "$lt_os_minor" -gt 5 \
- || { test "$lt_os_minor" -eq 5 \
- && test "$lt_os_micro" -gt 24; }; }; }; then
+ if test 1 -le "$lt_os_major" \
+ || { test 1 -eq "$lt_os_major" \
+ && { test 5 -le "$lt_os_minor" \
+ || { test 5 -eq "$lt_os_minor" \
+ && test 24 -le "$lt_os_micro"; }; }; }; then
lt_cv_sys_argz_works=yes
fi
fi
;; #(
*) lt_cv_sys_argz_works=yes ;;
esac]])
- AS_IF([test "$lt_cv_sys_argz_works" = yes],
+ AS_IF([test yes = "$lt_cv_sys_argz_works"],
[AC_DEFINE([HAVE_WORKING_ARGZ], 1,
[This value is set to 1 to indicate that the system argz
facility works])],
[ARGZ_H=argz.h
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index a9e20cf..007492c 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -91,7 +91,7 @@ dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -213,10 +213,10 @@ can_build_shared=yes
# which needs '.lib').
libext=a
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
# Set sane defaults for various variables
test -z "$CC" && CC=cc
@@ -276,7 +276,7 @@ no_glob_subst='s/\*/\\\*/g'
m4_defun([_LT_PROG_LTMAIN],
[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
])# _LT_PROG_LTMAIN
@@ -446,7 +446,7 @@ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
# Output comment and list of tags supported by the script
m4_defun([_LT_LIBTOOL_TAGS],
[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this
script])dnl
-available_tags="_LT_TAGS"dnl
+available_tags='_LT_TAGS'dnl
])
@@ -547,7 +547,7 @@ for var in lt_decl_all_varnames([[ \
]], lt_decl_quote_varnames); do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED
\\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED
\\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -560,7 +560,7 @@ for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e
\\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e
\\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e
\\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e
\\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from
sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -598,7 +598,7 @@ AS_SHELL_SANITIZE
_AS_PREPARE
exec AS_MESSAGE_FD>&1
_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
# LT_OUTPUT
@@ -643,7 +643,7 @@ Copyright (C) 2011 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
-while test $[#] != 0
+while test 0 != $[#]
do
case $[1] in
--version | --v* | -V )
@@ -685,7 +685,7 @@ chmod +x "$CONFIG_LT"
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
lt_cl_success=:
-test "$silent" = yes &&
+test yes = "$silent" &&
lt_config_lt_args="$lt_config_lt_args --quiet"
exec AS_MESSAGE_LOG_FD>/dev/null
$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
@@ -711,7 +711,7 @@ _LT_CONFIG_SAVE_COMMANDS([
setopt NO_GLOB_SUBST
fi
- cfgfile="${ofile}T"
+ cfgfile=${ofile}T
trap "$RM \"$cfgfile\"; exit 1" 1 2 15
$RM "$cfgfile"
@@ -973,7 +973,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
AC_CACHE_CHECK([for -single_module linker
flag],[lt_cv_apple_cc_single_mod],
[lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
+ if test -z "$LT_MULTI_MODULE"; then
# By default we will add the -single_module flag. You can override
# by either setting the environment variable LT_MULTI_MODULE
# non-empty at configure time, or by adding -multi_module to the
@@ -991,7 +991,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
cat conftest.err >&AS_MESSAGE_LOG_FD
# Otherwise, if the output was created with a 0 exit code from
# the compiler, it worked.
- elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1009,7 +1009,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
[lt_cv_ld_exported_symbols_list=yes],
[lt_cv_ld_exported_symbols_list=no])
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
])
AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
@@ -1031,7 +1031,7 @@ _LT_EOF
_lt_result=$?
if test -s conftest.err && $GREP force_load conftest.err; then
cat conftest.err >&AS_MESSAGE_LOG_FD
- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load
conftest >/dev/null 2>&1 ; then
+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load
conftest >/dev/null 2>&1 ; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1041,32 +1041,32 @@ _LT_EOF
])
case $host_os in
rhapsody* | darwin1.[[012]])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined
${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress'
;;
darwin*) # darwin 5.x on
# if running on 10.5 or later, the deployment target defaults
# to the OS version, if on x86, and 10.4, the deployment
# target defaults to 10.4. Don't you love it?
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
10.[[012]]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined
${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined
${wl}suppress' ;;
10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ if test yes = "$lt_cv_apple_cc_single_mod"; then
_lt_dar_single_mod='$single_module'
fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms='
${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ if test yes = "$lt_cv_ld_exported_symbols_list"; then
+ _lt_dar_export_syms='
$wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
else
- _lt_dar_export_syms='~$NMEDIT -s
$output_objdir/${libname}-symbols.expsym ${lib}'
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym
$lib'
fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -1086,29 +1086,29 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do
test -n \"$conv\" && new_convenience=\"$new_convenience
${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ if test yes = "$lt_cv_ld_force_load"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do
test -n \"$conv\" && new_convenience=\"$new_convenience
$wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
[FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=''
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
case $cc_basename in
ifort*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o
\$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname
\$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle
\$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols >
\$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib
\$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags
-install_name \$rpath/\$soname \$verstring
${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols >
\$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib
-bundle \$libobjs \$deplibs
\$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o
\$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname
\$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle
\$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols >
\$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib
\$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags
-install_name \$rpath/\$soname \$verstring
$_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols >
\$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib
-bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
m4_if([$1], [CXX],
-[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o
\${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib
\${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname
\$verstring${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols >
\$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs
-nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag
-o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name
\$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+[ if test yes != "$lt_cv_apple_cc_single_mod"; then
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o
\$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib
\$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname
\$verstring$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols >
\$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs
-nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag
-o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name
\$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
fi
],[])
else
@@ -1146,7 +1146,7 @@ else
_LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext
2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi],[])
if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
fi
])
aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
@@ -1198,7 +1198,7 @@ func_echo_all ()
$ECHO "$*"
}
-case "$ECHO" in
+case $ECHO in
printf*) AC_MSG_RESULT([printf]) ;;
print*) AC_MSG_RESULT([print -r]) ;;
*) AC_MSG_RESULT([cat]) ;;
@@ -1231,9 +1231,9 @@ AC_ARG_WITH([sysroot],
dnl lt_sysroot will always be passed unquoted. We quote it here
dnl in case the user passed a directory name.
lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
yes)
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi
;; #(
@@ -1243,7 +1243,7 @@ case ${with_sysroot} in #(
no|'')
;; #(
*)
- AC_MSG_RESULT([${with_sysroot}])
+ AC_MSG_RESULT([$with_sysroot])
AC_MSG_ERROR([The sysroot must be an absolute path.])
;;
esac
@@ -1258,7 +1258,7 @@ m4_defun([_LT_ENABLE_LOCK],
[AC_ARG_ENABLE([libtool-lock],
[AS_HELP_STRING([--disable-libtool-lock],
[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
# libtool support.
@@ -1269,10 +1269,10 @@ ia64-*-hpux*)
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
- HPUX_IA64_MODE="32"
+ HPUX_IA64_MODE=32
;;
*ELF-64*)
- HPUX_IA64_MODE="64"
+ HPUX_IA64_MODE=64
;;
esac
fi
@@ -1282,7 +1282,7 @@ ia64-*-hpux*)
# Find out which ABI we are using.
echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -melf32bsmip"
@@ -1362,15 +1362,15 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
*-*-sco3.2v5*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
+ SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -belf"
AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
[AC_LANG_PUSH(C)
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
AC_LANG_POP])
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ if test yes != "$lt_cv_cc_needs_belf"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
+ CFLAGS=$SAVE_CFLAGS
fi
;;
*-*solaris*)
@@ -1391,7 +1391,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
esac
# GNU ld 2.21 introduced _sol2 emulations. Use them if available.
if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
- LD="${LD-ld}_sol2"
+ LD=${LD-ld}_sol2
fi
;;
*)
@@ -1407,7 +1407,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
;;
esac
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
])# _LT_ENABLE_LOCK
@@ -1426,11 +1426,11 @@ AC_CACHE_CHECK([for archiver @FILE support],
[lt_cv_ar_at_file],
[echo conftest.$ac_objext > conftest.lst
lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -eq 0; then
+ if test 0 -eq "$ac_status"; then
# Ensure the archiver fails upon bogus file names.
rm -f conftest.$ac_objext libconftest.a
AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -ne 0; then
+ if test 0 -ne "$ac_status"; then
lt_cv_ar_at_file=@
fi
fi
@@ -1438,7 +1438,7 @@ AC_CACHE_CHECK([for archiver @FILE support],
[lt_cv_ar_at_file],
])
])
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
archiver_list_spec=
else
archiver_list_spec=$lt_cv_ar_at_file
@@ -1505,7 +1505,7 @@ AC_CACHE_CHECK([$1], [$2],
[$2=no
m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
+ lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -1532,7 +1532,7 @@ AC_CACHE_CHECK([$1], [$2],
$RM conftest*
])
-if test x"[$]$2" = xyes; then
+if test yes != "[$]$2"; then
m4_if([$5], , :, [$5])
else
m4_if([$6], , :, [$6])
@@ -1554,7 +1554,7 @@ AC_DEFUN([_LT_LINKER_OPTION],
m4_require([_LT_DECL_SED])dnl
AC_CACHE_CHECK([$1], [$2],
[$2=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $3"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -1573,10 +1573,10 @@ AC_CACHE_CHECK([$1], [$2],
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
])
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
m4_if([$4], , :, [$4])
else
m4_if([$5], , :, [$5])
@@ -1597,7 +1597,7 @@ AC_DEFUN([LT_CMD_MAX_LEN],
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
- teststring="ABCD"
+ teststring=ABCD
case $build_os in
msdosdjgpp*)
@@ -1702,7 +1702,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
# we can't tell.
while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
+ test 17 != "$i" # 1/2 MB should be enough
do
i=`expr $i + 1`
teststring=$teststring$teststring
@@ -1718,7 +1718,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
esac
])
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len" ; then
AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
else
AC_MSG_RESULT(none)
@@ -1746,7 +1746,7 @@ m4_defun([_LT_HEADER_DLFCN],
# ----------------------------------------------------------------
m4_defun([_LT_TRY_DLOPEN_SELF],
[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
+if test yes = "$cross_compiling"; then :
[$4]
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -1821,7 +1821,7 @@ int main ()
return status;
}]
_LT_EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+ if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -1842,7 +1842,7 @@ rm -fr conftest*
# ------------------
AC_DEFUN([LT_SYS_DLOPEN_SELF],
[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
+if test yes != "$enable_dlopen"; then
enable_dlopen=unknown
enable_dlopen_self=unknown
enable_dlopen_self_static=unknown
@@ -1852,26 +1852,26 @@ else
case $host_os in
beos*)
- lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen=load_add_on
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
;;
mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs=
;;
cygwin*)
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
darwin*)
# if libdl is installed we need to link against it
AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
- lt_cv_dlopen="dyld"
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+ lt_cv_dlopen=dyld
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
])
@@ -1879,17 +1879,17 @@ else
*)
AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
+ [lt_cv_dlopen=shl_load],
[AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
[AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
+ [lt_cv_dlopen=dlopen],
[AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
[AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
[AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
])
])
])
@@ -1898,21 +1898,21 @@ else
;;
esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
+ if test no = "$lt_cv_dlopen"; then
enable_dlopen=no
+ else
+ enable_dlopen=yes
fi
case $lt_cv_dlopen in
dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ save_CPPFLAGS=$CPPFLAGS
+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS
$export_dynamic_flag_spec\"
- save_LIBS="$LIBS"
+ save_LIBS=$LIBS
LIBS="$lt_cv_dlopen_libs $LIBS"
AC_CACHE_CHECK([whether a program can dlopen itself],
@@ -1922,7 +1922,7 @@ else
lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
])
- if test "x$lt_cv_dlopen_self" = xyes; then
+ if test yes = "$lt_cv_dlopen_self"; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS
$lt_prog_compiler_static\"
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
@@ -1932,9 +1932,9 @@ else
])
fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
;;
esac
@@ -2026,8 +2026,8 @@ m4_defun([_LT_COMPILER_FILE_LOCKS],
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
_LT_COMPILER_C_O([$1])
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks"
!= no; then
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no !=
"$need_locks"; then
# do not overwrite the value of need_locks provided by the user
AC_MSG_CHECKING([if we can lock with hard links])
hard_links=yes
@@ -2037,7 +2037,7 @@ if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no
&& test "$need_locks" !=
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
AC_MSG_RESULT([$hard_links])
- if test "$hard_links" = no; then
+ if test no = "$hard_links"; then
AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
need_locks=warn
fi
@@ -2078,15 +2078,15 @@ m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
_LT_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
test -n "$_LT_TAGVAR(runpath_var, $1)" ||
- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
# We can hardcode non-existent directories.
- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+ if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
# If the only mechanism to avoid hardcoding is shlibpath_var, we
# have to relink, otherwise we might link with an installed library
# when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+ test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
# Linking always hardcodes the temporary library directory.
_LT_TAGVAR(hardcode_action, $1)=relink
else
@@ -2100,12 +2100,12 @@ else
fi
AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+ test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -2129,7 +2129,7 @@ else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
darwin*)
- if test -n "$STRIP" ; then
+ if test -n "$STRIP"; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
AC_MSG_RESULT([yes])
@@ -2160,14 +2160,14 @@ m4_require([_LT_CHECK_SHELL_FEATURES])dnl
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
+ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+ *) lt_awk_arg='/^libraries:/' ;;
esac
case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
+ mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+ *) lt_sed_strip_eq='s|=/|/|g' ;;
esac
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e
"s/^libraries://" -e $lt_sed_strip_eq`
case $lt_search_path_spec in
@@ -2195,16 +2195,16 @@ if test "$GCC" = yes; then
fi
done
lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
+BEGIN {RS = " "; FS = "/|\n";} {
+ lt_fooi = "";
+ lt_count = 0;
for (lt_i = NF; lt_i > 0; lt_i--) {
if ($lt_i != "" && $lt_i != ".") {
if ($lt_i == "..") {
lt_count++;
} else {
if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
+ lt_foo = "/" $lt_i lt_foo;
} else {
lt_count--;
}
@@ -2218,7 +2218,7 @@ BEGIN {RS=" "; FS="/|\n";} {
# for these hosts.
case $host_os in
mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+ $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
@@ -2227,7 +2227,7 @@ fi])
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -2247,11 +2247,11 @@ need_version=unknown
case $host_os in
aix3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[[4-9]]*)
@@ -2259,9 +2259,9 @@ aix[[4-9]]*)
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major
${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major
$libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
@@ -2273,7 +2273,7 @@ aix[[4-9]]*)
aix4 | aix4.[[01]] | aix4.[[01]].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
@@ -2283,16 +2283,16 @@ aix[[4-9]]*)
# AIX (on Power*) has no versioning support, so currently we cannot
hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ if test yes = "$aix_use_runtimelinking"; then
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
else
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
fi
shlibpath_var=LIBPATH
fi
@@ -2303,18 +2303,18 @@ amigaos*)
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the
compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
;;
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do
libname=`func_echo_all "$lib" | $SED
'\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM
/sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib
${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a ||
exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do
libname=`func_echo_all "$lib" | $SED
'\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM
/sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib
${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a ||
exit 1; done'
;;
esac
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
@@ -2322,8 +2322,8 @@ beos*)
bsdi[[45]]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib
/usr/local/lib"
@@ -2335,7 +2335,7 @@ bsdi[[45]]*)
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -2344,8 +2344,8 @@ cygwin* | mingw* | pw32* | cegcc*)
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo
\$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo
\$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname~
@@ -2361,17 +2361,17 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} |
$SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED
-e 's/[[.]]/-/g'`$versuffix$shared_ext'
m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e
's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e
's/[[.]]/-/g'`$versuffix$shared_ext'
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo
${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release
| $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
;;
esac
dynamic_linker='Win32 ld.exe'
@@ -2380,8 +2380,8 @@ m4_if([$1], [],[
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e
's/[[.]]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e
's/[[.]]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -2408,7 +2408,7 @@ m4_if([$1], [],[
sys_lib_search_path_spec=`cygpath --path --unix
"$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
;;
*)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null];
then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e
's/;/ /g'`
@@ -2421,8 +2421,8 @@ m4_if([$1], [],[
esac
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo
\$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo
\$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname'
@@ -2435,7 +2435,7 @@ m4_if([$1], [],[
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e
's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e
's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -2448,8 +2448,8 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext
${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2462,8 +2462,8 @@ dgux*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -2481,12 +2481,12 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext $libname$shared_ext'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix
$libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$shared_ext$versuffix'
need_version=yes
;;
esac
@@ -2515,8 +2515,8 @@ gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2527,8 +2527,8 @@ haiku*)
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LIBRARY_PATH
shlibpath_overrides_runpath=yes
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib
/boot/system/lib'
@@ -2548,9 +2548,9 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32
/usr/local/lib"
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
@@ -2563,8 +2563,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -2573,8 +2573,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
;;
esac
# HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -2587,8 +2587,8 @@ interix[[3-9]]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -2599,7 +2599,7 @@ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
version_type=linux # correct to gnu/linux during the next big
refactor
else
version_type=irix
@@ -2607,8 +2607,8 @@ irix5* | irix6* | nonstopux*)
esac
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}
$libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$release$shared_ext
$libname$shared_ext'
case $host_os in
irix5* | nonstopux*)
libsuff= shlibsuff=
@@ -2627,8 +2627,8 @@ irix5* | irix6* | nonstopux*)
esac
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff}
/usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff
/usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
hardcode_into_libs=yes
;;
@@ -2642,8 +2642,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -2688,12 +2688,12 @@ netbsd*)
need_lib_prefix=no
need_version=no
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='NetBSD ld.elf_so'
fi
shlibpath_var=LD_LIBRARY_PATH
@@ -2703,7 +2703,7 @@ netbsd*)
newsos6)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
;;
@@ -2712,8 +2712,8 @@ newsos6)
version_type=qnx
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2722,17 +2722,17 @@ newsos6)
openbsd*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test
"$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test
openbsd2.8-powerpc = "$host_os-$host_cpu"; then
case $host_os in
openbsd2.[[89]] | openbsd2.[[89]].*)
shlibpath_overrides_runpath=no
@@ -2748,9 +2748,9 @@ openbsd*)
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ library_names_spec='$libname$shared_ext $libname.a'
dynamic_linker='OS/2 ld.exe'
shlibpath_var=LIBPATH
;;
@@ -2759,11 +2759,11 @@ osf3* | osf4* | osf5*)
version_type=osf
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc
/usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -2774,8 +2774,8 @@ solaris*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
@@ -2785,11 +2785,11 @@ solaris*)
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
@@ -2797,8 +2797,8 @@ sunos4*)
sysv4 | sysv4.3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
case $host_vendor in
sni)
@@ -2821,8 +2821,8 @@ sysv4 | sysv4.3*)
sysv4*MP*)
if test -d /usr/nec ;then
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix
$libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ library_names_spec='$libname$shared_ext.$versuffix
$libname$shared_ext.$major $libname$shared_ext'
+ soname_spec='$libname$shared_ext.$major'
shlibpath_var=LD_LIBRARY_PATH
fi
;;
@@ -2831,12 +2831,12 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* |
sysv4*uw2*)
version_type=freebsd-elf
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib
/usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -2854,7 +2854,7 @@ tpf*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2862,8 +2862,8 @@ tpf*)
uts4*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -2872,18 +2872,18 @@ uts4*)
;;
esac
AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX
COMPILER_PATH LIBRARY_PATH"
fi
if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
_LT_DECL([], [variables_saved_for_relink], [1],
@@ -2932,25 +2932,25 @@ AC_MSG_CHECKING([for $1])
AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
[case $MAGIC_CMD in
[[\\/*] | ?:[\\/]*])
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a
path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
dnl $ac_dummy forces splitting on constant user-supplied paths.
dnl POSIX.2 word splitting is done only on the output of word expansions,
dnl not every word. This closes a longstanding sh security hole.
ac_dummy="m4_if([$2], , $PATH, [$2])"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$1; then
- lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+ if test -f "$ac_dir/$1"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
@@ -2973,11 +2973,11 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
AC_MSG_RESULT($MAGIC_CMD)
else
@@ -3022,11 +3022,11 @@ m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
[assume the C compiler uses GNU ld @<:@default=no@:>@])],
- [test "$withval" = no || with_gnu_ld=yes],
+ [test no = "$withval" || with_gnu_ld=yes],
[with_gnu_ld=no])dnl
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
AC_MSG_CHECKING([for ld used by $CC])
case $host in
@@ -3045,7 +3045,7 @@ if test "$GCC" = yes; then
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -3056,37 +3056,37 @@ if test "$GCC" = yes; then
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
AC_MSG_CHECKING([for GNU ld])
else
AC_MSG_CHECKING([for non-GNU ld])
fi
AC_CACHE_VAL(lt_cv_path_LD,
[if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi])
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
AC_MSG_RESULT($LD)
else
@@ -3140,13 +3140,13 @@ esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
reload_cmds=false
fi
;;
darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ if test yes = "$GCC"; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
else
reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
@@ -3307,7 +3307,7 @@ newos6*)
;;
openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test
"$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test
openbsd2.8-powerpc = "$host_os-$host_cpu"; then
lt_cv_deplibs_check_method='match_pattern
/lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern
/lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
@@ -3400,18 +3400,18 @@ AC_DEFUN([LT_PATH_NM],
AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
[if test -n "$NM"; then
# Let the user override the test.
- lt_cv_path_NM="$NM"
+ lt_cv_path_NM=$NM
else
- lt_nm_to_check="${ac_tool_prefix}nm"
+ lt_nm_to_check=${ac_tool_prefix}nm
if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
+ tmp_nm=$ac_dir/$lt_tmp_nm
if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
# Check to see if the nm accepts a BSD-compat flag.
# Adding the `sed 1q' prevents false positives on HP-UX, which says:
@@ -3437,12 +3437,12 @@ else
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
done
: ${lt_cv_path_NM=no}
fi])
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+ NM=$lt_cv_path_NM
else
# Didn't find any BSD compatible name lister, look for dumpbin.
if test -n "$DUMPBIN"; then :
@@ -3459,8 +3459,8 @@ else
esac
fi
AC_SUBST([DUMPBIN])
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
+ if test : != "$DUMPBIN"; then
+ NM=$DUMPBIN
fi
fi
test -z "$NM" && NM=nm
@@ -3519,7 +3519,7 @@ cygwin* | mingw* | pw32* | cegcc*)
;;
*)
# fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ lt_cv_sharedlib_from_linklib_cmd=$ECHO
;;
esac
])
@@ -3546,7 +3546,7 @@ AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool],
[lt_cv_path_mainfest_tool
lt_cv_path_mainfest_tool=yes
fi
rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
MANIFEST_TOOL=:
fi
_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
@@ -3564,11 +3564,11 @@ case $host in
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
;;
*)
- AC_CHECK_LIB(m, cos, LIBM="-lm")
+ AC_CHECK_LIB(m, cos, LIBM=-lm)
;;
esac
AC_SUBST([LIBM])
@@ -3587,7 +3587,7 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $cc_basename in
nvcc*)
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler
-fno-builtin' ;;
@@ -3639,7 +3639,7 @@ cygwin* | mingw* | pw32* | cegcc*)
symcode='[[ABCDGISTW]]'
;;
hpux*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
symcode='[[ABCDEGRST]]'
fi
;;
@@ -3801,9 +3801,9 @@ _LT_EOF
mv conftest.$ac_objext conftstm.$ac_objext
lt_globsym_save_LIBS=$LIBS
lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
+ LIBS=conftstm.$ac_objext
CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+ if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
pipe_works=yes
fi
LIBS=$lt_globsym_save_LIBS
@@ -3824,7 +3824,7 @@ _LT_EOF
rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
+ if test yes = "$pipe_works"; then
break
else
lt_cv_sys_global_symbol_pipe=
@@ -3872,14 +3872,14 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)=
m4_if([$1], [CXX], [
# C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
@@ -3959,7 +3959,7 @@ m4_if([$1], [CXX], [
case $host_os in
aix[[4-9]]*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
else
@@ -4000,14 +4000,14 @@ m4_if([$1], [CXX], [
case $cc_basename in
CC*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+ if test ia64 != "$host_cpu"; then
_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
fi
;;
aCC*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
case $host_cpu in
hppa*64*|ia64*)
# +Z the default
@@ -4189,14 +4189,14 @@ m4_if([$1], [CXX], [
fi
],
[
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
@@ -4298,7 +4298,7 @@ m4_if([$1], [CXX], [
case $host_os in
aix*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
else
@@ -4326,7 +4326,7 @@ m4_if([$1], [CXX], [
;;
esac
# Is there a better lt_prog_compiler_static that works with the bundled
CC?
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
;;
irix5* | irix6* | nonstopux*)
@@ -4564,7 +4564,7 @@ m4_if([$1], [CXX], [
fi
;;
pw32*)
- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
@@ -4628,7 +4628,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
with_gnu_ld=no
fi
;;
@@ -4646,7 +4646,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# On some targets, GNU ld is compatible enough with the native linker
# that we're better off using the native interface for both.
lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
case $host_os in
aix*)
# The AIX port of GNU ld has always aspired to compatibility
@@ -4668,19 +4668,19 @@ dnl Note also adjust exclude_expsyms for C++ above.
esac
fi
- if test "$lt_use_gnu_ld_interface" = yes; then
+ if test yes = "$lt_use_gnu_ld_interface"; then
# If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
+ wlarc='$wl'
# Set some defaults for GNU ld with shared library support. These
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# ancient GNU ld didn't support --whole-archive et. al.
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec,
$1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec,
$1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=
fi
@@ -4698,7 +4698,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
case $host_os in
aix[[3-9]]*)
# On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
+ if test ia64 != "$host_cpu"; then
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -4717,7 +4717,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)=''
;;
m68k)
@@ -4733,7 +4733,7 @@ _LT_EOF
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <address@hidden> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4743,7 +4743,7 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -4751,61 +4751,61 @@ _LT_EOF
_LT_TAGVAR(exclude_expsyms,
$1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base
-Xlinker --out-implib -Xlinker $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker
--out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q
$export_symbols`" = xEXPORTS; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test EXPORTS = "`$SED 1q
$export_symbols`"; then
cp $export_symbols $output_objdir/$soname.def;
else
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs
$compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base
-Xlinker --out-implib -Xlinker $lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs
$compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker
--out-implib -Xlinker $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
;;
haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2
\* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols
>$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags ${wl}-h,$soname
${wl}--retain-symbols-file,$output_objdir/$soname.expsym
${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \*
262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols
>$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags $wl-h,$soname
$wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr
${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+ if test linux-dietlibc = "$host_os"; then
case $cc_basename in
diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking
(!diet-dyn)
esac
fi
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- && test "$tmp_diet" = no
+ && test no = "$tmp_diet"
then
tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for
conv in $convenience\"\"; do test -n \"$conv\" &&
new_convenience=\"$new_convenience,$conv\"; done; func_echo_all
\"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv
in $convenience\"\"; do test -n \"$conv\" &&
new_convenience=\"$new_convenience,$conv\"; done; func_echo_all
\"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group f77 and f90 compilers
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for
conv in $convenience\"\"; do test -n \"$conv\" &&
new_convenience=\"$new_convenience,$conv\"; done; func_echo_all
\"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv
in $convenience\"\"; do test -n \"$conv\" &&
new_convenience=\"$new_convenience,$conv\"; done; func_echo_all
\"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -4820,34 +4820,34 @@ _LT_EOF
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for
conv in $convenience\"\"; do test -n \"$conv\" &&
new_convenience=\"$new_convenience,$conv\"; done; func_echo_all
\"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv
in $convenience\"\"; do test -n \"$conv\" &&
new_convenience=\"$new_convenience,$conv\"; done; func_echo_all
\"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- _LT_TAGVAR(whole_archive_flag_spec,
$1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do
test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done;
func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec,
$1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test
-z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all
\"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"'
$libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"'
$libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" >
$output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >>
$output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname ${wl}-version-script
${wl}$output_objdir/$libname.ver -o $lib'
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname $wl-version-script
$wl$output_objdir/$libname.ver -o $lib'
fi
case $cc_basename in
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience
--no-whole-archive'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs
$linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" >
$output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >>
$output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
@@ -4865,8 +4865,8 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs
$linker_flags -o $lib'
wlarc=
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs
$deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file
$wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs
$deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file
$wl$export_symbols -o $lib'
fi
;;
@@ -4884,8 +4884,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null;
then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs
$deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file
$wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs
$deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file
$wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4912,9 +4912,9 @@ _LT_EOF
# DT_RUNPATH tag from executables and libraries. But doing so
# requires that you compile everything twice, which is a pain.
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null;
then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file
$wl$export_symbols -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file
$wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4931,15 +4931,15 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs
$deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file
$wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs
$deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file
$wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
;;
esac
- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+ if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
runpath_var=
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
_LT_TAGVAR(export_dynamic_flag_spec, $1)=
@@ -4955,7 +4955,7 @@ _LT_EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_TAGVAR(hardcode_direct, $1)=unsupported
@@ -4963,12 +4963,12 @@ _LT_EOF
;;
aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -4986,7 +4986,7 @@ _LT_EOF
# need to do runtime linking.
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
aix_use_runtimelinking=yes
break
fi
@@ -5009,13 +5009,13 @@ _LT_EOF
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
case $host_os in aix4.[[012]]|aix4.[[012]].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -5034,61 +5034,61 @@ _LT_EOF
;;
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag="$shared_flag "'$wl-G'
fi
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
fi
fi
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to
export.
_LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test yes = "$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec,
$1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname
$libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test
"x${allow_undefined_flag}" != "x"; then func_echo_all
"${wl}${allow_undefined_flag}"; else :; fi`
'"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(hardcode_libdir_flag_spec,
$1)='$wl-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname
$libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n
"$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :;
fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R
$libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R
$libdir:/usr/lib:/lib'
_LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o
$output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"'
$compiler_flags ${wl}${allow_undefined_flag}
'"\${wl}$exp_sym_flag:\$export_symbols"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o
$output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags
$wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec,
$1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec,
$1)='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec,
$1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec,
$1)='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
_LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared
libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o
$output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags
${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS
$output_objdir/$libname$release.a $output_objdir/$soname'
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o
$output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags
$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS
$output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
@@ -5097,7 +5097,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)=''
;;
m68k)
@@ -5127,10 +5127,10 @@ _LT_EOF
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs
$compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q
$export_symbols`" = xEXPORTS; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test EXPORTS = "`$SED 1q
$export_symbols`"; then
sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e
'1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
else
sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' <
$export_symbols > $output_objdir/$soname.exp;
@@ -5149,11 +5149,11 @@ _LT_EOF
case $lt_outputfile in
*.exe|*.EXE) ;;
*)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
;;
esac~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest";
then
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest";
then
$MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest"
-outputresource:"$lt_tool_outputfile" || exit 1;
$RM "$lt_outputfile.manifest";
fi'
@@ -5165,7 +5165,7 @@ _LT_EOF
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags
`func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
@@ -5215,33 +5215,33 @@ _LT_EOF
;;
hpux9*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared
$pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs
$deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv
$output_objdir/$soname $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared
$pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs
$compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv
$output_objdir/$soname $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b
$install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test
$output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b
$install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test
"x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h
${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs
$compiler_flags'
+ if test yes,no = "$GCC,$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname
$wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o
$lib $libobjs $deplibs $linker_flags'
fi
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5249,25 +5249,25 @@ _LT_EOF
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test yes,no = "$GCC,$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o
$lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib
$libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h
${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname
$wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h
${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs
$compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname
$wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib
$libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib
$libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname
${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname
$wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
m4_if($1, [], [
@@ -5275,14 +5275,14 @@ _LT_EOF
# (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP
does)
_LT_LINKER_OPTION([if $CC understands -b],
_LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b
${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b
$wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
[_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir
-o $lib $libobjs $deplibs $linker_flags'])],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b
${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b
$wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
;;
esac
fi
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
@@ -5293,7 +5293,7 @@ _LT_EOF
*)
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
@@ -5304,16 +5304,16 @@ _LT_EOF
;;
irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" &&
func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry
${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all
"$wl-set_version $wl$verstring"` $wl-update_registry
$wl$output_objdir/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
# This should be the same for all languages, so no per-tag cache
variable.
AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
[lt_cv_irix_exported_symbol],
- [save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo
${wl}-update_registry ${wl}/dev/null"
+ [save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo
$wl-update_registry $wl/dev/null"
AC_LINK_IFELSE(
[AC_LANG_SOURCE(
[AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
@@ -5326,16 +5326,16 @@ _LT_EOF
end]])])],
[lt_cv_irix_exported_symbol=yes],
[lt_cv_irix_exported_symbol=no])
- LDFLAGS="$save_LDFLAGS"])
- if test "$lt_cv_irix_exported_symbol" = yes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs
$deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" &&
func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry
${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o
$lib'
+ LDFLAGS=$save_LDFLAGS])
+ if test yes = "$lt_cv_irix_exported_symbol"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs
$deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" &&
func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry
$wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags -soname $soname `test -n "$verstring" && func_echo_all
"-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o
$lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags -soname $soname `test -n "$verstring" && func_echo_all
"-set_version $verstring"` -update_registry ${output_objdir}/so_locations
-exports_file $export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags -soname $soname `test -n "$verstring" && func_echo_all
"-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags -soname $soname `test -n "$verstring" && func_echo_all
"-set_version $verstring"` -update_registry $output_objdir/so_locations
-exports_file $export_symbols -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(inherit_rpath, $1)=yes
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -5355,7 +5355,7 @@ _LT_EOF
newsos6)
_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs
$deplibs $linker_flags'
_LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -5368,11 +5368,11 @@ _LT_EOF
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test
"$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test
openbsd2.8-powerpc = "$host_os-$host_cpu"; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs
$deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib
$libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib
$libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
else
case $host_os in
openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
@@ -5381,7 +5381,7 @@ _LT_EOF
;;
*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib
$libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
;;
esac
fi
@@ -5399,28 +5399,28 @@ _LT_EOF
;;
osf3*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag}
$libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n
"$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"`
${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs
$deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" &&
func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry
$wl$output_objdir/so_locations -o $lib'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag}
$libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" &&
func_echo_all "-set_version $verstring"` -update_registry
${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs
$deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all
"-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
;;
osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag}
$pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname
${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version
${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o
$lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag
$pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname
`test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"`
$wl-update_registry $wl$output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag}
$libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring"
&& func_echo_all "-set_version $verstring"` -update_registry
${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs
$deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" &&
func_echo_all "-set_version $verstring"` -update_registry
$output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do
printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n"
"-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp
$compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" &&
$ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations
-o $lib~$RM $lib.exp'
+ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags
$libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version
$verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5431,24 +5431,24 @@ _LT_EOF
solaris*)
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text
${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ wlarc='$wl'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text
$wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat
$export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >>
$lib.exp~
- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h
${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h
$wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
wlarc=''
- _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h
$soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname
-o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat
$export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >>
$lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs
$deplibs $linker_flags~$RM $lib.exp'
+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs
$deplibs $linker_flags~$RM $lib.exp'
;;
*)
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h
$soname -o $lib $libobjs $deplibs $compiler_flags'
+ wlarc='$wl'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname
-o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat
$export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >>
$lib.exp~
- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs
$deplibs $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs
$deplibs $compiler_flags~$RM $lib.exp'
;;
esac
fi
@@ -5461,8 +5461,8 @@ _LT_EOF
# 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 "$GCC" = yes; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z
${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z
${wl}allextract$convenience $wl-z ${wl}defaultextract'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z
defaultextract'
fi
@@ -5472,10 +5472,10 @@ _LT_EOF
;;
sunos4*)
- if test "x$host_vendor" = xsequent; then
+ if test sequent = "$host_vendor"; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs
$deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs
$deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib
$libobjs $deplibs $linker_flags'
fi
@@ -5524,17 +5524,17 @@ _LT_EOF
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* |
sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib
$libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared
${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs
$compiler_flags'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib
$libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared
$wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs
$compiler_flags'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs
$deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G
${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs
$compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs
$deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols
$wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
@@ -5545,22 +5545,22 @@ _LT_EOF
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib
$libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared
${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs
$compiler_flags'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib
$libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared
$wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs
$compiler_flags'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs
$deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G
${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs
$compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs
$deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols
$wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
@@ -5575,17 +5575,17 @@ _LT_EOF
;;
esac
- if test x$host_vendor = xsni; then
+ if test sni = "$host_vendor"; then
case $host in
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
;;
esac
fi
fi
])
AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
@@ -5602,7 +5602,7 @@ x|xyes)
# Assume -lc should be added
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $_LT_TAGVAR(archive_cmds, $1) in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -5682,12 +5682,12 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
_LT_TAGDECL([], [hardcode_libdir_separator], [1],
[Whether we need a single "-rpath" flag with a separated argument])
_LT_TAGDECL([], [hardcode_direct], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
DIR into the resulting binary])
_LT_TAGDECL([], [hardcode_direct_absolute], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
DIR into the resulting binary and the resulting library dependency is
- "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+ "absolute", i.e impossible to change by setting $shlibpath_var if the
library is relocated])
_LT_TAGDECL([], [hardcode_minus_L], [0],
[Set to "yes" if using the -LDIR flag during linking hardcodes DIR
@@ -5731,7 +5731,7 @@ dnl [Compiler flag to generate thread safe objects])
# the compiler configuration to `libtool'.
m4_defun([_LT_LANG_C_CONFIG],
[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
+lt_save_CC=$CC
AC_LANG_PUSH(C)
# Source file extension for C test sources.
@@ -5776,13 +5776,13 @@ if test -n "$compiler"; then
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
@@ -5790,8 +5790,8 @@ if test -n "$compiler"; then
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
+ test yes = "$enable_shared" && enable_static=no
fi
;;
esac
@@ -5799,13 +5799,13 @@ if test -n "$compiler"; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
_LT_CONFIG($1)
fi
AC_LANG_POP
-CC="$lt_save_CC"
+CC=$lt_save_CC
])# _LT_LANG_C_CONFIG
@@ -5818,9 +5818,9 @@ m4_defun([_LT_LANG_CXX_CONFIG],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
+if test -n "$CXX" && ( test no != "$CXX" &&
+ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+ (test g++ != "$CXX"))); then
AC_PROG_CXXCPP
else
_lt_caught_CXX_error=yes
@@ -5862,7 +5862,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the CXX compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="int some_variable = 0;"
@@ -5904,35 +5904,35 @@ if test "$_lt_caught_CXX_error" != yes; then
if test -n "$compiler"; then
# We don't want -fno-exception when compiling C++ code, so set the
# no_builtin_flag separately
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
else
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
fi
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
# Set up default GNU C++ configuration
LT_PATH_LD
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname
$wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname
$wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ if test yes = "$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname
$wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname
$wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# If archive_cmds runs LD, not CC, wlarc should be empty
# XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
# investigate it a little bit more. (MM)
- wlarc='${wl}'
+ wlarc='$wl'
# ancient GNU ld didn't support --whole-archive et. al.
if eval "`$CC -print-prog-name=ld` --help 2>&1" |
$GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec,
$1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec,
$1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=
fi
@@ -5968,12 +5968,12 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=no
;;
aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
aix_use_runtimelinking=no
@@ -6007,13 +6007,13 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
case $host_os in aix4.[[012]]|aix4.[[012]].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -6031,56 +6031,56 @@ if test "$_lt_caught_CXX_error" != yes; then
fi
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag=$shared_flag' $wl-G'
fi
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
fi
fi
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to
# export.
_LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test yes = "$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec,
$1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec,
$1)='$wl-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname
$libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test
"x${allow_undefined_flag}" != "x"; then func_echo_all
"${wl}${allow_undefined_flag}"; else :; fi`
'"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname
$libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n
"$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :;
fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R
$libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R
$libdir:/usr/lib:/lib'
_LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o
$output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"'
$compiler_flags ${wl}${allow_undefined_flag}
'"\${wl}$exp_sym_flag:\$export_symbols"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o
$output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags
$wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec,
$1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec,
$1)='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec,
$1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec,
$1)='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
_LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
@@ -6088,7 +6088,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o
$output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags
${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS
$output_objdir/$libname$release.a $output_objdir/$soname'
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o
$output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags
$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS
$output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
@@ -6098,7 +6098,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <address@hidden> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6126,10 +6126,10 @@ if test "$_lt_caught_CXX_error" != yes; then
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs
$compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q
$export_symbols`" = xEXPORTS; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test EXPORTS = "`$SED 1q
$export_symbols`"; then
$SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e
'1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
else
$SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' <
$export_symbols > $output_objdir/$soname.exp;
@@ -6146,12 +6146,12 @@ if test "$_lt_caught_CXX_error" != yes; then
case $lt_outputfile in
*.exe|*.EXE) ;;
*)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
;;
esac~
func_to_tool_file "$lt_outputfile"~
- if test "$MANIFEST_TOOL" != ":" && test -f
"$lt_outputfile.manifest"; then
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest";
then
$MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest"
-outputresource:"$lt_tool_outputfile" || exit 1;
$RM "$lt_outputfile.manifest";
fi'
@@ -6161,22 +6161,22 @@ if test "$_lt_caught_CXX_error" != yes; then
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname
${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname
$wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q
$export_symbols`" = xEXPORTS; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test EXPORTS = "`$SED 1q
$export_symbols`"; then
cp $export_symbols $output_objdir/$soname.def;
else
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname
${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname
$wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6225,14 +6225,14 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
hpux9*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
# but as the default
@@ -6244,7 +6244,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=no
;;
aCC*)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b
${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs
$deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib ||
mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b
$wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs
$deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" =
"x$lib" || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -6253,11 +6253,11 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v
conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z
in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac;
done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v
conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z
in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac;
done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC
-shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o
$output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname
$lib'
+ if test yes = "$GXX"; then
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC
-shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test
"x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -6267,15 +6267,15 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
hppa*64*|ia64*)
;;
*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
;;
esac
fi
@@ -6301,13 +6301,13 @@ if test "$_lt_caught_CXX_error" != yes; then
aCC*)
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o
$lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname
${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname
$wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname
${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs
$postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b
$wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags'
;;
esac
# Commands to make compiler produce verbose output that lists
@@ -6318,20 +6318,20 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v
conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z
in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac;
done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v
conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z
in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac;
done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC
${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC
$wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib
$pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib
$pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs
$deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib
$pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib
$pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
@@ -6346,22 +6346,22 @@ if test "$_lt_caught_CXX_error" != yes; then
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2
\* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols
>$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags ${wl}-h,$soname
${wl}--retain-symbols-file,$output_objdir/$soname.expsym
${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \*
262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols
>$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags $wl-h,$soname
$wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr
${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
irix5* | irix6*)
case $cc_basename in
CC*)
# SGI C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname
$soname `test -n "$verstring" && func_echo_all "-set_version $verstring"`
-update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname
$soname `test -n "$verstring" && func_echo_all "-set_version $verstring"`
-update_registry $output_objdir/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -6370,17 +6370,17 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib
$oldobjs'
;;
*)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname
${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version
${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o
$lib'
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname
$wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version
$wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname
${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version
${wl}$verstring"` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname
$wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version
$wl$verstring"` -o $lib'
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
@@ -6393,8 +6393,8 @@ if test "$_lt_caught_CXX_error" != yes; then
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e
'\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e
"s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs
$postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib
$lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext |
$SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED
-e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs
$postdep_objects $compiler_flags --soname $soname -o \$templib
${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e
'\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e
"s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext |
$SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED
-e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs
$postdep_objects $compiler_flags --soname $soname -o \$templib
$wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -6403,10 +6403,10 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext
-o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext;
list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";;
*.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext
-o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext;
list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";;
*.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# Archives containing C++ object files must be created using
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -6420,22 +6420,22 @@ if test "$_lt_caught_CXX_error" != yes; then
# earlier do not add the objects themselves.
case `$CC -V 2>&1` in
*"Version 7."*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o
$lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname
$wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o
$lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname
$wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 8.0 or newer
tmp_idyn=
case $host_cpu in
ia64*) tmp_idyn=' -i_dynamic';;
esac
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs
$deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"'
$libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname
${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs
$deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"'
$libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file
$wl$export_symbols -o $lib'
;;
esac
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec,
$1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(whole_archive_flag_spec,
$1)='$wl--whole-archive$convenience $wl--no-whole-archive'
;;
pgCC* | pgcpp*)
# Portland Group C++ compiler
@@ -6453,26 +6453,26 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir
$predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find
$tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags
${wl}-soname ${wl}$soname -o $lib'
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find
$tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname
$wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir
$predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find
$tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags
${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o
$lib'
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find
$tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname
$wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 6 and above use weak symbols
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname
${wl}$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname
${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname
$wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname
$wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath
${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for
conv in $convenience\"\"; do test -n \"$conv\" &&
new_convenience=\"$new_convenience,$conv\"; done; func_echo_all
\"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for
conv in $convenience\"\"; do test -n \"$conv\" &&
new_convenience=\"$new_convenience,$conv\"; done; func_echo_all
\"$new_convenience\"` $wl--no-whole-archive'
;;
cxx*)
# Compaq C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs
$deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o
$lib ${wl}-retain-symbols-file $wl$export_symbols'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs
$deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o
$lib $wl-retain-symbols-file $wl$export_symbols'
runpath_var=LD_RUN_PATH
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -6486,18 +6486,18 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v
conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED
"s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in
conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac;
done; func_echo_all "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v
conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED
"s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in
conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac;
done; func_echo_all "X$list" | $Xsed'
;;
xl* | mpixl* | bgxl*)
# IBM XL 8.0 on PPC, with GNU ld
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname -o $lib'
+ if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" >
$output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >>
$output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname
$wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname
$wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
;;
*)
@@ -6505,10 +6505,10 @@ if test "$_lt_caught_CXX_error" != yes; then
*Sun\ C*)
# Sun C++ 5.9
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}
-h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC
-G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs
$postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag
-h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag
-h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags $wl-retain-symbols-file $wl$export_symbols'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(whole_archive_flag_spec,
$1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do
test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done;
func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec,
$1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test
-z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all
\"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
# Not sure whether something based on
@@ -6577,11 +6577,11 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test
"$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags
${wl}-retain-symbols-file,$export_symbols -o $lib'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_TAGVAR(whole_archive_flag_spec,
$1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test
openbsd2.8-powerpc = "$host_os-$host_cpu"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags
$wl-retain-symbols-file,$export_symbols -o $lib'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+ _LT_TAGVAR(whole_archive_flag_spec,
$1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
fi
output_verbose_link_cmd=func_echo_all
else
@@ -6597,9 +6597,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e
'\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e
"s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs
$postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib
$lib'
+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e
'\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e
"s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
# Archives containing C++ object files must be created using
@@ -6617,16 +6617,16 @@ if test "$_lt_caught_CXX_error" != yes; then
cxx*)
case $host in
osf3*)
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved
${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC
-shared${allow_undefined_flag} $predep_objects $libobjs $deplibs
$postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" &&
func_echo_all "${wl}-set_version $verstring"` -update_registry
${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath
${wl}$libdir'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved
$wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname
$soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"`
-update_registry $output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
;;
*)
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC
-shared${allow_undefined_flag} $predep_objects $libobjs $deplibs
$postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" &&
func_echo_all "-set_version $verstring"` -update_registry
${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym
-soname $soname `test -n "$verstring" && func_echo_all "-set_version
$verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat
$export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs
$deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input
${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"`
-update_registry ${output_objdir}/so_locations -o $lib~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs
$deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input
$wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"`
-update_registry $output_objdir/so_locations -o $lib~
$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
@@ -6642,21 +6642,21 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v
conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all
"$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in
$templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *)
list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v
conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all
"$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in
$templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *)
list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved
${wl}\*'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved
$wl\*'
case $host in
osf3*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib
${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" &&
func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry
${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib
$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all
"$wl-set_version $wl$verstring"` $wl-update_registry
$wl$output_objdir/so_locations -o $lib'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib
${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" &&
func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry
${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib
$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" &&
func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry
$wl$output_objdir/so_locations -o $lib'
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath
${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
# Commands to make compiler produce verbose output that lists
@@ -6702,9 +6702,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}
-h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname
-o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" >
$lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local:
*; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o
$lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM
$lib.exp'
+ $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6729,19 +6729,19 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
gcx*)
# Green Hills C++ Compiler
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs
$deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs
$deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
_LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib
$oldobjs'
;;
*)
# GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib
$LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags
${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -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~
- $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp -o $lib
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
@@ -6750,9 +6750,9 @@ if test "$_lt_caught_CXX_error" != yes; then
else
# 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_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~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G -nostdlib $wl-M $wl$lib.exp -o $lib $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
@@ -6760,11 +6760,11 @@ if test "$_lt_caught_CXX_error" != yes; then
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext
2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z
${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z
${wl}allextract$convenience $wl-z ${wl}defaultextract'
;;
esac
fi
@@ -6773,19 +6773,19 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* |
sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs
$deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G
${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs
$compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs
$deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G
$wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs
$compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib
$libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared
${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs
$compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib
$libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared
$wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs
$compiler_flags'
;;
esac
;;
@@ -6797,28 +6797,28 @@ if test "$_lt_caught_CXX_error" != yes; then
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib
$libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G
${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs
$compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs
$deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G
$wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs
$compiler_flags'
_LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
'"$_LT_TAGVAR(old_archive_cmds, $1)"
_LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
'"$_LT_TAGVAR(reload_cmds, $1)"
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib
$libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared
${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs
$compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib
$libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared
$wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs
$compiler_flags'
;;
esac
;;
@@ -6849,10 +6849,10 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
- _LT_TAGVAR(GCC, $1)="$GXX"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$GXX
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -6879,7 +6879,7 @@ if test "$_lt_caught_CXX_error" != yes; then
lt_cv_path_LD=$lt_save_path_LD
lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
AC_LANG_POP
])# _LT_LANG_CXX_CONFIG
@@ -6901,9 +6901,9 @@ AC_REQUIRE([_LT_DECL_SED])
AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
func_stripname_cnf ()
{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ case @S|@2 in
+ .*) func_stripname_result=`$ECHO "@S|@3" | $SED "address@hidden|@1%%;
address@hidden|@2\$%%"`;;
+ *) func_stripname_result=`$ECHO "@S|@3" | $SED "address@hidden|@1%%;
address@hidden|@2\$%%"`;;
esac
} # func_stripname_cnf
])# _LT_FUNC_STRIPNAME_CNF
@@ -6991,13 +6991,13 @@ if AC_TRY_EVAL(ac_compile); then
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case ${prev}${p} in
+ case $prev$p in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
+ if test x-L = "$p" ||
+ test x-R = "$p"; then
prev=$p
continue
fi
@@ -7013,16 +7013,16 @@ if AC_TRY_EVAL(ac_compile); then
case $p in
=*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result
;;
esac
- if test "$pre_test_object_deps_done" = no; then
- case ${prev} in
+ if test no = "$pre_test_object_deps_done"; then
+ case $prev in
-L | -R)
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+ _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
else
- _LT_TAGVAR(compiler_lib_search_path,
$1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+ _LT_TAGVAR(compiler_lib_search_path,
$1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
fi
;;
# The "-l" case would never come before the object being
@@ -7030,9 +7030,9 @@ if AC_TRY_EVAL(ac_compile); then
esac
else
if test -z "$_LT_TAGVAR(postdeps, $1)"; then
- _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+ _LT_TAGVAR(postdeps, $1)=$prev$p
else
- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
fi
fi
prev=
@@ -7047,15 +7047,15 @@ if AC_TRY_EVAL(ac_compile); then
continue
fi
- if test "$pre_test_object_deps_done" = no; then
+ if test no = "$pre_test_object_deps_done"; then
if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
- _LT_TAGVAR(predep_objects, $1)="$p"
+ _LT_TAGVAR(predep_objects, $1)=$p
else
_LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
fi
else
if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
- _LT_TAGVAR(postdep_objects, $1)="$p"
+ _LT_TAGVAR(postdep_objects, $1)=$p
else
_LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
fi
@@ -7102,7 +7102,7 @@ linux*)
;;
esac
- if test "$solaris_use_stlport4" != yes; then
+ if test yes != "$solaris_use_stlport4"; then
_LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
fi
;;
@@ -7125,7 +7125,7 @@ solaris*)
# Adding this requires a known-good setup of shared libraries for
# Sun compiler versions before 5.6, else PIC objects from an old
# archive will be linked into the output, leading to subtle bugs.
- if test "$solaris_use_stlport4" != yes; then
+ if test yes != "$solaris_use_stlport4"; then
_LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
fi
;;
@@ -7139,7 +7139,7 @@ case " $_LT_TAGVAR(postdeps, $1) " in
esac
_LT_TAGVAR(compiler_lib_search_dirs, $1)=
if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo "
${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^
!!'`
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo "
${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
fi
_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
[The directories searched by this compiler when creating a shared library])
@@ -7162,7 +7162,7 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
# to write the compiler configuration to `libtool'.
m4_defun([_LT_LANG_F77_CONFIG],
[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
+if test -z "$F77" || test no = "$F77"; then
_lt_disable_F77=yes
fi
@@ -7199,7 +7199,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the F77 compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
+if test yes != "$_lt_disable_F77"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="\
subroutine t
@@ -7221,7 +7221,7 @@ if test "$_lt_disable_F77" != yes; then
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
+ lt_save_CC=$CC
lt_save_GCC=$GCC
lt_save_CFLAGS=$CFLAGS
CC=${F77-"f77"}
@@ -7235,21 +7235,21 @@ if test "$_lt_disable_F77" != yes; then
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ;
then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
+ test yes = "$enable_shared" && enable_static=no
fi
;;
esac
@@ -7257,11 +7257,11 @@ if test "$_lt_disable_F77" != yes; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
- _LT_TAGVAR(GCC, $1)="$G77"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$G77
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -7278,9 +7278,9 @@ if test "$_lt_disable_F77" != yes; then
fi # test -n "$compiler"
GCC=$lt_save_GCC
- CC="$lt_save_CC"
- CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
+ CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
AC_LANG_POP
])# _LT_LANG_F77_CONFIG
@@ -7294,7 +7294,7 @@ AC_LANG_POP
m4_defun([_LT_LANG_FC_CONFIG],
[AC_LANG_PUSH(Fortran)
-if test -z "$FC" || test "X$FC" = "Xno"; then
+if test -z "$FC" || test no = "$FC"; then
_lt_disable_FC=yes
fi
@@ -7331,7 +7331,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the FC compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
+if test yes != "$_lt_disable_FC"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="\
subroutine t
@@ -7353,7 +7353,7 @@ if test "$_lt_disable_FC" != yes; then
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
+ lt_save_CC=$CC
lt_save_GCC=$GCC
lt_save_CFLAGS=$CFLAGS
CC=${FC-"f95"}
@@ -7369,21 +7369,21 @@ if test "$_lt_disable_FC" != yes; then
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ;
then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
+ test yes = "$enable_shared" && enable_static=no
fi
;;
esac
@@ -7391,11 +7391,11 @@ if test "$_lt_disable_FC" != yes; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -7415,7 +7415,7 @@ if test "$_lt_disable_FC" != yes; then
GCC=$lt_save_GCC
CC=$lt_save_CC
CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
+fi # test yes != "$_lt_disable_FC"
AC_LANG_POP
])# _LT_LANG_FC_CONFIG
@@ -7459,7 +7459,7 @@ CC=${GCJ-"gcj"}
CFLAGS=$GCJFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
_LT_CC_BASENAME([$compiler])
# GCJ did not exist at the time GCC didn't implicitly link libc in.
@@ -7530,7 +7530,7 @@ CC=${GOC-"gccgo"}
CFLAGS=$GOFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
_LT_CC_BASENAME([$compiler])
# Go did not exist at the time GCC didn't implicitly link libc in.
@@ -7583,7 +7583,7 @@ _LT_TAGVAR(objext, $1)=$objext
lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
+lt_simple_link_test_code=$lt_simple_compile_test_code
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_TAG_COMPILER
@@ -7593,7 +7593,7 @@ _LT_COMPILER_BOILERPLATE
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
lt_save_CFLAGS=$CFLAGS
lt_save_GCC=$GCC
GCC=
@@ -7622,7 +7622,7 @@ AC_DEFUN([LT_PROG_GCJ],
[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
[m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
[AC_CHECK_TOOL(GCJ, gcj,)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+ test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
AC_SUBST(GCJFLAGS)])])[]dnl
])
@@ -7733,7 +7733,7 @@ lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
- test ! -f $lt_ac_sed && continue
+ test ! -f "$lt_ac_sed" && continue
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -7750,9 +7750,9 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
$lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
cmp -s conftest.out conftest.nl || break
# 10000 chars as input seems more than enough
- test $lt_ac_count -gt 10 && break
+ test 10 -le "$lt_ac_count" && break
lt_ac_count=`expr $lt_ac_count + 1`
- if test $lt_ac_count -gt $lt_ac_max; then
+ if test "$lt_ac_count" -gt "$lt_ac_max"; then
lt_ac_max=$lt_ac_count
lt_cv_path_SED=$lt_ac_sed
fi
@@ -7779,10 +7779,10 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
# Try some XSI features
xsi_shell=no
-( _lt_dummy="a/b/c"
+( _lt_dummy=a/b/c
test
"${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
= c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
+ && eval 'test 2 -eq $(( 1 + 1 )) \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
AC_MSG_RESULT([$xsi_shell])
@@ -7844,27 +7844,27 @@ test 0 -eq $? || _lt_function_replace_fail=:
m4_defun([_LT_PROG_REPLACE_SHELLFNS],
[if test x"$xsi_shell" = xyes; then
_LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
+ case @S|@1 in
+ */*) func_dirname_result=${1%/address@hidden|@2 ;;
+ * ) address@hidden|@3 ;;
esac])
_LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
- func_basename_result="${1##*/}"])
+ func_basename_result=${1##*/}])
_LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
+ case @S|@1 in
+ */*) func_dirname_result=${1%/address@hidden|@2 ;;
+ * ) address@hidden|@3 ;;
esac
- func_basename_result="${1##*/}"])
+ func_basename_result=${1##*/}])
_LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
# pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
# positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}])
+ address@hidden|@3
+ func_stripname_result=${func_stripname_result#"@S|@1"}
+ func_stripname_result=${func_stripname_result%"@S|@2"}])
_LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
func_split_long_opt_name=${1%%=*}
@@ -7875,9 +7875,9 @@ m4_defun([_LT_PROG_REPLACE_SHELLFNS],
func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
_LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
+ case @S|@1 in
+ *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+ *) address@hidden|@1 ;;
esac])
_LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
@@ -7888,12 +7888,12 @@ m4_defun([_LT_PROG_REPLACE_SHELLFNS],
fi
if test x"$lt_shell_append" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "@S|@address@hidden|@2"])
_LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
- func_quote_for_eval "${2}"
+ func_quote_for_eval "@S|@2"
dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
- eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+ eval "@S|@1+=\\\\ \\$func_quote_for_eval_result"])
# Save a `func_append' function call where possible by direct use of '+='
sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile >
$cfgfile.tmp \
diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index ea76f4d..6cb5727 100644
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -41,16 +41,16 @@ 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]),
[-1], [m4_ifdef([_AC_HAVE_TOP_BUILD_PREFIX],
- [${top_build_prefix}],
- [${top_builddir}/])],
- [${top_build_prefix}])],
- [${top_builddir}/])[]dnl
+ [$(top_build_prefix)],
+ [$(top_builddir)/])],
+ [$(top_build_prefix)])],
+ [$(top_builddir)/])[]dnl
])
@@ -60,8 +60,8 @@ m4_define([_LT_BUILD_PREFIX],
# LTDLINCL to the include flags for the libltdl header and adds
# --enable-ltdl-convenience to the configure arguments. Note that
# AC_CONFIG_SUBDIRS is not called here. LIBLTDL will be prefixed with
-# '${top_build_prefix}' if available, otherwise with '${top_builddir}/',
-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+# '$(top_build_prefix)' if available, otherwise with '$(top_builddir)/',
+# and LTDLINCL will be prefixed with '$(top_srcdir)/' (note the single
# quotes!). If your package is not flat and you're not using automake,
# define top_build_prefix, top_builddir, and top_srcdir appropriately
# in your Makefiles.
@@ -97,14 +97,14 @@ m4_defun([_LTDL_CONVENIENCE],
esac
LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la"
LTDLDEPS=$LIBLTDL
-LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
+LTDLINCL='-I$(top_srcdir)'"${lt_ltdl_dir+/$lt_ltdl_dir}"
AC_SUBST([LIBLTDL])
AC_SUBST([LTDLDEPS])
AC_SUBST([LTDLINCL])
# For backwards non-gettext consistent compatibility...
-INCLTDL="$LTDLINCL"
+INCLTDL=$LTDLINCL
AC_SUBST([INCLTDL])
])# _LTDL_CONVENIENCE
@@ -115,9 +115,9 @@ AC_SUBST([INCLTDL])
# and LTDLINCL to the include flags for the libltdl header and adds
# --enable-ltdl-install to the configure arguments. Note that
# AC_CONFIG_SUBDIRS is not called from here. If an installed libltdl
-# is not found, LIBLTDL will be prefixed with '${top_build_prefix}' if
-# available, otherwise with '${top_builddir}/', and LTDLINCL will be
-# prefixed with '${top_srcdir}/' (note the single quotes!). If your
+# is not found, LIBLTDL will be prefixed with '$(top_build_prefix)' if
+# available, otherwise with '$(top_builddir)/', and LTDLINCL will be
+# prefixed with '$(top_srcdir)/' (note the single quotes!). If your
# package is not flat and you're not using automake, define top_build_prefix,
# top_builddir, and top_srcdir appropriately in your Makefiles.
# In the future, this macro may have to be called after LT_INIT.
@@ -146,18 +146,18 @@ dnl AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [])
# -----------------
# Code shared by LTDL_INSTALLABLE and LTDL_INIT([installable]).
m4_defun([_LTDL_INSTALLABLE],
-[if test -f $prefix/lib/libltdl.la; then
- lt_save_LDFLAGS="$LDFLAGS"
+[if test -f "$prefix/lib/libltdl.la"; then
+ lt_save_LDFLAGS=$LDFLAGS
LDFLAGS="-L$prefix/lib $LDFLAGS"
AC_CHECK_LIB([ltdl], [lt_dlinit], [lt_lib_ltdl=yes])
- LDFLAGS="$lt_save_LDFLAGS"
- if test x"${lt_lib_ltdl-no}" = xyes; then
- if test x"$enable_ltdl_install" != xyes; then
+ LDFLAGS=$lt_save_LDFLAGS
+ 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'])
enable_ltdl_install=no
fi
- elif test x"$enable_ltdl_install" = xno; then
+ elif test no = "$enable_ltdl_install"; then
AC_MSG_WARN([libltdl not installed, but installation disabled])
fi
fi
@@ -166,7 +166,7 @@ fi
# with --disable-ltdl-install, we will install the shipped libltdl.
case $enable_ltdl_install in
no) ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
- LIBLTDL="-lltdl"
+ LIBLTDL=-lltdl
LTDLDEPS=
LTDLINCL=
;;
@@ -174,7 +174,7 @@ case $enable_ltdl_install in
ac_configure_args="$ac_configure_args --enable-ltdl-install"
LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdl.la"
LTDLDEPS=$LIBLTDL
- LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
+ LTDLINCL='-I$(top_srcdir)'"${lt_ltdl_dir+/$lt_ltdl_dir}"
;;
esac
@@ -183,7 +183,7 @@ AC_SUBST([LTDLDEPS])
AC_SUBST([LTDLINCL])
# For backwards non-gettext consistent compatibility...
-INCLTDL="$LTDLINCL"
+INCLTDL=$LTDLINCL
AC_SUBST([INCLTDL])
])# LTDL_INSTALLABLE
@@ -197,8 +197,8 @@ m4_if(_LTDL_DIR, [],
dnl if _LTDL_MODE was not set already, the default value is `subproject':
[m4_case(m4_default(_LTDL_MODE, [subproject]),
[subproject], [AC_CONFIG_SUBDIRS(_LTDL_DIR)
- _LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"])],
- [nonrecursive], [_LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir";
lt_libobj_prefix="$lt_ltdl_dir/"])],
+ _LT_SHELL_INIT([lt_dlopen_dir=$lt_ltdl_dir])],
+ [nonrecursive], [_LT_SHELL_INIT([lt_dlopen_dir=$lt_ltdl_dir;
lt_libobj_prefix=$lt_ltdl_dir/])],
[recursive], [],
[m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])])dnl
dnl Be careful not to expand twice:
@@ -243,7 +243,7 @@ AC_ARG_WITH([included_ltdl],
[AS_HELP_STRING([--with-included-ltdl],
[use the GNU ltdl sources included here])])
-if test "x$with_included_ltdl" != xyes; then
+if test yes != "$with_included_ltdl"; then
# We are not being forced to use the included libltdl sources, so
# decide whether there is a useful installed version we can use.
AC_CHECK_HEADER([ltdl.h],
@@ -312,10 +312,10 @@ case
,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in
*) with_included_ltdl=no
LIBLTDL="-L$with_ltdl_lib -lltdl"
LTDLDEPS=
- LTDLINCL="-I$with_ltdl_include"
+ LTDLINCL=-I$with_ltdl_include
;;
esac
-INCLTDL="$LTDLINCL"
+INCLTDL=$LTDLINCL
# Report our decision...
AC_MSG_CHECKING([where to find libltdl headers])
@@ -397,7 +397,7 @@ m4_pattern_allow([^LT_CONFIG_H$])dnl
m4_ifset([AH_HEADER],
[LT_CONFIG_H=AH_HEADER],
[m4_ifset([AC_LIST_HEADERS],
- [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's,^[[ ]]*,,;s,[[
:]].*$,,'`],
+ [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's|^[[ ]]*||;s|[[
:]].*$||'`],
[])])])
AC_SUBST([LT_CONFIG_H])
@@ -427,14 +427,14 @@ m4_define([_LT_ENABLE_INSTALL],
[AC_ARG_ENABLE([ltdl-install],
[AS_HELP_STRING([--enable-ltdl-install], [install libltdl])])
-case ,${enable_ltdl_install},${enable_ltdl_convenience} in
+case ,$enable_ltdl_install,$enable_ltdl_convenience in
*yes*) ;;
*) enable_ltdl_convenience=yes ;;
esac
m4_ifdef([AM_CONDITIONAL],
-[AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
- AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" !=
xno)])
+[AM_CONDITIONAL(INSTALL_LTDL, test no != "${enable_ltdl_install-no}")
+ AM_CONDITIONAL(CONVENIENCE_LTDL, test no != "${enable_ltdl_convenience-no}")])
])# _LT_ENABLE_INSTALL
@@ -532,7 +532,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
;;
esac
])
-if test "$lt_cv_sys_dlopen_deplibs" != yes; then
+if test yes != "$lt_cv_sys_dlopen_deplibs"; then
AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1],
[Define if the OS needs help to load dependent libraries for dlopen().])
fi
@@ -579,7 +579,7 @@ dnl AC_DEFUN([AC_LTDL_SHLIBEXT], [])
AC_DEFUN([LT_SYS_MODULE_PATH],
[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
AC_CACHE_CHECK([which variable specifies run-time module search path],
- [lt_cv_module_path_var], [lt_cv_module_path_var="$shlibpath_var"])
+ [lt_cv_module_path_var], [lt_cv_module_path_var=$shlibpath_var])
if test -n "$lt_cv_module_path_var"; then
m4_pattern_allow([LT_MODULE_PATH_VAR])dnl
AC_DEFINE_UNQUOTED([LT_MODULE_PATH_VAR], ["$lt_cv_module_path_var"],
@@ -599,14 +599,14 @@ AC_DEFUN([LT_SYS_DLSEARCH_PATH],
[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
AC_CACHE_CHECK([for the default library search path],
[lt_cv_sys_dlsearch_path],
- [lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"])
+ [lt_cv_sys_dlsearch_path=$sys_lib_dlsearch_path_spec])
if test -n "$lt_cv_sys_dlsearch_path"; then
sys_dlsearch_path=
for dir in $lt_cv_sys_dlsearch_path; do
if test -z "$sys_dlsearch_path"; then
- sys_dlsearch_path="$dir"
+ sys_dlsearch_path=$dir
else
- sys_dlsearch_path="$sys_dlsearch_path$PATH_SEPARATOR$dir"
+ sys_dlsearch_path=$sys_dlsearch_path$PATH_SEPARATOR$dir
fi
done
m4_pattern_allow([LT_DLSEARCH_PATH])dnl
@@ -633,7 +633,7 @@ AC_CACHE_CHECK([whether libtool supports
-dlopen/-dlpreopen],
libltdl_cv_preloaded_symbols=no
fi
])
-if test x"$libltdl_cv_preloaded_symbols" = xyes; then
+if test yes = "$libltdl_cv_preloaded_symbols"; then
AC_DEFINE([HAVE_PRELOADED_SYMBOLS], [1],
[Define if libtool can extract symbol lists from object files.])
fi
@@ -654,9 +654,9 @@ AC_SEARCH_LIBS([dlopen], [dl],
[AC_DEFINE([HAVE_LIBDL], [1],
[Define if you have the libdl library or equivalent.])
if test "$ac_cv_search_dlopen" != "none required" ; then
- LIBADD_DLOPEN="-ldl"
+ LIBADD_DLOPEN=-ldl
fi
- libltdl_cv_lib_dl_dlopen="yes"
+ libltdl_cv_lib_dl_dlopen=yes
LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"],
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if HAVE_DLFCN_H
# include <dlfcn.h>
@@ -664,19 +664,19 @@ AC_SEARCH_LIBS([dlopen], [dl],
]], [[dlopen(0, 0);]])],
[AC_DEFINE([HAVE_LIBDL], [1],
[Define if you have the libdl library or equivalent.])
- libltdl_cv_func_dlopen="yes"
+ libltdl_cv_func_dlopen=yes
LT_DLLOADERS="$LT_DLLOADERS
${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"],
[AC_CHECK_LIB([svld], [dlopen],
[AC_DEFINE([HAVE_LIBDL], [1],
[Define if you have the libdl library or equivalent.])
- LIBADD_DLOPEN="-lsvld" libltdl_cv_func_dlopen="yes"
+ LIBADD_DLOPEN=-lsvld libltdl_cv_func_dlopen=yes
LT_DLLOADERS="$LT_DLLOADERS
${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"])])])
-if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen"
= xyes
+if test yes = "$libltdl_cv_func_dlopen" || test yes =
"$libltdl_cv_lib_dl_dlopen"
then
- lt_save_LIBS="$LIBS"
+ lt_save_LIBS=$LIBS
LIBS="$LIBS $LIBADD_DLOPEN"
AC_CHECK_FUNCS([dlerror])
- LIBS="$lt_save_LIBS"
+ LIBS=$lt_save_LIBS
fi
AC_SUBST([LIBADD_DLOPEN])
@@ -689,7 +689,7 @@ AC_CHECK_FUNC([shl_load],
[AC_DEFINE([HAVE_SHL_LOAD], [1],
[Define if you have the shl_load function.])
LT_DLLOADERS="$LT_DLLOADERS
${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"
- LIBADD_SHL_LOAD="-ldld"])])
+ LIBADD_SHL_LOAD=-ldld])])
AC_SUBST([LIBADD_SHL_LOAD])
case $host_os in
@@ -789,23 +789,23 @@ dnl AC_DEFUN([AC_LTDL_SYMBOL_USCORE], [])
# --------------------
AC_DEFUN([LT_FUNC_DLSYM_USCORE],
[AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl
-if test x"$lt_cv_sys_symbol_underscore" = xyes; then
- if test x"$libltdl_cv_func_dlopen" = xyes ||
- test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then
+if test yes = "$lt_cv_sys_symbol_underscore"; then
+ if test yes = "$libltdl_cv_func_dlopen" ||
+ test yes = "$libltdl_cv_lib_dl_dlopen" ; then
AC_CACHE_CHECK([whether we have to add an underscore for dlsym],
[libltdl_cv_need_uscore],
[libltdl_cv_need_uscore=unknown
- save_LIBS="$LIBS"
+ save_LIBS=$LIBS
LIBS="$LIBS $LIBADD_DLOPEN"
_LT_TRY_DLOPEN_SELF(
[libltdl_cv_need_uscore=no], [libltdl_cv_need_uscore=yes],
[], [libltdl_cv_need_uscore=cross])
- LIBS="$save_LIBS"
+ LIBS=$save_LIBS
])
fi
fi
-if test x"$libltdl_cv_need_uscore" = xyes; then
+if test yes = "$libltdl_cv_need_uscore"; then
AC_DEFINE([NEED_USCORE], [1],
[Define if dlsym() requires a leading underscore in symbol names.])
fi
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
index 301b0a3..e255a04 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -172,14 +172,14 @@ AC_ARG_ENABLE([shared],
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
@@ -226,14 +226,14 @@ AC_ARG_ENABLE([static],
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_static=]_LT_ENABLE_STATIC_DEFAULT)
@@ -280,14 +280,14 @@ AC_ARG_ENABLE([fast-install],
*)
enable_fast_install=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_fast_install=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
@@ -334,14 +334,14 @@ m4_define([_LT_WITH_PIC],
*)
pic_mode=default
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for lt_pkg in $withval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$lt_pkg" = "X$lt_p"; then
pic_mode=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[pic_mode=default])
diff --git a/tests/bindir.at b/tests/bindir.at
index 4e2fecc..33fd1da 100644
--- a/tests/bindir.at
+++ b/tests/bindir.at
@@ -64,7 +64,7 @@
AT_SETUP([bindir basic lib test])
bindirneeded=:
-case "$host_os" in
+case $host_os in
cygwin*|mingw*|cegcc*)
;;
*)
@@ -173,7 +173,7 @@ AT_CLEANUP
AT_SETUP([bindir install tests])
bindirneeded=:
-case "$host_os" in
+case $host_os in
cygwin*|mingw*|cegcc*)
;;
*)
@@ -182,7 +182,7 @@ case "$host_os" in
esac
eval "`$LIBTOOL --config | grep '^build_libtool_libs='`"
-AT_CHECK([test "$build_libtool_libs" = yes || exit 77])
+AT_CHECK([test yes = "$build_libtool_libs" || exit 77])
####
# These routines save the PATH before a test and restore it after,
@@ -276,7 +276,7 @@ do
# simplify this check by taking advantage of the fact that if it's a DLL,
# it has to go in bindir, so we'll not check for both forms in libdir.
if $bindirneeded; then
- AT_CHECK([test -f $libdir/../bin/???foo-0.dll || ls
$libdir/../bin/*foo*0*], [], [ignore], [ignore])
+ AT_CHECK([test -f "$libdir"/../bin/???foo-0.dll || ls
"$libdir"/../bin/*foo*0*], [], [ignore], [ignore])
else
AT_CHECK([ls $libdir/*foo*], [], [ignore], [ignore])
fi
@@ -335,14 +335,14 @@ do
# Recreate directories (bindir already done) and install.
AS_MKDIR_P($libdir)
AS_MKDIR_P($curdir/sbin)
- AT_CHECK([$LIBTOOL --mode=install $lt_INSTALL libfoo.la $libdir], [],
[ignore], [ignore])
- AT_CHECK([$LIBTOOL --mode=install $lt_INSTALL main$EXEEXT
$curdir/sbin/main$EXEEXT], [], [ignore], [ignore])
+ AT_CHECK([$LIBTOOL --mode=install $lt_INSTALL libfoo.la "$libdir"], [],
[ignore], [ignore])
+ AT_CHECK([$LIBTOOL --mode=install $lt_INSTALL main$EXEEXT
"$curdir/sbin/main$EXEEXT"], [], [ignore], [ignore])
# Ensure it went to bindir rather than default dir this time.
if $bindirneeded; then
- AT_CHECK([test -f $bindir/???foo-0.dll || ls $bindir/*foo*0*], [],
[ignore], [ignore])
+ AT_CHECK([test -f "$bindir"/???foo-0.dll || ls "$bindir"/*foo*0*], [],
[ignore], [ignore])
else
- AT_CHECK([ls $libdir/*foo*], [], [ignore], [ignore])
+ AT_CHECK([ls "$libdir"/*foo*], [], [ignore], [ignore])
fi
# And that it can be executed.
diff --git a/tests/cdemo-undef.test b/tests/cdemo-undef.test
index 7d5cd9b..732e355 100755
--- a/tests/cdemo-undef.test
+++ b/tests/cdemo-undef.test
@@ -34,7 +34,7 @@ grep '^allow_undefined_flag=.\{0,1\}unsupported.\{0,1\}$'
./libtool >/dev/null 2
&& func_skip "$host doesn't support undefined symbols in shared libs"
if test -f ./libtool; then
- $SED 's,allow_undefined=no,allow_undefined=yes,g' ./libtool > ltnew
+ $SED 's|allow_undefined=no|allow_undefined=yes|g' ./libtool > ltnew
else
exit 1
fi
diff --git a/tests/cmdline_wrap.at b/tests/cmdline_wrap.at
index c7f5671..79a3931 100644
--- a/tests/cmdline_wrap.at
+++ b/tests/cmdline_wrap.at
@@ -30,7 +30,7 @@ AT_KEYWORDS([recursive expensive])
m4_ifdef([AT_CAPTURE_FILE],
[AT_CAPTURE_FILE([testsuite.log])])
-sed 's,max_cmd_len=.*,max_cmd_len="24",' < $LIBTOOL > libtool
+sed 's|max_cmd_len=.*|max_cmd_len="24"|' < $LIBTOOL > libtool
chmod +x libtool
LIBTOOL=`pwd`/libtool
export LIBTOOL
diff --git a/tests/configure-iface.at b/tests/configure-iface.at
index 2071646..e63b5c6 100644
--- a/tests/configure-iface.at
+++ b/tests/configure-iface.at
@@ -145,8 +145,8 @@ 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
-AT_CHECK([test -f $prefix/lib/libltdl.la])
-AT_CHECK([test -f $prefix/include/ltdl.h])
+AT_CHECK([test -f "$prefix/lib/libltdl.la"])
+AT_CHECK([test -f "$prefix/include/ltdl.h"])
# Check that main is rebuilt if libltdl.la is newer
rm -f libltdl/libltdl.la
@@ -175,8 +175,8 @@ LT_AT_MAKE([all install])
# Remove build files
rm -rf ltdl/
-AT_CHECK([test -f $prefix/lib/libltdl.la])
-AT_CHECK([test -f $prefix/include/ltdl.h])
+AT_CHECK([test -f "$prefix/lib/libltdl.la"])
+AT_CHECK([test -f "$prefix/include/ltdl.h"])
_LT_AT_LTDL_SETUP
diff --git a/tests/cwrapper.at b/tests/cwrapper.at
index 0e5ecb7..b08a61a 100644
--- a/tests/cwrapper.at
+++ b/tests/cwrapper.at
@@ -83,7 +83,7 @@ done
# Test run-time activation of wrapper debugging.
# This is not part of the loop above, because we
# need to check, not ignore, the output.
-CFLAGS="$orig_CFLAGS"
+CFLAGS=$orig_CFLAGS
LIBTOOL=$orig_LIBTOOL
AT_CHECK([$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c liba.c],
@@ -178,7 +178,7 @@ done
IFS=$save_IFS
until $ECHO "PATH=$PATH" | grep 'PATH=.\{250\}'; do
- PATH="$PATH$PATH_SEPARATOR$dirpath"
+ PATH=$PATH$PATH_SEPARATOR$dirpath
done
export PATH
@@ -187,7 +187,7 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS
-no-fast-install ]dnl
[], [ignore], [ignore])
# Skip if no cwrapper is generated.
-AT_CHECK([test -f $objdir/lt-usea.c || exit 77])
+AT_CHECK([test -f "$objdir/lt-usea.c" || exit 77])
# Try to make sure the test is relevant.
AT_CHECK([grep ' *fputs' $objdir/lt-usea.c > /dev/null])
diff --git a/tests/darwin.at b/tests/darwin.at
index 6eab4cd..4b0d789 100644
--- a/tests/darwin.at
+++ b/tests/darwin.at
@@ -25,7 +25,7 @@
AT_BANNER([Mac OS X tests])
AT_SETUP([darwin fat compile])
noskip=:
-case "$host_os" in
+case $host_os in
darwin*) ;;
*) noskip=false ;;
esac
@@ -74,7 +74,7 @@ if test $# != 1; then
exit 1
fi
-echo $1 | sed "s,^.*/,,"
+echo $1 | sed "s|^.*/||"
]])
chmod +x bin/basename
@@ -251,7 +251,7 @@ AT_CHECK([test "$shared_ext" != "$module_ext" || exit 77])
# Skip this test when called from:
# make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install
AT_CHECK([case $LIBLTDL in #(
- */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;;
+ */_inst/lib/*) test -f "$LIBLTDL" || (exit 77) ;;
esac], [], [ignore])
prefix=`pwd`/inst
diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index 56f1ecc..31089a8 100644
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -45,7 +45,7 @@ fi
# How verbose should we be? Default is test output in log file.
# Setting VERBOSE=debug puts the shell in debug mode.
debug_cmd=:
-case "$VERBOSE" in
+case $VERBOSE in
DEBUG | debug )
debug_cmd='set -x'
$debug_cmd
@@ -79,14 +79,14 @@ func_get_config ()
{
$debug_cmd
- my_varname_list="$1"
- my_src="$2"
- my_failp="false"; test -z "$3" || my_failp=:
- my_regex="$4"
+ my_varname_list=$1
+ my_src=$2
+ my_failp=false; test -z "$3" || my_failp=:
+ my_regex=$4
my_exitp=false
if test -z "$my_regex"; then
- my_regex="^("
+ my_regex='^('
my_build_regex=:
else
my_build_regex=false
@@ -97,7 +97,7 @@ func_get_config ()
if $my_build_regex; then
$my_first || my_regex="$my_regex|"
my_first=false
- my_regex="$my_regex$my_varname"
+ my_regex=$my_regex$my_varname
fi
eval $my_varname=NONE
done
@@ -141,7 +141,7 @@ func_rmprefixdir ()
{
$debug_cmd
- test -d $prefix && rm -rf $prefix
+ test -d "$prefix" && rm -rf "$prefix"
prefix=NONE
}
@@ -151,7 +151,7 @@ func_cd ()
{
$debug_cmd
- my_dir="$1"
+ my_dir=$1
# Maybe we have a VPATH build, in which case, create a new subdir.
func_mkdir_p "$my_dir"
@@ -167,12 +167,12 @@ func_require ()
{
$debug_cmd
- my_prereq="$1"; shift
+ my_prereq=$1; shift
my_files=${1+"$@"}
for my_file in $my_files; do
test -f "$my_file" \
- || func_skip "You must run ${my_prereq}.test before running $0"
+ || func_skip "You must run $my_prereq.test before running $0"
done
}
@@ -185,17 +185,17 @@ func_configure_nofail ()
my_args=${1+"$@"}
func_dirname_and_basename "`pwd`"
my_dir=$func_basename_result
- my_testdir="$abs_srcdir/tests/$my_dir"
+ my_testdir=$abs_srcdir/tests/$my_dir
conf_status=$EXIT_FAILURE
test -n "$my_args" && my_args=" $my_args"
- my_args="--srcdir="\""$my_testdir"\"" --prefix="\""$prefix"\""$my_args"
- test -n "$host_alias" && my_args="$my_args --host=\"$host_alias\""
- test -n "$build_alias" && my_args="$my_args --build=\"$build_alias\""
+ my_args=--srcdir=\"$my_testdir\"" "--prefix=\"$prefix\"$my_args
+ test -n "$host_alias" && my_args=$my_args" "--host=\"$host_alias\"
+ test -n "$build_alias" && my_args=$my_args" "--build=\"$build_alias\"
func_msg "Configuring in $my_dir"
- test -f "$my_testdir/configure" || ${AUTORECONF} --force --install
$my_testdir
+ test -f "$my_testdir/configure" || $AUTORECONF --force --install
$my_testdir
if test -f "$my_testdir/configure"; then
eval func_msg $SHELL "$my_testdir/configure" $my_args
@@ -225,8 +225,8 @@ func_check_static_shared ()
{
$debug_cmd
- my_staticp="$1"
- my_sharedp="$2"
+ my_staticp=$1
+ my_sharedp=$2
if func_grep "^build_old_libs=$staticp" libtool &&
func_grep "^build_libtool_libs=$sharedp" libtool; then :
@@ -302,7 +302,7 @@ func_exec_check ()
{
$debug_cmd
- my_program="$1"
+ my_program=$1
if test -f "$my_program"; then :
else
@@ -319,18 +319,18 @@ func_exec ()
{
$debug_cmd
- my_program="$1"
- my_exp_output="$2"
+ my_program=$1
+ my_exp_output=$2
func_dirname_and_basename "`pwd`"
my_dir=$func_basename_result
test -n "$my_exp_output" \
- && my_exp_output="| $EGREP -e "\""$my_exp_output"\"
+ && my_exp_output="| $EGREP -e "\"$my_exp_output\"
if eval $my_program $my_exp_output; then :
else
shift
- test "x$1" = x || shift
+ test -z "$1" || shift
func_error "$0: cannot execute $my_program address@hidden"
if test "$build" != "$host"; then
@@ -338,7 +338,7 @@ func_exec ()
exec_status=$EXIT_SKIP
else
# Simple check to see if they are superuser.
- if test $exec_status = $EXIT_FAILURE || test -w /; then :
+ if test "$exec_status" = "$EXIT_FAILURE" || test -w /; then :
else
func_msg "You may need to run $0 as the superuser."
fi
@@ -348,7 +348,7 @@ func_exec ()
}
# Shared global variables for test scripts
-prefix=./_inst-`echo "$0" | sed 's,.*/,,; s,-.*,,'`
+prefix=./_inst-`echo "$0" | sed 's|.*/||; s|-.*||'`
abs_srcdir=`cd '@srcdir@' && pwd`
abs_macro_dir=`cd '@srcdir@/@macro_dir@' && pwd`
abs_aux_dir=`cd '@srcdir@/@aux_dir@' && pwd`
diff --git a/tests/demo-hardcode.test b/tests/demo-hardcode.test
index 31b2e1d..269c2ff 100755
--- a/tests/demo-hardcode.test
+++ b/tests/demo-hardcode.test
@@ -49,7 +49,7 @@ hardcode_libdir_flag_spec' "./libtool --config" ": fatal"
echo "= Searching for hardcoded library directories in each program"
for file in hc-*; do
- case "$file" in
+ case $file in
hc-direct) expected="$hardcode_direct" ;;
hc-libpath) expected="$hardcode_shlibpath_var" ;;
hc-minusL) expected="$hardcode_minus_L" ;;
@@ -96,9 +96,9 @@ for file in hc-*; do
fi
# Check the result.
- case "$hardcoded" in
+ case $hardcoded in
yes)
- if test $expected = yes; then
+ if test yes = "$expected"; then
echo "$objdir was hardcoded in \`$file', as libtool expected"
else
echo "$objdir was hardcoded in \`$file', which fooled libtool" 1>&2
@@ -107,7 +107,7 @@ for file in hc-*; do
;;
no)
- if test $expected = no; then
+ if test no = "$expected"; then
echo "$objdir was not hardcoded in \`$file', as libtool expected"
else
echo "$objdir was not hardcoded in \`$file', which fooled libtool" 1>&2
@@ -116,7 +116,7 @@ for file in hc-*; do
;;
unsupported)
- if test $expected = unsupported; then
+ if test unsupported = "$expected"; then
echo "\`$file' was not linked properly, as libtool expected"
else
echo "\`$file' was not linked properly, which fooled libtool" 1>&2
diff --git a/tests/demo-nopic.test b/tests/demo-nopic.test
index acceca6..b44f34b 100755
--- a/tests/demo-nopic.test
+++ b/tests/demo-nopic.test
@@ -25,7 +25,7 @@
. tests/defs || exit 1
-case "$host" in
+case $host in
hppa*|x86_64*|s390*)
func_skip "$host doesn't like non-PIC shared libs"
;;
@@ -36,10 +36,10 @@ esac
if test "$build" = "$host" && test -d "/etc/selinux"; then
_selinux=`getenforce 2>/dev/null || echo "Disabled"`
- case "${_selinux}" in
+ case $_selinux in
*Enforcing)
_sebool_allow_execmod=`getsebool allow_execmod 2>/dev/null`
- case "${_sebool_allow_execmod}" in
+ case $_sebool_allow_execmod in
*off)
func_skip "SELinux policy disallows"
;;
diff --git a/tests/demo-relink.test b/tests/demo-relink.test
index 8310e46..b463441 100755
--- a/tests/demo-relink.test
+++ b/tests/demo-relink.test
@@ -65,7 +65,7 @@ rm -f libhello.la "$objdir"/libhello.*
func_msg "running demo/hell"
if ./hell$EXEEXT; then
:
-elif test "x,$hardcode_action,$hardcode_direct" = x,relink,yes; then
+elif test relink,yes = "$hardcode_action,$hardcode_direct"; then
func_msg "Ok, uninstalled programs fail after uninstalled libraries are
removed."
func_msg "This works in other configurations, but not in this particular
one."
else
@@ -85,12 +85,12 @@ else
func_msg "Failed, as expected"
fi
-if test "x$hardcode_action" = xrelink; then
+if test relink = "$hardcode_action"; then
func_msg "Exiting: install-time relinking is required"
exit $EXIT_SUCCESS
fi
-if test "$shlibpath_overrides_runpath" != yes; then
+if test yes != "$shlibpath_overrides_runpath"; then
rm -f $objdir/lt-hell$EXEEXT || exit $EXIT_FAILURE
cp $objdir/hell$EXEEXT $objdir/lt-hell$EXEEXT || exit $EXIT_FAILURE
func_msg "running demo/hell with installed libhello.la"
diff --git a/tests/demo/configure.ac b/tests/demo/configure.ac
index 7a84441..27a0da5 100644
--- a/tests/demo/configure.ac
+++ b/tests/demo/configure.ac
@@ -51,13 +51,13 @@ LT_INIT([dlopen win32-dll])
AC_SUBST([LIBTOOL_DEPS])
STATIC=
-test "X$enable_static" = Xyes && STATIC=-static
+test yes = "$enable_static" && STATIC=-static
AC_SUBST([STATIC])
case $lt_cv_sys_global_symbol_pipe in
?*) binary_helldl=yes ;;
esac
-AM_CONDITIONAL([BINARY_HELLDL], [test "X$binary_helldl" = Xyes])
+AM_CONDITIONAL([BINARY_HELLDL], [test yes = "$binary_helldl"])
## --------------------------- ##
diff --git a/tests/depdemo-relink.test b/tests/depdemo-relink.test
index cf5c695..382f36c 100755
--- a/tests/depdemo-relink.test
+++ b/tests/depdemo-relink.test
@@ -80,7 +80,7 @@ if ./depdemo$EXEEXT ||
# but it's definitely not enough of a reason for the test to fail.
./depdemo$EXEEXT -alt; then
:
-elif test "x,$hardcode_action,$hardcode_direct" = x,relink,yes; then
+elif test relink,yes = "$hardcode_action,$hardcode_direct"; then
func_msg "Ok, uninstalled programs fail after uninstalled libraries are
removed"
func_msg "This works in other configurations, but not in this particular one"
elif test "$build" != "$host"; then
@@ -107,12 +107,12 @@ else
func_msg "Failed, as expected"
fi
-if test "x$hardcode_action" = xrelink; then
+if test relink = "$hardcode_action"; then
func_msg "Exiting: install-time relinking is required"
exit $EXIT_SUCCESS
fi
-if test "$shlibpath_overrides_runpath" != yes; then
+if test yes != "$shlibpath_overrides_runpath"; then
rm -f $objdir/lt-depdemo || exit $EXIT_FAILURE
cp $objdir/depdemo $objdir/lt-depdemo || exit $EXIT_FAILURE
func_msg "running depdemo/depdemo with installed libl3.la"
diff --git a/tests/depdemo/configure.ac b/tests/depdemo/configure.ac
index 175110c..7405b54 100644
--- a/tests/depdemo/configure.ac
+++ b/tests/depdemo/configure.ac
@@ -52,7 +52,7 @@ AC_SUBST([LIBTOOL_DEPS])
## ------------------------------- ##
## depdemo specific configuration. ##
## ------------------------------- ##
-STATIC="\`${CONFIG_SHELL} ./libtool --features | ${SED} -n -e '/enable
static/s/^.*\$\$/-static/p'\`"
+STATIC="\`$CONFIG_SHELL ./libtool --features |$SED -n -e '/enable
static/s/^.*\$\$/-static/p'\`"
AC_SUBST([STATIC])
## ------------------------------ ##
diff --git a/tests/destdir.at b/tests/destdir.at
index 386c728..cfceb23 100644
--- a/tests/destdir.at
+++ b/tests/destdir.at
@@ -127,7 +127,7 @@ done
LT_AT_EXEC_CHECK([$bindir/m$EXEEXT])
# TODO: make this more portable:
-if test "$OBJDUMP" != false && ($OBJDUMP -p $bindir/m$EXEEXT) >/dev/null 2>&1;
then
+if test false != "$OBJDUMP" && ($OBJDUMP -p $bindir/m$EXEEXT) >/dev/null 2>&1;
then
AT_CHECK([$OBJDUMP -p $bindir/m$EXEEXT | $EGREP -i "R(UN)?PATH.*$DESTDIR"],
[1])
. $libdir/liba.la
set x $library_names
diff --git a/tests/dlloader-api.at b/tests/dlloader-api.at
index 3215c3b..c277e08 100644
--- a/tests/dlloader-api.at
+++ b/tests/dlloader-api.at
@@ -415,7 +415,7 @@ last_exit: last_ctx
# Skip this test when called from:
# make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install
AT_CHECK([case $LIBLTDL in #(
- */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;;
+ */_inst/lib/*) test -f "$LIBLTDL" || (exit 77) ;;
esac], [], [ignore])
CPPFLAGS="$LTDLINCL $CPPFLAGS"
diff --git a/tests/duplicate_conv.at b/tests/duplicate_conv.at
index 77496d0..8b79a9e 100644
--- a/tests/duplicate_conv.at
+++ b/tests/duplicate_conv.at
@@ -77,7 +77,7 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o
main$EXEEXT main.$OBJEXT
LT_AT_EXEC_CHECK([./main],[0],[ignore],[ignore])
$LIBTOOL --mode=clean rm -f libcee.la
-AT_CHECK([test "x$reload_cmds" = xfalse && exit 77], [1])
+AT_CHECK([test false = "$reload_cmds" && exit 77], [1])
# Test whether this works with reloadable objects as well.
AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o cee.$OBJEXT
c.lo a/liba.la b/liba.la],
diff --git a/tests/exceptions.at b/tests/exceptions.at
index c1dcce1..fdb341f 100644
--- a/tests/exceptions.at
+++ b/tests/exceptions.at
@@ -31,7 +31,7 @@ AT_KEYWORDS([libltdl])
# Skip this test when called from:
# make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install
AT_CHECK([case $LIBLTDL in #(
- */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;;
+ */_inst/lib/*) test -f "$LIBLTDL" || (exit 77) ;;
esac], [], [ignore])
CPPFLAGS="$LTDLINCL $CPPFLAGS"
diff --git a/tests/fail.at b/tests/fail.at
index cec954b..baa0fbc 100644
--- a/tests/fail.at
+++ b/tests/fail.at
@@ -102,8 +102,8 @@ case $build_libtool_libs in yes)
$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c c.c
(
. ./c.lo
- test "$pic_object" != none && echo choke me >"$pic_object"
- test "$non_pic_object" != none && echo choke me >"$non_pic_object"
+ test none = "$pic_object" || echo choke me >"$pic_object"
+ test none = "$non_pic_object" || echo choke me >"$non_pic_object"
)
FAIL_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo b.lo
c.lo -rpath /foo])
AT_CHECK([test -f liba.la], [1])
diff --git a/tests/fcdemo-conf.test b/tests/fcdemo-conf.test
index b7e08a6..028b53e 100755
--- a/tests/fcdemo-conf.test
+++ b/tests/fcdemo-conf.test
@@ -31,7 +31,7 @@ func_make_distclean
# We do not want to fail if all we got was a Fortran 77 compiler.
func_configure_nofail
if test "$conf_status" -eq "$EXIT_FAILURE"; then
- case `echo $FC | $SED $basename` in
+ case `echo $FC | $SED "$basename"` in
g77* | f77* | xlf | xlf[_-]* | frt* | pgf77* | cf77* | fort77* | fl32* |
af77*)
func_skip "The FC fortran tests do not work with Fortran 77 compilers"
;;
*) exit $EXIT_FAILURE
diff --git a/tests/fcdemo-shared.test b/tests/fcdemo-shared.test
index f20cb5d..76fb694 100755
--- a/tests/fcdemo-shared.test
+++ b/tests/fcdemo-shared.test
@@ -31,7 +31,7 @@ func_make_distclean
# We do not want to fail if all we got was a Fortran 77 compiler.
func_configure_nofail "--disable-static"
if test "$conf_status" -eq "$EXIT_FAILURE"; then
- case `echo $FC | $SED $basename` in
+ case `echo $FC | $SED "$basename"` in
g77* | f77* | xlf | xlf[_-]* | frt* | pgf77* | cf77* | fort77* | fl32* |
af77*)
func_skip "The FC fortran tests do not work with Fortran 77 compilers"
;;
*) exit $EXIT_FAILURE
diff --git a/tests/fcdemo-static.test b/tests/fcdemo-static.test
index 0f8dede..2e27020 100755
--- a/tests/fcdemo-static.test
+++ b/tests/fcdemo-static.test
@@ -31,7 +31,7 @@ func_make_distclean
# We do not want to fail if all we got was a Fortran 77 compiler.
func_configure_nofail "--disable-shared"
if test "$conf_status" -eq "$EXIT_FAILURE"; then
- case `echo $FC | $SED $basename` in
+ case `echo $FC | $SED "$basename"` in
g77* | f77* | xlf | xlf[_-]* | frt* | pgf77* | cf77* | fort77* | fl32* |
af77*)
func_skip "The FC fortran tests do not work with Fortran 77 compilers"
;;
*) exit $EXIT_FAILURE
diff --git a/tests/flags.at b/tests/flags.at
index f865757..7eebb36 100644
--- a/tests/flags.at
+++ b/tests/flags.at
@@ -70,7 +70,7 @@ eval "`$LIBTOOL --tag=lt_tag --config | $EGREP
'^(wl|archive_cmds)='`"
AT_CHECK([$LIBTOOL --tag=lt_tag --mode=compile $compile -c $source],
[], [ignore], [ignore])
-# Linker flags are prefixed with ${wl} iff they are passed to the
+# Linker flags are prefixed with $wl iff they are passed to the
# compiler driver, instead of directly to the linker.
case $archive_cmds in
*\$LD*\$linker_flags*) maybe_wl= compiler_flags_in_liblink=false ;;
diff --git a/tests/getopt-m4sh.at b/tests/getopt-m4sh.at
index 4c11dbf..5eec5c2 100644
--- a/tests/getopt-m4sh.at
+++ b/tests/getopt-m4sh.at
@@ -48,8 +48,8 @@ m4_pattern_forbid([m4_include])
m4_pattern_forbid([AS_INIT])
AT_CHECK([$M4SH --version || exit 77], [], [ignore], [ignore])
AT_CHECK([$M4SH -B $abs_top_srcdir/build-aux options.m4sh > t-options],
- [], [], [], [AT_CHECK([test $at_status -eq 63 && exit 77])])
-$SED "s,@LN_S\@,$LN_S,g;s,@SED\@,$SED,g" t-options > options
+ [], [], [], [AT_CHECK([test 63 -eq "$at_status" && exit 77])])
+$SED "s|@LN_S\@|$LN_S|g;s|@SED\@|$SED|g" t-options > options
])# _LT_AT_GETOPT_M4SH_SETUP
diff --git a/tests/help.at b/tests/help.at
index 0b60a0d..2585b58 100644
--- a/tests/help.at
+++ b/tests/help.at
@@ -121,7 +121,7 @@ AT_CHECK([case "$LIBTOOL $CC $CPPFLAGS $CFLAGS $LDFLAGS "
in ]dnl
check_trace ()
{
- if test "X$trace" = X--debug; then
+ if test X--debug = "X$trace"; then
AT_CHECK([grep 'enabling shell trace mode' stdout stderr], [0], [ignore])
AT_CHECK([grep ' --mode' stderr], [0], [ignore])
else
@@ -164,7 +164,7 @@ for trace in '' --debug; do
AT_CHECK([$orig_LIBTOOL --mode=install $lt_INSTALL liba.la libb.la $libdir],
[], [stdout], [stderr])
if grep ': relinking ' stdout stderr; then
- if test "X$trace" = X--debug; then
+ if test X--debug = "X$trace"; then
AT_CHECK([grep ' --mode=relink' stdout stderr | grep ' --debug '],
[0], [ignore])
else
diff --git a/tests/install.at b/tests/install.at
index 5e15555..5b6c73e 100644
--- a/tests/install.at
+++ b/tests/install.at
@@ -30,7 +30,7 @@ AT_KEYWORDS([libtool])
AT_CHECK([$LIBTOOL --features | grep 'enable shared libraries' || exit 77],
[], [ignore])
-sed 's,^\(install_override_mode\)=.*,\1=755,' < $LIBTOOL > ./libtool
+sed 's|^\(install_override_mode\)=.*|\1=755|' < $LIBTOOL > ./libtool
LIBTOOL=./libtool
chmod a+rx $LIBTOOL
diff --git a/tests/lalib-syntax.at b/tests/lalib-syntax.at
index 0f78ca8..eca9ba5 100644
--- a/tests/lalib-syntax.at
+++ b/tests/lalib-syntax.at
@@ -73,7 +73,7 @@ AT_DATA([module.c],
# Skip this test when called from:
# make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install
AT_CHECK([case $LIBLTDL in #(
- */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;;
+ */_inst/lib/*) test -f "$LIBLTDL" || (exit 77) ;;
esac], [], [ignore])
CPPFLAGS="$CPPFLAGS $LTDLINCL"
@@ -103,7 +103,7 @@ libdir='/somewhere'
AT_DATA([wrong-quotes.la],
[[# wrong-quotes.la - a libtool library file
# Generated by libtool
-dlname="module.so"
+dlname=module.so
library_names='module.so module.so module.so'
old_library='module.a'
installed=no
diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index 70ba941..9bc3770 100644
--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@@ -696,7 +696,7 @@ LT_AT_ACLOCAL([-I $abs_top_srcdir/m4])
: ${GREP="grep"}
: ${SED="sed"}
-basename="s,^.*/,,"
+basename='s|^.*/||'
# func_grep expression filename
# Check whether EXPRESSION matches any line of FILENAME, without output.
@@ -710,11 +710,11 @@ func_grep ()
# comment line must also match MACRO_REGEX, if given.
func_serial ()
{
- my_filename="$1"
- my_macro_regex="$2"
+ my_filename=$1
+ my_macro_regex=$2
my_sed_serial='
/^# serial [1-9][0-9.]*[ ]*'"$my_macro_regex"'[ ]*$/ {
- s,^# serial \([1-9][0-9.]*\).*$,\1,
+ s|^# serial \([1-9][0-9.]*\).*$|\1|
q
}
d'
@@ -723,7 +723,7 @@ func_serial ()
# in the file that AC_DEFUNs MACRO_REGEX.
my_serial=
if test -z "$my_macro_regex" ||
- test "$my_filename" = aclocal.m4 ||
+ test aclocal.m4 = "$my_filename" ||
test "$my_macro_regex" = `echo "$my_filename" | $SED "$basename"` ||
func_grep '^AC_DEFUN(\@<:@'"$my_macro_regex" "$my_filename"
then
@@ -742,11 +742,11 @@ libtool_serial=`func_serial "$tst_aclocaldir/libtool.m4"
LT_INIT`
ltversion_serial=`func_serial "$tst_aclocaldir/ltversion.m4" ltversion.m4`
ltsugar_serial=`func_serial "$tst_aclocaldir/ltsugar.m4" ltsugar.m4`
lt_obsolete_serial=`func_serial "$tst_aclocaldir/lt~obsolete.m4"
lt~obsolete.m4`
-$SED -e 's,^#.*serial.*ltoptions.m4$,# serial 99999 ltoptions.m4,' \
- -e "s,^#.*serial.*libtool.m4\$,# serial $libtool_serial libtool.m4," \
- -e "s,^#.*serial.*ltversion.m4\$,# serial $ltversion_serial ltversion.m4," \
- -e "s,^#.*serial.*ltsugar.m4\$,# serial $ltsugar_serial ltsugar.m4," \
- -e "s,^#.*serial.*lt~obsolete.m4\$,# serial $lt_obsolete_serial
lt~obsolete.m4," \
+$SED -e 's|^#.*serial.*ltoptions.m4$|# serial 99999 ltoptions.m4|' \
+ -e "s|^#.*serial.*libtool.m4\$|# serial $libtool_serial libtool.m4|" \
+ -e "s|^#.*serial.*ltversion.m4\$|# serial $ltversion_serial ltversion.m4|" \
+ -e "s|^#.*serial.*ltsugar.m4\$|# serial $ltsugar_serial ltsugar.m4|" \
+ -e "s|^#.*serial.*lt~obsolete.m4\$|# serial $lt_obsolete_serial
lt~obsolete.m4|" \
< aclocal.m4 > aclocal.m4t
mv -f aclocal.m4t aclocal.m4
@@ -1003,7 +1003,7 @@ AT_SETUP([LIBTOOLIZE_OPTIONS])
_LT_CONFIGURE_AC
-LIBTOOLIZE_OPTIONS="narf"
+LIBTOOLIZE_OPTIONS=narf
export LIBTOOLIZE_OPTIONS
AT_DATA(experr,
diff --git a/tests/link-2.test b/tests/link-2.test
index 6c0f519..565bede 100755
--- a/tests/link-2.test
+++ b/tests/link-2.test
@@ -38,10 +38,10 @@ res=$?
rm -f hell.lo
-test $res -eq 0 || exit $EXIT_FAILURE
+test 0 -eq "$res" || exit $EXIT_FAILURE
echo "$linkresult"
-case "$linkresult" in
+case $linkresult in
*".lo "*)
func_fail "$progname: .lo files should not be linked into programs"
;;
diff --git a/tests/link-order2.at b/tests/link-order2.at
index a6eea0e..298f615 100644
--- a/tests/link-order2.at
+++ b/tests/link-order2.at
@@ -100,11 +100,11 @@ $LIBTOOL --mode=clean rm -f liba0.la
for type_of_depdepl in libtool non-libtool; do
echo "type of depdepl: $type_of_depdepl"
- if test $type_of_depdepl = non-libtool; then
+ if test non-libtool = "$type_of_depdepl"; then
# Simulate a non-Libtool system library.
rm $deflibdir/liba1.la
addpath=$deflibdir
- if test "$shlibpath_var" = PATH; then
+ if test PATH = "$shlibpath_var"; then
addpath=$defbindir
fi
sep=
@@ -114,9 +114,9 @@ for type_of_depdepl in libtool non-libtool; do
fi
for static in '' -static-libtool-libs; do
case `$LIBTOOL --features` in
- *disable\ static\ libraries*) test "$static" = '' || continue;;
+ *disable\ static\ libraries*) test -z "$static" || continue;;
esac
- test "$type_of_depdepl,$static" = "non-libtool,-static-libtool-libs" &&
+ test non-libtool,-static-libtool-libs = "$type_of_depdepl,$static" &&
static=-all-static
$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o liba1.la a1.lo -rpath
$libdir
$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o libb.la b.lo liba1.la
-rpath $libdir
@@ -126,7 +126,7 @@ for type_of_depdepl in libtool non-libtool; do
# Now test that if we reverse the link order, the program fails.
AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o
wrong$EXEEXT main.$OBJEXT -la0 libb.la],
[], [ignore], [ignore])
- if test $shared_fails,$static != yes,; then
+ if test yes, != "$shared_fails,$static"; then
LT_AT_EXEC_CHECK([./wrong], [1], [], [ignore], [|| (exit 1)])
fi
@@ -136,13 +136,13 @@ for type_of_depdepl in libtool non-libtool; do
$LIBTOOL --mode=install cp wrong$EXEEXT $bindir/wrong$EXEEXT
$LIBTOOL --mode=clean rm -f liba1.la libb.la
LT_AT_EXEC_CHECK([$bindir/main])
- if test $shared_fails,$static != yes,; then
+ if test yes, = "$shared_fails,$static"; then
LT_AT_EXEC_CHECK([$bindir/wrong], [1], [], [ignore], [|| (exit 1)])
fi
done
done
-AT_CHECK([test $shared_fails = no || (exit 77)])
+AT_CHECK([test no = "$shared_fails" || (exit 77)])
# Now the converse: if both the program and the library need libm, then
# it needs to be sorted last. (TODO)
diff --git a/tests/link.test b/tests/link.test
index 00b2068..83d0673 100755
--- a/tests/link.test
+++ b/tests/link.test
@@ -30,7 +30,7 @@ linkresult=`$LIBTOOL -n --mode=link $CC -o gettext
../lib/libnlsut.a`
test $? -eq 0 || exit $EXIT_FAILURE
echo "$linkresult"
-echo "$linkresult" | ${EGREP} "../lib/libnlsut.a" >/dev/null 2>&1 || {
+echo "$linkresult" | $EGREP ../lib/libnlsut.a >/dev/null 2>&1 || {
func_fail "$progname: ../lib/libnlsut.a was not used as expected in linking"
}
diff --git a/tests/loadlibrary.at b/tests/loadlibrary.at
index e87cb90..58b8463 100644
--- a/tests/loadlibrary.at
+++ b/tests/loadlibrary.at
@@ -215,7 +215,7 @@ barsym (void)
# Skip this test when called from:
# make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install
AT_CHECK([case $LIBLTDL in #(
- */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;;
+ */_inst/lib/*) test -f "$LIBLTDL" || (exit 77) ;;
esac], [], [ignore])
CPPFLAGS="$LTDLINCL $CPPFLAGS"
diff --git a/tests/lt_dladvise.at b/tests/lt_dladvise.at
index 48cf5e9..9bcc73d 100644
--- a/tests/lt_dladvise.at
+++ b/tests/lt_dladvise.at
@@ -313,7 +313,7 @@ preload: 6
# Skip this test when called from:
# make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install
AT_CHECK([case $LIBLTDL in #(
- */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;;
+ */_inst/lib/*) test -f "$LIBLTDL" || (exit 77) ;;
esac], [], [ignore])
CPPFLAGS="$LTDLINCL $CPPFLAGS"
@@ -357,7 +357,7 @@ $CC $CPPFLAGS $CFLAGS -c main.c
for name in resident local global preload; do
# FIXME: adding -static to libpreload shouldn't be necessary.
# Fix this properly in ltmain, then remove this workaround.
- if test $name = preload; then
+ if test preload = "$name"; then
st=-static
else
st=
diff --git a/tests/lt_dlexit.at b/tests/lt_dlexit.at
index 9441f8a..d2fc58e 100644
--- a/tests/lt_dlexit.at
+++ b/tests/lt_dlexit.at
@@ -139,7 +139,7 @@ int vb1 = 3;
# Skip this test when called from:
# make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install
AT_CHECK([case $LIBLTDL in #(
- */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;;
+ */_inst/lib/*) test -f "$LIBLTDL" || (exit 77) ;;
esac], [], [ignore])
CPPFLAGS="$LTDLINCL $CPPFLAGS"
diff --git a/tests/lt_dlopen_a.at b/tests/lt_dlopen_a.at
index 4844d06..f1c82b5 100644
--- a/tests/lt_dlopen_a.at
+++ b/tests/lt_dlopen_a.at
@@ -91,7 +91,7 @@ mkdir -p $bindir
AT_CHECK([$LIBTOOL --mode=install cp plugin.la $libdir],[], [ignore], [ignore])
AT_CHECK([$LIBTOOL --mode=install cp main$EXEEXT $bindir],[], [ignore],
[ignore])
-AT_CHECK([test -f $libdir/plugin.a || exit 77])
+AT_CHECK([test -f "$libdir/plugin.a" || exit 77])
LT_AT_EXEC_CHECK([$bindir/main], [], [ignore], [ignore],[$libdir/plugin.la])
AT_CLEANUP
diff --git a/tests/lt_dlopenext.at b/tests/lt_dlopenext.at
index 6631124..fd17112 100644
--- a/tests/lt_dlopenext.at
+++ b/tests/lt_dlopenext.at
@@ -186,7 +186,7 @@ dlerrordup (char *errormsg)
# Skip this test when called from:
# make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install
AT_CHECK([case $LIBLTDL in #(
- */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;;
+ */_inst/lib/*) test -f "$LIBLTDL" || (exit 77) ;;
esac], [], [ignore])
CPPFLAGS="$LTDLINCL $CPPFLAGS"
@@ -219,15 +219,15 @@ eval shared_ext=\"$shrext_cmds\"
if test -n "$shared_ext"; then
have_lafile="with without"
else
- have="with"
+ have=with
fi
-if test "$shlibpath_var" = PATH; then
+if test PATH = "$shlibpath_var"; then
$unset shlibpath_var || shlibpath_var=
fi
for lafile in $have_lafile; do
- if test $lafile = without; then
+ if test without = "$lafile"; then
rm $libdir/simple-module.la
fi
diff --git a/tests/mdemo/Makefile.am b/tests/mdemo/Makefile.am
index 7f34be1..ff9e459 100644
--- a/tests/mdemo/Makefile.am
+++ b/tests/mdemo/Makefile.am
@@ -55,7 +55,7 @@ top_distdir = ../..
$(LIBLTDL): $(top_distdir)/libtool \
$(top_distdir)/config.h $(srcdir)/$(top_distdir)/libltdl/ltdl.c \
$(srcdir)/$(top_distdir)/libltdl/ltdl.h
- (cd $(top_distdir); $(MAKE) `echo $(LIBLTDL) | sed
's,.*\.\./libltdl/,libltdl/,g'`)
+ (cd $(top_distdir); $(MAKE) `echo $(LIBLTDL) | sed
's|.*\.\./libltdl/|libltdl/|g'`)
# Do not error out if toplevel config.h does not exist:
$(top_distdir)/config.h:
diff --git a/tests/mdemo/configure.ac b/tests/mdemo/configure.ac
index 0253843..8476b5d 100644
--- a/tests/mdemo/configure.ac
+++ b/tests/mdemo/configure.ac
@@ -54,8 +54,8 @@ AC_SUBST([LIBLTDL])
LT_INIT([dlopen win32-dll])
AC_SUBST(LIBTOOL_DEPS)
-STATIC=""
-test "X$enable_static" = Xyes && STATIC="-static"
+STATIC=
+test yes = "$enable_static" && STATIC="-static"
AC_SUBST([STATIC])
diff --git a/tests/mdemo2/configure.ac b/tests/mdemo2/configure.ac
index 2c91e46..b25e455 100644
--- a/tests/mdemo2/configure.ac
+++ b/tests/mdemo2/configure.ac
@@ -50,8 +50,8 @@ AC_PROG_CC
LT_INIT([dlopen])
AC_SUBST(LIBTOOL_DEPS)
-STATIC=""
-test "X$enable_static" = Xyes && STATIC="-static"
+STATIC=
+test yes = "$enable_static" && STATIC="-static"
AC_SUBST([STATIC])
diff --git a/tests/need_lib_prefix.at b/tests/need_lib_prefix.at
index ea36da3..5d72e57 100644
--- a/tests/need_lib_prefix.at
+++ b/tests/need_lib_prefix.at
@@ -147,21 +147,21 @@ libfoo2: 3
# Skip this test when called from:
# make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install
AT_CHECK([case $LIBLTDL in #(
- */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;;
+ */_inst/lib/*) test -f "$LIBLTDL" || (exit 77) ;;
esac], [], [ignore])
CPPFLAGS="$LTDLINCL $CPPFLAGS"
-LDFLAGS="$LDFLAGS"
+LDFLAGS=$LDFLAGS
# Skip this test when libraries are not normally prefixed with lib.
# E.g., for MSVC and OS/2.
eval "`$LIBTOOL --config | $EGREP '^(libname_spec)='`"
name=
eval libname=\"$libname_spec\"
-AT_CHECK([test "$libname" = lib || exit 77])
+AT_CHECK([test lib = "$libname" || exit 77])
# Create our own libtool, forcing need_lib_prefix setting
-sed 's,^\(need_lib_prefix\)=.*$,\1=unknown,' $LIBTOOL > ./libtool
+sed 's|^\(need_lib_prefix\)=.*$|\1=unknown|' $LIBTOOL > ./libtool
LIBTOOL="$SHELL ./libtool"
# Installation directory:
diff --git a/tests/no-executables.at b/tests/no-executables.at
index bcc9cf2..0216852 100644
--- a/tests/no-executables.at
+++ b/tests/no-executables.at
@@ -51,7 +51,7 @@ lt_cv_archive_cmds_need_lc=no
lt_cv_cc_needs_belf=no
lt_cv_ld_exported_symbols_list=no
lt_cv_prog_compiler_static_works=no
-lt_cv_aix_libpath="/usr/lib:/lib"
+lt_cv_aix_libpath=/usr/lib:/lib
lt_cv_irix_exported_symbol=yes
# Deal with AC_LIBTOOL_DLOPEN in one of two possible ways:
diff --git a/tests/nocase.at b/tests/nocase.at
index faacc0d..5764249 100644
--- a/tests/nocase.at
+++ b/tests/nocase.at
@@ -28,7 +28,7 @@ AT_KEYWORDS([libtool])
eval `$LIBTOOL --config | $EGREP '^(want_nocaseglob|file_magic_glob)='`
-AT_CHECK([test "$want_nocaseglob" != yes && ]dnl
+AT_CHECK([test yes != "$want_nocaseglob" && ]dnl
[test -z "$file_magic_glob" && exit 77],
[1], [ignore], [ignore])
diff --git a/tests/nonrecursive.at b/tests/nonrecursive.at
index fa8cfb6..92af12f 100644
--- a/tests/nonrecursive.at
+++ b/tests/nonrecursive.at
@@ -140,8 +140,8 @@ done
LT_AT_BOOTSTRAP([ignore], [-I ltdl/m4], [], [--add-missing --copy],
[], [--enable-ltdl-install --prefix=$prefix], [all install $tst_dist])
-AT_CHECK([test -f $prefix/lib/libltdl.la])
-AT_CHECK([test -f $prefix/include/ltdl.h])
+AT_CHECK([test -f "$prefix/lib/libltdl.la"])
+AT_CHECK([test -f "$prefix/include/ltdl.h"])
AT_CLEANUP
diff --git a/tests/objectlist.test b/tests/objectlist.test
index 0eec0f3..1b4c69a 100755
--- a/tests/objectlist.test
+++ b/tests/objectlist.test
@@ -30,7 +30,7 @@
linkresult=`$LIBTOOL -n --mode=link $CC -objectlist nonexistant 2>&1`
test $? -eq 0 && exit $EXIT_FAILURE
-echo "$linkresult" | ${EGREP} "nonexistant" >/dev/null 2>&1 && {
+echo "$linkresult" | $EGREP "nonexistant" >/dev/null 2>&1 && {
func_msg "$progname: error message contains -objectlist argument as expected"
} || exit $EXIT_FAILURE
@@ -40,7 +40,7 @@ objlist="object list with spaces"
linkresult=`$LIBTOOL -n --mode=link $CC -o a.out -objectlist "$objlist" 2>&1`
rm -f "$objlist"
-echo "$linkresult" | ${EGREP} "spaces" >/dev/null 2>&1 && {
+echo "$linkresult" | $EGREP "spaces" >/dev/null 2>&1 && {
func_msg "$progname: -objectlist with spaces in filename not recognized."
exit $EXIT_FAILURE
}
diff --git a/tests/pdemo/configure.ac b/tests/pdemo/configure.ac
index 740603a..5fe89c7 100644
--- a/tests/pdemo/configure.ac
+++ b/tests/pdemo/configure.ac
@@ -51,13 +51,13 @@ LT_INIT([dlopen])
AC_SUBST([LIBTOOL_DEPS])
STATIC=
-test "X$enable_static" = Xyes && STATIC=-static
+test yes = "$enable_static" && STATIC=-static
AC_SUBST([STATIC])
case $lt_cv_sys_global_symbol_pipe in
?*) binary_helldl=yes ;;
esac
-AM_CONDITIONAL([BINARY_HELLDL], [test "X$binary_helldl" = Xyes])
+AM_CONDITIONAL([BINARY_HELLDL], [test yes = "$binary_helldl"])
## ---------------------------- ##
diff --git a/tests/pic_flag.at b/tests/pic_flag.at
index 3f7388a..f3ee29d 100644
--- a/tests/pic_flag.at
+++ b/tests/pic_flag.at
@@ -44,7 +44,7 @@ if $CXX $CPPFLAGS $CXXFLAGS $CXX_pic_flag -c foo.cpp; then :;
else
CXX_pic_flag=
fi
-AT_CHECK([test "$at_srcdir" != . || exit 77])
+AT_CHECK([test . != "$at_srcdir" || exit 77])
LT_AT_CONFIGURE([lt_cv_prog_compiler_pic="$C_pic_flag" ]dnl
[lt_cv_prog_compiler_pic_CXX="$CXX_pic_flag"],
["$abs_top_srcdir"/configure --disable-silent-rules])
diff --git a/tests/quote.test b/tests/quote.test
index 6a62dac..7723be7 100755
--- a/tests/quote.test
+++ b/tests/quote.test
@@ -47,43 +47,43 @@ for mode in compile link install; do
# try metacharacters in the options it needs to pass to other programs.
# preargs and postargs need to go through libtool unmodified.
- case "$mode" in
+ case $mode in
compile)
preargs="$CC -c"
preflag=
match_preflag=
- flag="-DVAR="
- postargs="foo.c"
+ flag=-DVAR=
+ postargs=foo.c
;;
link)
preargs="$CC -o hell -g -O"
preflag=-Wl,
- match_preflag="$wl"
- flag="-someflag="
- postargs="foo.o"
+ match_preflag=$wl
+ flag=-someflag=
+ postargs=foo.o
;;
install)
preargs="install -c"
preflag=
match_preflag=
- flag="--something="
+ flag=--something=
postargs="hell /usr/local/bin/hell"
;;
esac
# Trivial.
echo "= trying: no quoting"
- result=`$LIBTOOL -n --mode=$mode $preargs ${preflag}"${flag}test" $postargs`
|| status=$EXIT_FAILURE
+ result=`$LIBTOOL -n --mode=$mode $preargs $preflag"$flag:test" $postargs` ||
status=$EXIT_FAILURE
# We used to have the contents of $match in the case statement,
# without an intermediate variable, but it would fail on at least
# Solaris' and HP-UX's /bin/sh. Ugh!
# 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''.
- match="${match_preflag}${flag}test "
- case "$result" in
+ match="$match_preflag$flag:test "
+ case $result in
*"$match"*)
$ECHO "= passed: $result"
;;
@@ -96,10 +96,10 @@ for mode in compile link install; do
# Metacharacters that should be backslashified.
for mchar in \\ \" \` \$; do
$ECHO "= trying: \\$mchar quoting"
- result=`$LIBTOOL -n --mode=$mode $preargs
${preflag}"${flag}${mchar}test${mchar}" $postargs` || status=$EXIT_FAILURE
- match="${match_preflag}${flag}\\${mchar}test\\${mchar} "
- alt_match="${match_preflag}\"${flag}\\${mchar}test\\${mchar}\" "
- case "$result" in
+ result=`$LIBTOOL -n --mode=$mode $preargs $preflag"$flag$mchar:test$mchar"
$postargs` || status=$EXIT_FAILURE
+ match="$match_preflag$flag\\$mchar:test\\$mchar "
+ alt_match="$match_preflag\"$flag\\$mchar:test\\$mchar\" "
+ case $result in
*"$match"*)
$ECHO "= passed: $result"
;;
@@ -118,9 +118,9 @@ for mode in compile link install; do
"'" " " " "; do
$ECHO "= trying: \"$mchar\" quoting"
- result=`$LIBTOOL -n --mode=$mode $preargs
${preflag}"${flag}${mchar}test${mchar}" $postargs` || status=$EXIT_FAILURE
- match="${match_preflag}\"${flag}${mchar}test${mchar}\" "
- case "$result" in
+ result=`$LIBTOOL -n --mode=$mode $preargs $preflag"$flag$mchar:test$mchar"
$postargs` || status=$EXIT_FAILURE
+ match="$match_preflag\"$flag$mchar:test$mchar\" "
+ case $result in
*"$match"*)
$ECHO "= passed: $result"
;;
diff --git a/tests/recursive.at b/tests/recursive.at
index f279398..eec9e63 100644
--- a/tests/recursive.at
+++ b/tests/recursive.at
@@ -110,8 +110,8 @@ LT_AT_AUTORECONF([--force --verbose --install])
LT_AT_CONFIGURE([--enable-ltdl-install --prefix=$prefix])
LT_AT_MAKE([all install $tst_dist])
-AT_CHECK([test -f $prefix/lib/libltdl.la])
-AT_CHECK([test -f $prefix/include/ltdl.h])
+AT_CHECK([test -f "$prefix/lib/libltdl.la"])
+AT_CHECK([test -f "$prefix/include/ltdl.h"])
AT_CLEANUP
diff --git a/tests/resident.at b/tests/resident.at
index cf00688..508cbfe 100644
--- a/tests/resident.at
+++ b/tests/resident.at
@@ -126,7 +126,7 @@ setup_plugin (void)
# Skip this test when called from:
# make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install
AT_CHECK([case $LIBLTDL in #(
- */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;;
+ */_inst/lib/*) test -f "$LIBLTDL" || (exit 77) ;;
esac], [], [ignore])
CPPFLAGS="$LTDLINCL $CPPFLAGS"
diff --git a/tests/search-path.at b/tests/search-path.at
index 28df443..8f32225 100644
--- a/tests/search-path.at
+++ b/tests/search-path.at
@@ -78,7 +78,7 @@ HCURSOR get_cursor (void)
]])
eval "`$LIBTOOL --config | grep '^build_libtool_libs='`"
-AT_CHECK([test "$build_libtool_libs" = yes || exit 77])
+AT_CHECK([test yes = "$build_libtool_libs" || exit 77])
AT_CHECK([$LIBTOOL --mode=compile --tag=CC \
$CC $CPPFLAGS $CFLAGS -o gc.lo -c gc.c || exit 77],
diff --git a/tests/sh.test b/tests/sh.test
deleted file mode 100755
index 5c6d675..0000000
--- a/tests/sh.test
+++ /dev/null
@@ -1,134 +0,0 @@
-#! /bin/sh
-# sh.test - check for some nonportable or dubious or undesired shell
-# constructs in shell scripts.
-#
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2010 Free
-# Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2003
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-####
-
-. tests/defs || exit 1
-
-# Check all the "portable" shell scripts.
-status=$EXIT_SUCCESS
-
-# Check for bad binary operators.
-if $EGREP -n -e 'if[ ]+["'\'']?\$[^ ]+[ ]+(=|-[lg][te]|-eq|-ne)'
$scripts; then
- echo "use \`if test \$something =' instead of \`if \$something ='"
- status=$EXIT_FAILURE
-fi
-
-# Check for bad unary operators.
-if $EGREP -n -e 'if[ ]+-' $scripts; then
- echo "use \`if test -X' instead of \`if -X'"
- status=$EXIT_FAILURE
-fi
-
-# Check for using `[' instead of `test'.
-if $EGREP -n -e 'if[ ]+\[' $scripts; then
- echo "use \`if test' instead of \`if ['"
- status=$EXIT_FAILURE
-fi
-
-# Check for using test X... instead of test "X...
-if $EGREP -n -e 'test[ ]+(![ ])?(-.[ ]+)?X' $scripts; then
- echo "use \`test \"X...\"' instead of \`test X'"
- status=$EXIT_FAILURE
-fi
-
-# Check for using test $... instead of test "$...
-if $EGREP -n -e 'test[ ]+(![ ])?(-.[ ]+)?X?\$' $scripts; then
- echo "use \`test \"\$...\"' instead of \`test \$'"
- status=$EXIT_FAILURE
-fi
-
-# Never use test -e.
-if $EGREP -n -e 'test[ ]+(![ ])?-e' $scripts; then
- echo "use \`test -f' instead of \`test -e'"
- status=$EXIT_FAILURE
-fi
-
-# Check for uses of Xsed without corresponding echo "X
-if $EGREP -n -e '\$Xsed' $scripts | $EGREP -v -n -e '\$ECHO \\*"X'; then
- echo "occurrences of \`\$Xsed\' without \`echo \"X\' on the same line"
- status=$EXIT_FAILURE
-fi
-
-# Check for quotes within backquotes within quotes "`"bar"`"
-if $EGREP -n -e '"[^`"]*`[^"`]*"[^"`]*".*`[^`"]*"' $scripts | \
- $EGREP -v "### testsuite: skip nested quoting test$"; then
- echo "nested quotes are dangerous"
- status=$EXIT_FAILURE
-fi
-
-# Check for using set -- instead of set dummy
-if $EGREP -n -e 'set[ ]+--[ ]+' $scripts; then
- echo "use \`set dummy ...' instead of \`set -- ...'"
- status=$EXIT_FAILURE
-fi
-
-# Check for using shift after set dummy (same or following line).
-for s in $scripts
-do
- if $SED -n '
- /set[ ][ ]*dummy/{
- /set.*dummy.*;.*shift/d
- N
- /\n.*shift/D
- p
- }' "$s" | $EGREP .; then
- echo "use \`shift' after \`set dummy' in $s"
- status=$EXIT_FAILURE
- fi
-done
-
-# Check for opening brace on next line in shell function definition.
-# redirect stderr so we also barf when sed issues diagnostics.
-for s in $scripts
-do
- if $SED -n '
- /^func_.*(/{
- N
- /^func_[^ ]* ()\n{$/d
- p
- }' "$s" 2>&1 | $EGREP .; then
- echo "Function definitions should look like this in $s:
-func_foo ()
-{
- # ...
-}"
- status=$EXIT_FAILURE
- fi
-done
-
-# Check for correct usage of $cc_basename.
-# redirect stderr so we also barf when sed issues diagnostics.
-for s in "$abs_macro_dir/libtool.m4"
-do
- if $SED -n '/case \$cc_basename in/,/esac/ {
- /^[ ]*[a-zA-Z][a-zA-Z0-9+]*[^*][ ]*)/p
- }' $s 2>&1 | $EGREP .; then
- echo "\$cc_basename matches should include a trailing \`*' in $s."
- status=$EXIT_FAILURE
- fi
-done
-
-exit $status
diff --git a/tests/shlibpath.at b/tests/shlibpath.at
index eea059b..38e66ee 100644
--- a/tests/shlibpath.at
+++ b/tests/shlibpath.at
@@ -53,7 +53,7 @@ eval `$LIBTOOL --config | $EGREP
'^(shlibpath_var|shlibpath_overrides_runpath)='
# No point checking a system with static libraries:
LT_AT_EXEC_CHECK([./m], [1], [ignore], [ignore], [|| exit 1 && exit 77])
-if test "$shlibpath_var" = PATH; then
+if test PATH = "$shlibpath_var"; then
addpath=`pwd`/moved/bin
else
addpath=`pwd`/moved/lib
@@ -62,7 +62,7 @@ sep=
eval test -n \"\$$shlibpath_var\" && sep=:
eval $shlibpath_var='$addpath$sep$'$shlibpath_var
export $shlibpath_var
-if test "$shlibpath_overrides_runpath" != no; then
+if test no != "$shlibpath_overrides_runpath"; then
LT_AT_EXEC_CHECK([./m], [0], [ignore], [ignore])
else
LT_AT_EXEC_CHECK([./m], [1], [ignore], [ignore], [|| exit 1])
diff --git a/tests/standalone.at b/tests/standalone.at
index 39b77c4..50c98d6 100644
--- a/tests/standalone.at
+++ b/tests/standalone.at
@@ -66,8 +66,8 @@ LT_AT_CHECK_LIBTOOLIZE([--copy --ltdl=.], [], [ignore])
LT_AT_CONFIGURE([--enable-ltdl-install --prefix=$prefix])
LT_AT_MAKE([all install $tst_dist])
-AT_CHECK([test -f $prefix/lib/libltdl.la])
-AT_CHECK([test -f $prefix/include/ltdl.h])
+AT_CHECK([test -f "$prefix/lib/libltdl.la"])
+AT_CHECK([test -f "$prefix/include/ltdl.h"])
AT_CLEANUP
diff --git a/tests/static.at b/tests/static.at
index 5b779e6..87d9c51 100644
--- a/tests/static.at
+++ b/tests/static.at
@@ -130,40 +130,38 @@ func_fix_path ()
# against a broken library but the good one would come later in the PATH.
# So we let the caller of this function set the order: the "other" two
# come first.
- if test "$shlibpath_var" = PATH; then
+ if test PATH = "$shlibpath_var"; then
save_PATH=$PATH
sep=
test -z "$PATH" || sep=:
- PATH=${2}/bin:${3}/bin:${1}/bin$sep$PATH
+ PATH=$2/bin:$3/bin:$1/bin$sep$PATH
fi
}
func_restore_path ()
{
- if test "$shlibpath_var" = PATH; then
- PATH=$save_PATH
- fi
+ test PATH = "$shlibpath_var" && PATH=$save_PATH
}
# func_move_libs srcdir_to_move prefix_to_move other_prefix other_prefix
func_move_libs ()
{
- LT_AT_MVDIR(["${1}"], ["${1}-moved"])
- LT_AT_MVDIR(["${2}"], ["${2}-moved"])
- LT_AT_MVDIR(["$srcdir_broken"], ["${1}"])
- LT_AT_MVDIR(["$prefix_broken"], ["${2}"])
- func_fix_path ${2} ${3} ${4}
+ LT_AT_MVDIR(["$1"], ["$1-moved"])
+ LT_AT_MVDIR(["$2"], ["$2-moved"])
+ LT_AT_MVDIR(["$srcdir_broken"], ["$1"])
+ LT_AT_MVDIR(["$prefix_broken"], ["$2"])
+ func_fix_path "$2" "$3" "$4"
}
# func_restore_libs srcdir_to_restore prefix_to_restore
func_restore_libs ()
{
func_restore_path
- LT_AT_MVDIR(["${2}"], ["$prefix_broken"])
- LT_AT_MVDIR(["${1}"], ["$srcdir_broken"])
- LT_AT_MVDIR(["${2}-moved"], ["${2}"])
- LT_AT_MVDIR(["${1}-moved"], ["${1}"])
+ LT_AT_MVDIR(["$2"], ["$prefix_broken"])
+ LT_AT_MVDIR(["$1"], ["$srcdir_broken"])
+ LT_AT_MVDIR(["$2-moved"], ["$2"])
+ LT_AT_MVDIR(["$1-moved"], ["$1"])
}
# make sure the program can be run.
@@ -178,7 +176,7 @@ func_test_exec ()
LT_AT_EXEC_CHECK([./m$st])
# For some per-deplib flag combinations there may be no installed
program,
# because liba2 is not yet installed.
- if test -f "$bindir/m${st}$EXEEXT"; then
+ if test -f "$bindir/m$st$EXEEXT"; then
LT_AT_EXEC_CHECK([$bindir/m$st])
fi
done
@@ -198,7 +196,7 @@ func_test_exec_fail ()
LT_AT_EXEC_CHECK([./m$st], [1], [], [ignore], [|| (exit 1)])
# For some per-deplib flag combinations there may be no installed
program,
# because liba2 is not yet installed.
- if test -f "$bindir/m${st}$EXEEXT"; then
+ if test -f "$bindir/m$st$EXEEXT"; then
LT_AT_EXEC_CHECK([$bindir/m$st], [1], [], [ignore], [|| (exit 1)])
fi
done
@@ -244,11 +242,11 @@ for withdep in no yes; do
done
### install the libraries.
- test "$withdep" = yes && $LIBTOOL --mode=install cp a1/liba1dep.la
$libdir1/liba1dep.la
+ test yes = "$withdep" && $LIBTOOL --mode=install cp a1/liba1dep.la
$libdir1/liba1dep.la
$LIBTOOL --mode=install cp a1/liba1.la $libdir1/liba1.la
$LIBTOOL --mode=install cp a3/liba3.la $libdir3/liba3.la
$LIBTOOL --mode=clean rm -f a1/liba1.la a3/liba3.la
- test "$withdep" = yes && $LIBTOOL --mode=clean rm -f a1/liba1dep.la
+ test yes = "$withdep" && $LIBTOOL --mode=clean rm -f a1/liba1dep.la
# simulate a non-libtool lib:
rm -f $libdir3/liba3.la
@@ -260,7 +258,7 @@ for withdep in no yes; do
# global static flags.
for st in -static -static-libtool-libs $can_link_all_static; do
- AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o m${st}$EXEEXT
m.$OBJEXT \
+ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o m$st$EXEEXT
m.$OBJEXT \
-L$libdir1 -la1 a2/liba2.la -L$libdir3 -R$libdir3 -la3],
[0], [ignore], [ignore])
done
@@ -309,7 +307,7 @@ for withdep in no yes; do
# We can't install any program that links dynamically against liba2.
for st in -static -static-libtool-libs $can_link_all_static `$per_deplib &&
echo 2 12 23 123 123a`; do
echo "# m$st"
- AT_CHECK([$LIBTOOL --mode=install cp m${st}$EXEEXT $bindir/m${st}$EXEEXT],
[0], [ignore], [stderr])
+ AT_CHECK([$LIBTOOL --mode=install cp m$st$EXEEXT $bindir/m$st$EXEEXT],
[0], [ignore], [stderr])
if $have_static; then
AT_CHECK([$EGREP 'relinking|has not been installed' stderr], [1], [], [])
fi
@@ -327,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=
diff --git a/tests/stresstest.at b/tests/stresstest.at
index 4722ffd..28e7191 100644
--- a/tests/stresstest.at
+++ b/tests/stresstest.at
@@ -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 ;;
diff --git a/tests/subproject.at b/tests/subproject.at
index 0e003a3..11c0d69 100644
--- a/tests/subproject.at
+++ b/tests/subproject.at
@@ -96,8 +96,8 @@ LT_AT_BOOTSTRAP([--copy --ltdl], [-I sub/ltdl/m4], [ignore],
[--add-missing --copy], [], [--enable-ltdl-install --prefix=$prefix],
[all install $tst_dist])
-AT_CHECK([test -f $prefix/lib/libltdl.la])
-AT_CHECK([test -f $prefix/include/ltdl.h])
+AT_CHECK([test -f "$prefix/lib/libltdl.la"])
+AT_CHECK([test -f "$prefix/include/ltdl.h"])
AT_CLEANUP
diff --git a/tests/suffix.test b/tests/suffix.test
index b5c2a88..aa1df67 100755
--- a/tests/suffix.test
+++ b/tests/suffix.test
@@ -26,7 +26,7 @@
# Extensions taken from the ones that Automake recognizes, plus Objective C,
# and GNU Ada. Also test that multiple dots are handled correctly.
extensions="C F S ada adb ads asm c c++ cc cpp cxx f f90 F90 f95 F95 f03 F03
for go m s sx ada.ada"
-bad_names="foo."
+bad_names=foo.
. tests/defs || exit 1
diff --git a/tests/sysroot.at b/tests/sysroot.at
index 2a27134..3c01278 100644
--- a/tests/sysroot.at
+++ b/tests/sysroot.at
@@ -37,9 +37,9 @@ prefix=
for i in crt0.o crt1.o crt2.o crti.o; do
j=`$CC --print-file-name $i 2> /dev/null`
test $? = 0 || continue
- case "$j" in
+ case $j in
$gcc_sysroot*/lib/$i)
- prefix=`echo "$j" | sed "s,^$gcc_sysroot\\(.*\\)/lib/$i\$,\\1,"`
+ prefix=`echo "$j" | sed "s|^$gcc_sysroot\\(.*\\)/lib/$i\$|\\1|"`
break ;;
esac
done
@@ -67,7 +67,7 @@ LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
#???
-if test "$shlibpath_var" = PATH; then
+if test PATH = "$shlibpath_var"; then
configure_options="$configure_options --libdir=/$prefix/bin"
fi
@@ -144,7 +144,7 @@ LT_AT_BOOTSTRAP([], [-I $abs_top_srcdir/libltdl/m4],
[ignore],
[--add-missing], [], [], [all])
AT_CHECK([$MAKE install DESTDIR=$sysroot], [0], [ignore], [ignore])
-AT_CHECK([test -f $sysroot/$prefix/lib/lib2.la])
+AT_CHECK([test -f "$sysroot/$prefix/lib/lib2.la"])
AT_CHECK([grep -F "$sysroot" "$sysroot/$prefix/lib/lib2.la"], [1])
cd ..
@@ -184,7 +184,7 @@ LT_AT_BOOTSTRAP([], [-I $abs_top_srcdir/libltdl/m4],
[ignore],
[--add-missing], [], [], [all])
AT_CHECK([$MAKE install DESTDIR=$sysroot], [0], [ignore], [ignore])
-AT_CHECK([test -f $sysroot/$prefix/bin/prog$EXEEXT])
+AT_CHECK([test -f "$sysroot/$prefix/bin/prog$EXEEXT"])
AT_CHECK([grep -F "$sysroot" "$sysroot/$prefix/bin/prog$EXEEXT"], [1])
AT_CHECK([grep "'.*=" $sysroot/$prefix/lib/lib2.la], [0], [ignore])
AT_CHECK([./libtool --mode=finish $sysroot/$prefix/lib/lib@<:@12@:>@.la], [0],
[ignore])
diff --git a/tests/tagdemo-undef.test b/tests/tagdemo-undef.test
index e1f966d..89d97cd 100755
--- a/tests/tagdemo-undef.test
+++ b/tests/tagdemo-undef.test
@@ -35,7 +35,7 @@ grep '^allow_undefined_flag=.\{0,1\}unsupported.\{0,1\}$'
./libtool >/dev/null 2
&& func_skip "$host doesn't support undefined symbols in shared libs"
if test -f ./libtool; then
- $SED 's,allow_undefined=no,allow_undefined=yes,g' ./libtool > ltnew
+ $SED 's|allow_undefined=no|allow_undefined=yes|g' ./libtool > ltnew
else
exit 1
fi
diff --git a/tests/tagtrace.test b/tests/tagtrace.test
index 3c32333..32d708d 100755
--- a/tests/tagtrace.test
+++ b/tests/tagtrace.test
@@ -35,10 +35,10 @@ fi
( cd "$abs_srcdir" && $AUTOCONF --trace 'LT_SUPPORTED_TAG:$1' ) >/dev/null
ret=$?
-if test $ret -eq 63 || test $ret -eq 1; then
+if test 63 -eq $ret || test 1 -eq $ret; then
func_error "This test requires the same Autoconf version"
func_skip "as the one that was used to bootstrap Libtool"
-elif test $ret -ne 0; then
+elif test 0 -ne $ret; then
func_fatal_error "\`$AUTOCONF --trace' exited $ret"
fi
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 0c2ffcf..093efd6 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -92,7 +92,7 @@ AT_KEYWORDS([libtoolize])
# ---------------------------
# Fix the expected output of installed libtoolize in presence of --program-*.
m4_define([_LIBTOOLIZE_TRANSFORM],
-[lt_name=`$ECHO "$LIBTOOLIZE" | sed "s,^.*/,,"`
+[lt_name=`$ECHO "$LIBTOOLIZE" | sed "s|^.*/||"`
sed "s/libtoolize/$lt_name/g
s|/usr/local/share/aclocal/|${tst_aclocaldir-$abs_top_srcdir/libltdl/m4}/|" <
$1 > $1.t
mv -f $1.t $1
@@ -113,7 +113,7 @@ AT_CHECK([LT_AT_LIBTOOLIZE([$1])],
# --------------------------
m4_define([LT_AT_ACLOCAL],
[AT_CHECK([$ACLOCAL $1], [0], [ignore], [ignore])
-AT_XFAIL_IF([test "$ACLOCAL" = no])
+AT_XFAIL_IF([test no = "$ACLOCAL"])
AT_KEYWORDS([automake])
])
@@ -122,7 +122,7 @@ AT_KEYWORDS([automake])
# --------------------------
m4_define([LT_AT_AUTOCONF],
[AT_CHECK([$AUTOCONF $1], [0], [ignore], [ignore])
-AT_XFAIL_IF([test "$AUTOCONF" = no])
+AT_XFAIL_IF([test no = "$AUTOCONF"])
AT_KEYWORDS([autoconf])
])
@@ -132,7 +132,7 @@ AT_KEYWORDS([autoconf])
m4_define([LT_AT_AUTOMAKE],
[AT_CHECK([$AUTOMAKE $1], [0], [ignore], [stderr],
[AT_CHECK([grep 'require .*but have' stderr && (exit 77)], [1])])
-AT_XFAIL_IF([test "$AUTOMAKE" = no])
+AT_XFAIL_IF([test no = "$AUTOMAKE"])
AT_KEYWORDS([automake])
])
@@ -141,7 +141,7 @@ AT_KEYWORDS([automake])
# ---------------------------
m4_define([LT_AT_AUTOHEADER],
[AT_CHECK([$AUTOHEADER $1], [0], [ignore], [ignore])
-AT_XFAIL_IF([test "$AUTOHEADER" = no])
+AT_XFAIL_IF([test no = "$AUTOHEADER"])
AT_KEYWORDS([autoconf])
])
@@ -243,7 +243,7 @@ esac])
# - location of the libtool script,
# - error messages involving unstable temporary file names.
m4_define([LT_AT_NORMALIZE_COMPILER_OUTPUT],
-[_ltbase=`$ECHO "$LIBTOOL" | sed 's,^.*/,,'`
+[_ltbase=`$ECHO "$LIBTOOL" | sed 's|^.*/||'`
[sed "/^distcc\[[0-9]*\]/d
/^$_ltbase: compile/d
s/\(tmp\/\{1,\}cc\)\([a-zA-Z0-9_]\{1,\}\)/\1-normalized-tmpname/g" < $1
> $1.t]
@@ -262,7 +262,7 @@ LT_AT_UNIFY_NL([$1.t], [m4_default([$2], [$1])])[]dnl
m4_define([LT_AT_EXEC_CHECK],
[lt_exe=$1; if test -f "$1$EXEEXT"; then lt_exe=$lt_exe$EXEEXT; fi
AT_CHECK([if "$lt_exe" $5; then :; else lt_status=$?; ]dnl
- [ m4_ifval([$2], [test $lt_status != $2 && ])]dnl
+ [ m4_ifval([$2], [test "$lt_status" != $2 && ])]dnl
[ test "X$host" != "X$build" && test -x "$lt_exe" && exit 77; ]dnl
[ exit $lt_status; fi],[$2],[$3],[$4])
])
@@ -281,7 +281,7 @@ AT_CHECK([if "$lt_exe" $5; then :; else lt_status=$?; ]dnl
m4_define([LT_AT_NOINST_EXEC_CHECK],
[lt_exe=$1; if test -f "$1$EXEEXT"; then lt_exe=$lt_exe$EXEEXT; fi
AT_CHECK([if $LIBTOOL --mode=execute $2 "$lt_exe" $6; then :; else
lt_status=$?; ]dnl
- [ m4_ifval([$3], [test $lt_status != $3 && ])]dnl
+ [ m4_ifval([$3], [test "$lt_status" != $3 && ])]dnl
[ test "X$host" != "X$build" && test -x "$lt_exe" && exit 77; ]dnl
[ exit $lt_status; fi],[$3],[$4],[$5])
])
@@ -296,7 +296,7 @@ m4_define([LT_AT_TAG],
AT_CHECK([{ test -n "[$]$1" && test "X[$]$1" != Xno; } || (exit 77)])
m4_case([$1],
[CXX],
- [AT_CHECK([test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)])],
+ [AT_CHECK([test g++ != "$CXX" || (g++ -v >/dev/null 2>&1) || (exit 77)])],
[GCJ],
[# There are just too many broken gcj installations out there, either missing
# libgcj.spec or unable to find it. Skip the test for them.
diff --git a/tests/with-pic.at b/tests/with-pic.at
index c01e5d7..c50c540 100644
--- a/tests/with-pic.at
+++ b/tests/with-pic.at
@@ -24,8 +24,8 @@
AT_SETUP([test --with-pic])
eval `$LIBTOOL --config | $EGREP '^(pic_flag|FGREP)='`
-AT_CHECK([test "z$pic_flag" != "z" || exit 77])
-AT_CHECK([test "$at_srcdir" != . || exit 77])
+AT_CHECK([test -n "$pic_flag" || exit 77])
+AT_CHECK([test . != "$at_srcdir" || exit 77])
CONFIGURE=$abs_top_srcdir/tests/demo/configure
: ${MAKE=make}
hooks/post-receive
--
GNU Libtool
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Libtool branch, master, updated. v2.4.2-121-g61e09a5,
Gary V. Vaughan <=