root / trunk / util / libtool.diff

ltmain.sh

@@ -2213 +2213 @@
           deplibs="$deplib $deplibs"
           continue
           ;;
-        *.la) lib="$deplib" ;;
+        *.la) lib="$("${PKG_BASE}/util/find.sh" "$deplib")"; lib="${lib%%:*}" ;;
         *.$libext)
           if test "$pass" = conv; then
             deplibs="$deplib $deplibs"
@@ -2890 +2890 @@
                 if grep "^installed=no" $deplib > /dev/null; then
                   path="$absdir/$objdir"
                 else
-                  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+                  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' "$("${PKG_BASE}/util/find.sh" "$deplib")"`
                   if test -z "$libdir"; then
                     $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
                     exit $EXIT_FAILURE
@@ -5609 +5609 @@
               case $deplib in
               *.la)
                 name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-                eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+                eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' "$("${PKG_BASE}/util/find.sh" "$deplib")"`
                 if test -z "$libdir"; then
                   $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
                   exit $EXIT_FAILURE