Index: ltmain.sh |
=================================================================== |
--- ltmain.sh (revision 166547) |
+++ ltmain.sh (working copy) |
@@ -69,7 +69,7 @@ |
# compiler: $LTCC |
# compiler flags: $LTCFLAGS |
# linker: $LD (gnu? $with_gnu_ld) |
-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 |
+# $progname: (GNU libtool) 2.4.2 |
# automake: $automake_version |
# autoconf: $autoconf_version |
# |
@@ -79,7 +79,7 @@ |
PROGRAM=libtool |
PACKAGE=libtool |
-VERSION="2.4.2 Debian-2.4.2-1ubuntu1" |
+VERSION=2.4.2 |
TIMESTAMP="" |
package_revision=1.3337 |
@@ -6123,10 +6123,7 @@ |
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 |
@@ -6446,19 +6443,19 @@ |
# It is a libtool convenience library, so add in its objects. |
func_append convenience " $ladir/$objdir/$old_library" |
func_append old_convenience " $ladir/$objdir/$old_library" |
- tmp_libs= |
- for deplib in $dependency_libs; do |
- deplibs="$deplib $deplibs" |
- if $opt_preserve_dup_deps ; then |
- case "$tmp_libs " in |
- *" $deplib "*) func_append specialdeplibs " $deplib" ;; |
- esac |
- fi |
- func_append 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_preserve_dup_deps ; then |
+ case "$tmp_libs " in |
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; |
+ esac |
+ fi |
+ func_append tmp_libs " $deplib" |
+ done |
continue |
fi # $pass = conv |
@@ -7351,9 +7348,6 @@ |
revision="$number_minor" |
lt_irix_increment=no |
;; |
- *) |
- func_fatal_configuration "$modename: unknown library version type \`$version_type'" |
- ;; |
esac |
;; |
no) |