1 files changed, 19 insertions, 26 deletions

diff --git a/ltmain.sh b/ltmain.sh
index d88da2c2..b36c4ad3 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,6 +1,6 @@
 # Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6b
+# ltmain.sh (GNU libtool) 2.2.6
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
 #       compiler:               $LTCC
 #       compiler flags:         $LTCFLAGS
 #       linker:         $LD (gnu? $with_gnu_ld)
-#       $progname:              (GNU libtool) 2.2.6b Debian-2.2.6b-2
+#       $progname:              (GNU libtool) 2.2.6
 #       automake:               $automake_version
 #       autoconf:               $autoconf_version
 #
@@ -73,9 +73,9 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2"
+VERSION=2.2.6
 TIMESTAMP=""
-package_revision=1.3017
+package_revision=1.3012
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -116,15 +116,15 @@ $lt_unset CDPATH
 
 : ${CP="cp -f"}
 : ${ECHO="echo"}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
+: ${EGREP="/usr/bin/grep -E"}
+: ${FGREP="/usr/bin/grep -F"}
+: ${GREP="/usr/bin/grep"}
 : ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
+: ${SED="/opt/local/bin/gsed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -5033,10 +5033,7 @@ func_mode_link ()
         case $pass in
         dlopen) libs="$dlfiles" ;;
         dlpreopen) libs="$dlprefiles" ;;
-        link)
-          libs="$deplibs %DEPLIBS%"
-          test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-          ;;
+        link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
         esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -5347,19 +5344,19 @@ func_mode_link ()
             # It is a libtool convenience library, so add in its objects.
             convenience="$convenience $ladir/$objdir/$old_library"
             old_convenience="$old_convenience $ladir/$objdir/$old_library"
-            tmp_libs=
-            for deplib in $dependency_libs; do
-              deplibs="$deplib $deplibs"
-              if $opt_duplicate_deps ; then
-                case "$tmp_libs " in
-                *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-                esac
-              fi
-              tmp_libs="$tmp_libs $deplib"
-            done
           elif test "$linkmode" != prog && test "$linkmode" != lib; then
             func_fatal_error "\`$lib' is not a convenience library"
           fi
+          tmp_libs=
+          for deplib in $dependency_libs; do
+            deplibs="$deplib $deplibs"
+            if $opt_duplicate_deps ; then
+              case "$tmp_libs " in
+              *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+              esac
+            fi
+            tmp_libs="$tmp_libs $deplib"
+          done
           continue
         fi # $pass = conv
 
@@ -5896,7 +5893,6 @@ func_mode_link ()
           if test "$link_all_deplibs" != no; then
             # Add the search paths of all dependency libraries
             for deplib in $dependency_libs; do
-              path=
               case $deplib in
               -L*) path="$deplib" ;;
               *.la)
@@ -6210,9 +6206,6 @@ func_mode_link ()
             revision="$number_minor"
             lt_irix_increment=no
             ;;
-          *)
-            func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-            ;;
           esac
           ;;
         no)