|
|
|
@ -65,7 +65,7 @@
|
|
|
|
|
# compiler: $LTCC
|
|
|
|
|
# compiler flags: $LTCFLAGS
|
|
|
|
|
# linker: $LD (gnu? $with_gnu_ld)
|
|
|
|
|
# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1
|
|
|
|
|
# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
|
|
|
|
|
# automake: $automake_version
|
|
|
|
|
# autoconf: $autoconf_version
|
|
|
|
|
#
|
|
|
|
@ -73,7 +73,7 @@
|
|
|
|
|
|
|
|
|
|
PROGRAM=ltmain.sh
|
|
|
|
|
PACKAGE=libtool
|
|
|
|
|
VERSION="2.2.6 Debian-2.2.6a-1ubuntu1"
|
|
|
|
|
VERSION="2.2.6 Debian-2.2.6a-4"
|
|
|
|
|
TIMESTAMP=""
|
|
|
|
|
package_revision=1.3012
|
|
|
|
|
|
|
|
|
@ -5347,19 +5347,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,6 +5896,7 @@ 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)
|
|
|
|
|