|
Line
Link Here
|
| 0 |
-- a/libltdl/config/ltmain.sh |
0 |
++ b/libltdl/config/ltmain.sh |
|
Lines 5414-5422
func_mode_link ()
Link Here
|
| 5414 |
dir="$ladir" |
5414 |
dir="$ladir" |
| 5415 |
absdir="$abs_ladir" |
5415 |
absdir="$abs_ladir" |
| 5416 |
libdir="$abs_ladir" |
5416 |
libdir="$abs_ladir" |
| 5417 |
else |
5417 |
else |
| 5418 |
dir="$libdir" |
5418 |
if test "x$CBUILD" != "x$CHOST" ; then |
| 5419 |
absdir="$libdir" |
5419 |
dir="$abs_ladir" |
|
|
5420 |
absdir="$abs_ladir" |
| 5421 |
libdir="$abs_ladir" |
| 5422 |
else |
| 5423 |
dir="$libdir" |
| 5424 |
absdir="$libdir" |
| 5425 |
fi |
| 5420 |
fi |
5426 |
fi |
| 5421 |
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes |
5427 |
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes |
| 5422 |
else |
5428 |
else |
|
Lines 5771-5777
func_mode_link ()
Link Here
|
| 5771 |
test "$hardcode_direct_absolute" = no; then |
5777 |
test "$hardcode_direct_absolute" = no; then |
| 5772 |
add="$libdir/$linklib" |
5778 |
add="$libdir/$linklib" |
| 5773 |
elif test "$hardcode_minus_L" = yes; then |
5779 |
elif test "$hardcode_minus_L" = yes; then |
| 5774 |
add_dir="-L$libdir" |
5780 |
add_dir="-L$ROOT/$libdir" |
| 5775 |
add="-l$name" |
5781 |
add="-l$name" |
| 5776 |
elif test "$hardcode_shlibpath_var" = yes; then |
5782 |
elif test "$hardcode_shlibpath_var" = yes; then |
| 5777 |
case :$finalize_shlibpath: in |
5783 |
case :$finalize_shlibpath: in |
|
Lines 5788-5794
func_mode_link ()
Link Here
|
| 5788 |
fi |
5794 |
fi |
| 5789 |
else |
5795 |
else |
| 5790 |
# We cannot seem to hardcode it, guess we'll fake it. |
5796 |
# We cannot seem to hardcode it, guess we'll fake it. |
| 5791 |
add_dir="-L$libdir" |
5797 |
add_dir="-L$ROOT/$libdir" |
| 5792 |
# Try looking first in the location we're being installed to. |
5798 |
# Try looking first in the location we're being installed to. |
| 5793 |
if test -n "$inst_prefix_dir"; then |
5799 |
if test -n "$inst_prefix_dir"; then |
| 5794 |
case $libdir in |
5800 |
case $libdir in |
