[SCM] GNU Libtool branch, master, updated. v2.4.2-134-g8a59ee7
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 8a59ee7f0acdb83c3df12f47638966675a8af051 (commit) via e1f7c41462d9dd25c3ca92b7eae43838570e99e1 (commit) via 6bb8312ccf3f2505ad7d4b2f1572ea749c138623 (commit) from d5bcbf5f85ac1b4f5de75b7fec86ba220651c95e (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 8a59ee7f0acdb83c3df12f47638966675a8af051 Author: Gary V. Vaughan g...@gnu.org Date: Sat Nov 19 22:33:16 2011 +0700 libtoolize: refactor copying filter creation. Prevent the various require_filter functions from becoming too long by factoring common code into new functions. * libtoolize (func_make_relative_dir_filter) (func_make_relative_ltdl_filter): New functions. Generalize and consolidate the various similar snippets for concatenating together the sed scripts for func_copy filtering. (require_filter_Makefile_am, require_filter_aclocal_m4) (require_filter_configure_ac): Simplify. (require_ltdl_relative_aux_dir): Remove. (require_ltdl_relative_macro_dir): Ditto. Signed-off-by: Gary V. Vaughan g...@gnu.org commit e1f7c41462d9dd25c3ca92b7eae43838570e99e1 Author: Gary V. Vaughan g...@gnu.org Date: Sat Nov 19 20:54:43 2011 +0700 maint: pick XSI funcs at runtime, not configure time. Determine, on a function by function basis, what XSI features are available in the shell that is actually running the script, rather than the one that was picked at configure time by the re-execution engine. * m4/libtool.m4 (_LT_PROG_FUNCTION_REPLACE) (_LT_PROG_REPLACE_SHELLFNS): Remove. (_LT_CHECK_SHELL_FEATURES): Remove tests for XSI and += support. * build-aux/general.m4sh (func_append, func_append_quoted) (func_arith, func_len, func_basename, func_dirname) (func_dirname_and_basename, func_stripname): List both enhanced and fallback implementations, and choose one based on whether the enhanced features required by the fastest version are available. * build-aux/getopt.m4sh (func_split_short_opt) (func_split_long_opt): Ditto. * build-aux/ltmain.m4sh (func_lo2o, func_xform): Ditto. * tests/getopt-m4sh.at: Add tests for enhanced and fallback implementations of func_arith, func_len, func_stripname and func_dirname_and_basename. * NEWS: Updated. Signed-off-by: Gary V. Vaughan g...@gnu.org commit 6bb8312ccf3f2505ad7d4b2f1572ea749c138623 Author: Gary V. Vaughan g...@gnu.org Date: Sat Nov 19 18:01:28 2011 +0700 maint: share useful functions from general.m4sh. * build-aux/ltmain.m4sh (func_append, func_append_quoted) (func_arith, func_len): Removed from here... * build-aux/general.m4sh (func_append, func_append_quoted) (func_arith, func_len): ...and added to here. (func_dirname, func_dirname_and_basename, func_normal_abspath) (func_relative_path): Use func_append. * tests/getopt-m4sh.at (_LT_AT_FALLBACK_FUNC_EXTRACT): Removed. Fallback functions are now in any m4sh generated file automatically. Signed-off-by: Gary V. Vaughan g...@gnu.org --- Summary of changes: NEWS |4 + build-aux/general.m4sh | 186 +++- build-aux/getopt.m4sh | 45 build-aux/ltmain.m4sh | 69 +++--- libtoolize.m4sh| 161 ++--- m4/libtool.m4 | 117 +-- tests/getopt-m4sh.at | 130 + 7 files changed, 385 insertions(+), 327 deletions(-) diff --git a/NEWS b/NEWS index 0479a34..ecd4fa1 100644 --- a/NEWS +++ b/NEWS @@ -49,6 +49,10 @@ NEWS - list of user-visible changes between releases of GNU Libtool mode is selected; `--standalone' never worked, and is no longer accepted. - Libtool and libtoolize no longer choke on paths with a comma in them. + - In the case where $SHELL does not have the same enhanced features +(e.g. the ability to parse `var+=append') as $CONFIG_SHELL, libtool +will now correctly fallback to using only vanilla shell features +instead of failing with a parse at startup. ** Important incompatible changes: diff --git a/build-aux/general.m4sh b/build-aux/general.m4sh index 566dc39..252b2d2 100644 --- a/build-aux/general.m4sh +++ b/build-aux/general.m4sh @@ -73,29 +73,140 @@ IFS= $lt_nl dirname='s|/[^/]*$||' basename='s|^.*/||' -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the
[SCM] GNU Libtool branch, master, updated. v2.4.2-138-gf7bd6bd
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 f7bd6bd9ccc54a061702b66d3fe9da4fdadcd2fc (commit)
via ccd0cea1a598f59287e97f2dbc0204f04965d004 (commit)
via 28471749102ee5c566557525f358c8ca50aa5023 (commit)
via 083d303cb8e77b5aed0315c65672b2066eb8a696 (commit)
from 8a59ee7f0acdb83c3df12f47638966675a8af051 (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 f7bd6bd9ccc54a061702b66d3fe9da4fdadcd2fc
Author: Gary V. Vaughan g...@gnu.org
Date: Thu Dec 8 17:38:13 2011 +0700
tests: s/snippit/snippet/.
* tests/demo/foo.h, tests/pdemo/foo.h: Spell `snippet' correctly.
Reported by Stefano Lattarini.
Signed-off-by: Gary V. Vaughan g...@gnu.org
commit ccd0cea1a598f59287e97f2dbc0204f04965d004
Author: Gary V. Vaughan g...@gnu.org
Date: Thu Dec 8 17:33:28 2011 +0700
tests: make sure file restore traps are called correctly on AIX.
* tests/demo-noinst-link.test (func_save_files): set the restore
trap outside a function, otherwise AIX 5.3 /bin/sh will run the
trap at the end of the function, instead of when the script
exits.
* tests/demo-relink.test (func_save_files): Ditto.
* tests/depdemo-relink.test (func_save_files): Ditto.
Reported by Stefano Lattarini.
Signed-off-by: Gary V. Vaughan g...@gnu.org
commit 28471749102ee5c566557525f358c8ca50aa5023
Author: Gary V. Vaughan g...@gnu.org
Date: Thu Dec 8 17:11:45 2011 +0700
maint: eliminate some more spurious leading Xs.
* m4/libtool.m4: Reverse argument order to eliminate spurious
leading X's.
Signed-off-by: Gary V. Vaughan g...@gnu.org
commit 083d303cb8e77b5aed0315c65672b2066eb8a696
Author: Gary V. Vaughan g...@gnu.org
Date: Thu Dec 8 17:09:02 2011 +0700
bootstrap: put back missing spaces before parens.
* bootstrap (func_require_buildreq_autobuild)
(func_require_buildreq_automake): Vi's delete word command is
too greedy and also eats trailing whitespace before following
non-word-chars. Put back the spaces it ate so that
syntax-checks pass once again.
Signed-off-by: Gary V. Vaughan g...@gnu.org
---
Summary of changes:
bootstrap |4 ++--
m4/libtool.m4 |4 ++--
tests/demo-noinst-link.test |5 -
tests/demo-relink.test |4 +++-
tests/demo/foo.h|2 +-
tests/depdemo-relink.test |4 +++-
tests/pdemo/foo.h |2 +-
7 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/bootstrap b/bootstrap
index 28f85b0..147ac08 100755
--- a/bootstrap
+++ b/bootstrap
@@ -972,7 +972,7 @@ func_require_build_aux ()
# --
# Try to find whether the bootstrap requires autobuild.
require_buildreq_autobuild=func_require_buildreq_autobuild
-func_require_buildreq_autobuild()
+func_require_buildreq_autobuild ()
{
$debug_cmd
@@ -1041,7 +1041,7 @@ done
# Try to find the minimum compatible version of automake required to
# bootstrap successfully, and add it to `$buildreq'.
require_buildreq_automake=func_require_buildreq_automake
-func_require_buildreq_automake()
+func_require_buildreq_automake ()
{
$debug_cmd
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 0eef323..9c2574f 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -198,7 +198,7 @@ aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
- if test X${COLLECT_NAMES+set} != Xset; then
+ if test set != ${COLLECT_NAMES+set}; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -739,7 +739,7 @@ _LT_EOF
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
-if test X${COLLECT_NAMES+set} != Xset; then
+if test set != ${COLLECT_NAMES+set}; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
diff --git a/tests/demo-noinst-link.test b/tests/demo-noinst-link.test
index 5e658b0..5654ff9 100755
--- a/tests/demo-noinst-link.test
+++ b/tests/demo-noinst-link.test
@@ -38,13 +38,16 @@ func_save_files ()
func_mkdir_p $objdir/temp/libs
cp -f libhello.la hell$EXEEXT $objdir/temp
cp -f $objdir/* $objdir/temp/libs
-trap func_restore_files 0 1 2 13 15
}
func_require demo-inst $prefix/lib/libhello.la
func_mkprefixdir
func_cd tests/demo
+
+# AIX 5.3 `/bin/sh' will invoke the trap for 0 at the end of a
+# function, so we set the trap outside of a
