* ltmain.in (execute mode): Also search the directory above `$objdir'

for the argument of "-dlopen", as mentioned in the error message.

diff --git a/ChangeLog b/ChangeLog
index 6b5d185ab042c39d4ea7a2594454d1b7766e06f0..375f0e6b4608aa1931477cd6f2794105aef286cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * ltmain.in (execute mode): Also search the directory above `$objdir'
+       for the argument of "-dlopen", as mentioned in the error message.
+
 2006-08-03  Ralf Menzel  <menzel@ls6.cs.uni-dortmund.de>
 
        * libtool.m4 (AC_LIBTOOL_POSTDEP_PREDEP): Previous patch

diff --git a/ltmain.in b/ltmain.in
index 21c56a32933ccd88514da51829f87fef96c74458..b76c59ff952112d5fb780f3cfef4f3c0f69a1327 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -6406,8 +6406,10 @@ relink_command=\"$relink_command\""
        if test -f "$dir/$objdir/$dlname"; then
          dir="$dir/$objdir"
        else
-         $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-         exit $EXIT_FAILURE
+         if test ! -f "$dir/$dlname"; then
+           $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+           exit $EXIT_FAILURE
+         fi
        fi
        ;;