From 1d7dcf619f36fde9f6d5da34123ba8704630a610 Mon Sep 17 00:00:00 2001 From: Peter O'Gorman Date: Mon, 21 Jan 2008 17:47:51 +0000 Subject: [PATCH] * ltmain.in [darwin]: look in libdir for dependent libraries, the .la file may have been moved. Reported by Benjamin Reed --- ChangeLog | 6 ++++++ ltmain.in | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1d06540f9..96a399f24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-01-21 Peter O'Gorman + + * ltmain.in [darwin]: look in libdir for dependent libraries, the .la + file may have been moved. + Reported by Benjamin Reed + 2008-01-21 Bruno Haible * ltmain.in (lt_env): New variable. Use it when running commands. diff --git a/ltmain.in b/ltmain.in index 63e2024fd..3dee0baa2 100644 --- a/ltmain.in +++ b/ltmain.in @@ -2952,12 +2952,18 @@ EOF # we do not want to link against static libs, # but need to link against shared eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -n "$deplibrary_names" ; then for tmp in $deplibrary_names ; do depdepl=$tmp done - if test -f "$path/$depdepl" ; then + if test -f "$deplibdir/$depdepl" ; then + depdepl="$deplibdir/$depdepl" + elif test -f "$path/$depdepl" ; then depdepl="$path/$depdepl" + else + # Can't find it, oh well... + depdepl= fi # do not add paths which are already there case " $newlib_search_path " in -- 2.47.3