| Index: ltmain.sh
|
| diff --git a/ltmain.sh b/ltmain.sh
|
| index 63ae69dc6fecaf83c52fba2ad334f4b1369fb1cd..a356acafa4548959e97355d1e8044b7201661754 100644
|
| --- a/ltmain.sh
|
| +++ b/ltmain.sh
|
| @@ -70,7 +70,7 @@
|
| # compiler: $LTCC
|
| # compiler flags: $LTCFLAGS
|
| # linker: $LD (gnu? $with_gnu_ld)
|
| -# $progname: (GNU libtool) 2.4.2
|
| +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
|
| # automake: $automake_version
|
| # autoconf: $autoconf_version
|
| #
|
| @@ -80,7 +80,7 @@
|
|
|
| PROGRAM=libtool
|
| PACKAGE=libtool
|
| -VERSION=2.4.2
|
| +VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
|
| TIMESTAMP=""
|
| package_revision=1.3337
|
|
|
| @@ -6124,7 +6124,10 @@ func_mode_link ()
|
| 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 "$linkmode,$pass" = "lib,dlpreopen"; then
|
| @@ -6444,19 +6447,19 @@ func_mode_link ()
|
| # 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
|
|
|
| @@ -7349,6 +7352,9 @@ func_mode_link ()
|
| revision="$number_minor"
|
| lt_irix_increment=no
|
| ;;
|
| + *)
|
| + func_fatal_configuration "$modename: unknown library version type \`$version_type'"
|
| + ;;
|
| esac
|
| ;;
|
| no)
|
|
|