[SCM] GNU Libtool branch, master, updated. release-2-2-2-14-gdd09ff4

[Ralf Wildenhues]

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  dd09ff4ec877e37a20bfe912ac7a0e919dd6aa2c (commit)
      from  da1e14c91cb42dbb3a0e0ac4ee968d0cbcd3c977 (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 dd09ff4ec877e37a20bfe912ac7a0e919dd6aa2c
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Apr 19 18:27:41 2008 +0200

    Fix nonportable use of expr.
    
    * libltdl/config/ltmain.m4sh (func_mode_link) <Transforming
    deplibs into only shared deplibs>: Fix expr portability issues,
    noted on FreeBSD.  While at it, simplify and avoid forking.
    Report by Bob Friesenhahn.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                  |    6 +++++
 libltdl/config/ltmain.m4sh |   52 +++++++++++++++++++++++++++-----------------
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d482b16..4c8fb6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-04-19  Ralf Wildenhues  <address@hidden>
 
+       Fix nonportable use of expr.
+       * libltdl/config/ltmain.m4sh (func_mode_link) <Transforming
+       deplibs into only shared deplibs>: Fix expr portability issues,
+       noted on FreeBSD.  While at it, simplify and avoid forking.
+       Report by Bob Friesenhahn.
+
        Exploit shell arithmetic expansion and ${#var}.
        * libltdl/m4/libtool.m4 (_LT_CHECK_SHELL_FEATURES): Also check
        for arithmetic expansion, and ${#var}.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 30e70ec..378acae 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -5572,9 +5572,10 @@ EOF
          if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
            ldd_output=`ldd conftest`
            for i in $deplibs; do
-             name=`expr $i : '-l\(.*\)'`
-             # If $name is empty we are operating on a -L argument.
-             if test "$name" != "" && test "$name" != "0"; then
+             case $i in
+             -l*)
+               func_stripname -l '' "$i"
+               name=$func_stripname_result
                if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; 
then
                  case " $predeps $postdeps " in
                  *" $i "*)
@@ -5601,17 +5602,20 @@ EOF
                    $ECHO "*** its dynamic dependency list that programs get 
resolved with at runtime."
                  fi
                fi
-             else
+               ;;
+             *)
                newdeplibs="$newdeplibs $i"
-             fi
+               ;;
+             esac
            done
          else
            # Error occurred in the first compile.  Let's try to salvage
            # the situation: Compile a separate program for each library.
            for i in $deplibs; do
-             name=`expr $i : '-l\(.*\)'`
-             # If $name is empty we are operating on a -L argument.
-             if test "$name" != "" && test "$name" != "0"; then
+             case $i in
+             -l*)
+               func_stripname -l '' "$i"
+               name=$func_stripname_result
                $opt_dry_run || $RM conftest
                if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
                  ldd_output=`ldd conftest`
@@ -5649,9 +5653,11 @@ EOF
                  $ECHO "*** library that it depends on before this library 
will be fully"
                  $ECHO "*** functional.  Installing it before continuing would 
be even better."
                fi
-             else
+               ;;
+             *)
                newdeplibs="$newdeplibs $i"
-             fi
+               ;;
+             esac
            done
          fi
          ;;
@@ -5659,9 +5665,10 @@ EOF
          set dummy $deplibs_check_method; shift
          file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
          for a_deplib in $deplibs; do
-           name=`expr $a_deplib : '-l\(.*\)'`
-           # If $name is empty we are operating on a -L argument.
-           if test "$name" != "" && test  "$name" != "0"; then
+           case $a_deplib in
+           -l*)
+             func_stripname -l '' "$a_deplib"
+             name=$func_stripname_result
              if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; 
then
                case " $predeps $postdeps " in
                *" $a_deplib "*)
@@ -5718,19 +5725,22 @@ EOF
                  $ECHO "*** using a file magic. Last file checked: $potlib"
                fi
              fi
-           else
+             ;;
+           *)
              # Add a -L argument.
              newdeplibs="$newdeplibs $a_deplib"
-           fi
+             ;;
+           esac
          done # Gone through all deplibs.
          ;;
        match_pattern*)
          set dummy $deplibs_check_method; shift
          match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
          for a_deplib in $deplibs; do
-           name=`expr $a_deplib : '-l\(.*\)'`
-           # If $name is empty we are operating on a -L argument.
-           if test -n "$name" && test "$name" != "0"; then
+           case $a_deplib in
+           -l*)
+             func_stripname -l '' "$a_deplib"
+             name=$func_stripname_result
              if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; 
then
                case " $predeps $postdeps " in
                *" $a_deplib "*)
@@ -5769,10 +5779,12 @@ EOF
                  $ECHO "*** using a regex pattern. Last file checked: $potlib"
                fi
              fi
-           else
+             ;;
+           *)
              # Add a -L argument.
              newdeplibs="$newdeplibs $a_deplib"
-           fi
+             ;;
+           esac
          done # Gone through all deplibs.
          ;;
        none | unknown | *)


hooks/post-receive
--
GNU Libtool