[SCM] GNU Libtool branch, master, updated. v2.2.10-41-g6639fdb

[Gary V. Vaughan]

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  6639fdbe2fe01d54f4bd21414c9bf6b7ec99f18b (commit)
      from  0da7d80909d02b7b13cb7d24e5318d38bf6d96bc (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 6639fdbe2fe01d54f4bd21414c9bf6b7ec99f18b
Author: Gary V. Vaughan <address@hidden>
Date:   Tue Jun 29 16:29:30 2010 +0700

    Use a real XSI compliant func_split_short_opt substitution.
    
    * libtool/m4/libtool.m4 (_LT_CHECK_SHELL_FEATURES): Remove
    test ${foo:n:m} substrings, instead adding a ${foo%??} check
    to the existing XSI tests.
    (_LT_PROG_XSI_SHELLFNS): Remove the ${foo:n:m} based
    func_split_short_opt substitution in favour of a properly
    XSI compliant substitution.
    Suggested by Paolo Bonzini.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |   11 +++++++++++
 libltdl/m4/libtool.m4 |   22 ++++++----------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e939f43..0a09fae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-06-29  Gary V. Vaughan  <address@hidden>
+
+       Use a real XSI compliant func_split_short_opt substitution.
+       * libtool/m4/libtool.m4 (_LT_CHECK_SHELL_FEATURES): Remove
+       test ${foo:n:m} substrings, instead adding a ${foo%??} check
+       to the existing XSI tests.
+       (_LT_PROG_XSI_SHELLFNS): Remove the ${foo:n:m} based
+       func_split_short_opt substitution in favour of a properly
+       XSI compliant substitution.
+       Suggested by Paolo Bonzini.
+
 2010-06-28  Gary V. Vaughan  <address@hidden>
 
        Add func_append_quoted and do inline func_append substitutions.
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 01a9c41..7140627 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -7211,8 +7211,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
 # Try some XSI features
 xsi_shell=no
 ( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
+  test 
"${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
@@ -7227,14 +7227,6 @@ lt_shell_append=no
 AC_MSG_RESULT([$lt_shell_append])
 _LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
 
-AC_MSG_CHECKING([whether the shell understands variable substring :-syntax])
-lt_shell_substring=no
-( _lt_dummy="-bar"
-  test "${_lt_dummy:0:2},${_lt_dummy:2}" = -b,ar ) >/dev/null 2>&1 \
-&& lt_shell_substring=yes
-AC_MSG_RESULT([$lt_shell_substring])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_substring='$lt_shell_substring'])
-
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   lt_unset=unset
 else
@@ -7309,6 +7301,10 @@ m4_defun([_LT_PROG_XSI_SHELLFNS],
     func_split_long_opt_name=${1%%=*}
     func_split_long_opt_arg=${1#*=}])
 
+  _LT_PROG_XSI_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+
   _LT_PROG_XSI_REPLACE([func_lo2o], [dnl
     case ${1} in
       *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
@@ -7343,12 +7339,6 @@ else
   test 0 -eq $? || _lt_xsi_replace_fail=:
 fi
 
-if test x"$lt_shell_substring" = xyes; then
-  _LT_PROG_XSI_REPLACE([func_split_short_opt], [dnl
-    func_split_short_opt_name=${1:0:2}
-    func_split_short_opt_arg=${1:2}])
-fi
-
 if test x"$_lt_xsi_replace_fail" = x":"; then
   AC_MSG_WARN([Unable to substitute faster XSI functions in $ofile]) 
 fi


hooks/post-receive
-- 
GNU Libtool