Index: third_party/libxslt/ltmain.sh |
diff --git a/third_party/sqlite/sqlite-src-3080704/autoconf/ltmain.sh b/third_party/libxslt/ltmain.sh |
similarity index 99% |
copy from third_party/sqlite/sqlite-src-3080704/autoconf/ltmain.sh |
copy to third_party/libxslt/ltmain.sh |
index 6a2f1166a9faedeae061e75acc6ac6ff389134b1..a356acafa4548959e97355d1e8044b7201661754 100644 |
--- a/third_party/sqlite/sqlite-src-3080704/autoconf/ltmain.sh |
+++ b/third_party/libxslt/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 |
@@ -6513,7 +6516,7 @@ func_mode_link () |
# Find the relevant object directory and library name. |
if test "X$installed" = Xyes; then |
if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then |
- #func_warning "library \`$lib' was moved." |
+ func_warning "library \`$lib' was moved." |
dir="$ladir" |
absdir="$abs_ladir" |
libdir="$abs_ladir" |
@@ -7080,8 +7083,8 @@ func_mode_link () |
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
test -z "$libdir" && \ |
func_fatal_error "\`$deplib' is not a valid libtool archive" |
- #test "$absdir" != "$libdir" && \ |
- # func_warning "\`$deplib' seems to be moved" |
+ test "$absdir" != "$libdir" && \ |
+ func_warning "\`$deplib' seems to be moved" |
path="-L$absdir" |
fi |
@@ -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) |