1 files changed, 10 insertions, 2 deletions

diff --git a/ltmain.sh b/ltmain.sh
index 06823e05..c715b594 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
+VERSION="1.5.22 Debian 1.5.22-4"
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
 # See if we are running on zsh, and set the options which allow our
@@ -2082,7 +2082,10 @@ EOF
         case $pass in
         dlopen) libs="$dlfiles" ;;
         dlpreopen) libs="$dlprefiles" ;;
-        link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+        link)
+          libs="$deplibs %DEPLIBS%"
+          test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+          ;;
         esac
       fi
       if test "$pass" = dlopen; then
@@ -3201,6 +3204,11 @@ EOF
             age="$number_minor"
             revision="$number_minor"
             ;;
+          *)
+            $echo "$modename: unknown library version type \`$version_type'" 1>&2
+            $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+            exit $EXIT_FAILURE
+            ;;
           esac
           ;;
         no)