Build sys update after applying prelude patches.

remotes/origin/master-1.0.x
Victor Julien 16 years ago
parent 4515ae13e4
commit faf6e82aa4

@ -65,7 +65,7 @@
# compiler: $LTCC # compiler: $LTCC
# compiler flags: $LTCFLAGS # compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld) # 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 # automake: $automake_version
# autoconf: $autoconf_version # autoconf: $autoconf_version
# #
@ -73,7 +73,7 @@
PROGRAM=ltmain.sh PROGRAM=ltmain.sh
PACKAGE=libtool PACKAGE=libtool
VERSION="2.2.6 Debian-2.2.6a-1ubuntu1" VERSION="2.2.6 Debian-2.2.6a-4"
TIMESTAMP="" TIMESTAMP=""
package_revision=1.3012 package_revision=1.3012
@ -5347,9 +5347,6 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects. # It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library" convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library" old_convenience="$old_convenience $ladir/$objdir/$old_library"
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
tmp_libs= tmp_libs=
for deplib in $dependency_libs; do for deplib in $dependency_libs; do
deplibs="$deplib $deplibs" deplibs="$deplib $deplibs"
@ -5360,6 +5357,9 @@ func_mode_link ()
fi fi
tmp_libs="$tmp_libs $deplib" tmp_libs="$tmp_libs $deplib"
done done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
continue continue
fi # $pass = conv fi # $pass = conv
@ -5896,6 +5896,7 @@ func_mode_link ()
if test "$link_all_deplibs" != no; then if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries # Add the search paths of all dependency libraries
for deplib in $dependency_libs; do for deplib in $dependency_libs; do
path=
case $deplib in case $deplib in
-L*) path="$deplib" ;; -L*) path="$deplib" ;;
*.la) *.la)

Loading…
Cancel
Save