From: Alexandre Oliva <aoliva@redhat.com>
Date: Mon, 4 Sep 2000 01:17:42 +0000 (+0000)
Subject: * ltmain.in (newdlprefiles): Use dlname if it's available and
X-Git-Tag: multi-language-merge-point~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=559474b7aeae0d554d3176c27b6f8b1faf4464dd;p=thirdparty%2Flibtool.git

* ltmain.in (newdlprefiles): Use dlname if it's available and
old_library isn't; use linklib only if dlname is not available.
---

diff --git a/ChangeLog b/ChangeLog
index 864eda88e..ff9d61264 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-09-03  Alexandre Oliva  <aoliva@redhat.com>
 
+	* ltmain.in (newdlprefiles): Use dlname if it's available and
+	old_library isn't; use linklib only if dlname is not available.
+
 	* ltconfig.in (enable_dlopen): Set to no when lt_cv_dlopen is no.
 
 	* libtool.m4 (AM_PROG_GCJ): Removed.
diff --git a/ltmain.in b/ltmain.in
index d05954125..145e56900 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -1821,6 +1821,9 @@ EOF
 	  # are required to link).
 	  if test -n "$old_library"; then
 	    newdlprefiles="$newdlprefiles $dir/$old_library"
+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
+	  elif test -n "$dlname"; then
+	    newdlprefiles="$newdlprefiles $dir/$dlname"
 	  else
 	    newdlprefiles="$newdlprefiles $dir/$linklib"
 	  fi