From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 7 Aug 2006 16:25:08 +0000 (+0000)
Subject: * libltdl/config/ltmain.m4sh (func_mode_execute): Also search
X-Git-Tag: release-2-1b~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1f378e90c251002a8c2690a2a7e5dc819ff37db;p=thirdparty%2Flibtool.git

* libltdl/config/ltmain.m4sh (func_mode_execute): Also search
the directory above `$objdir' for the argument of "-dlopen", as
mentioned in the error message.
---

diff --git a/ChangeLog b/ChangeLog
index 344319d20..2a2ed8ce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* libltdl/config/ltmain.m4sh (func_mode_execute): 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>
 
 	* libltdl/m4/libtool.m4 (_LT_SYS_HIDDEN_LIBDEPS): Fix issues
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 04c26d486..b2da4b18d 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -1593,7 +1593,9 @@ func_mode_execute ()
 	if test -f "$dir/$objdir/$dlname"; then
 	  dir="$dir/$objdir"
 	else
-	  func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	  fi
 	fi
 	;;