I applied this to branch-1-5, it is not relevant in HEAD.

Thanks,
Peter
-- 
Peter O'Gorman
http://pogma.com
2008-01-21  Peter O'Gorman  <[EMAIL PROTECTED]>

	* ltmain.in [darwin]: look in libdir for dependent libraries, the .la
	file may have been moved.
	Reported by Benjamin Reed <[EMAIL PROTECTED]>

Index: ltmain.in
===================================================================
RCS file: /sources/libtool/libtool/Attic/ltmain.in,v
retrieving revision 1.334.2.147
diff -u -r1.334.2.147 ltmain.in
--- ltmain.in	21 Jan 2008 15:01:24 -0000	1.334.2.147
+++ ltmain.in	21 Jan 2008 17:45:48 -0000
@@ -2952,12 +2952,18 @@
 		  # 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

Reply via email to