From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 7 Aug 2006 16:25:31 +0000 (+0000)
Subject: * ltmain.in (execute mode): Also search the directory above `$objdir'
X-Git-Tag: release-1-5-23b~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ac3944bd012989805e1ed741a860778acf073c7;p=thirdparty%2Flibtool.git

* 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 6b5d185ab..375f0e6b4 100644
--- 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 21c56a329..b76c59ff9 100644
--- 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
 	;;