* ltmain.in [darwin]: look in libdir for dependent libraries, the .la

file may have been moved.
Reported by Benjamin Reed <ranger@befunk.com>

diff --git a/ChangeLog b/ChangeLog
index 1d06540f97e577cdd2b0c12d26bc9bfd0e980d03..96a399f248295d4d55f3a85ee76ec8284f7aa348 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-21  Peter O'Gorman  <peter@pogma.com>
+
+       * ltmain.in [darwin]: look in libdir for dependent libraries, the .la
+       file may have been moved.
+       Reported by Benjamin Reed <ranger@befunk.com>
+
 2008-01-21  Bruno Haible  <bruno@clisp.org>
 
        * ltmain.in (lt_env): New variable. Use it when running commands.

diff --git a/ltmain.in b/ltmain.in
index 63e2024fd0df9bbdb605ddf3e6e7b82d1e783d61..3dee0baa2477cf8fcb04629320b25a01ff589b29 100644 (file)
--- 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