upgrade libtool, add fixes for libdir searching, fix up paths to .la files
[openwrt-10.03/.git] / package / libtool / patches / 120-libdir_search.patch
1 --- libtool-1.5.6/ltmain.in~libdir-la   2004-04-01 21:46:15.000000000 -0600
2 +++ libtool-1.5.6/ltmain.in     2004-05-14 22:53:51.000000000 -0500
3 @@ -2147,8 +2147,14 @@
4             absdir="$abs_ladir"
5             libdir="$abs_ladir"
6           else
7 -           dir="$libdir"
8 -           absdir="$libdir"
9 +            # Adding 'libdir' from the .la file to our library search paths
10 +            # breaks crosscompilation horribly.  We cheat here and don't add
11 +            # it, instead adding the path where we found the .la.  -CL
12 +           dir="$abs_ladir"
13 +           absdir="$abs_ladir"
14 +           libdir="$abs_ladir"
15 +           #dir="$libdir"
16 +           #absdir="$libdir"
17           fi
18         else
19           dir="$ladir/$objdir"