From: Alexandre Oliva <aoliva@redhat.com>
Date: Mon, 4 Sep 2000 06:09:43 +0000 (+0000)
Subject: * libltdl/ltdl.c (load_deplibs): Don't append shlib_ext; use
X-Git-Tag: multi-language-merge-point~147
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c65b4099abd745be75950a1de4406ea9bb86f80;p=thirdparty%2Flibtool.git

* libltdl/ltdl.c (load_deplibs): Don't append shlib_ext; use
lt_dlopenext() instead.
---

diff --git a/ChangeLog b/ChangeLog
index 2fd3d6711..def15fece 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-09-04  Alexandre Oliva  <aoliva@redhat.com>
 
+	* libltdl/ltdl.c (load_deplibs): Don't append shlib_ext; use
+	lt_dlopenext() instead.
+
 	* ltmain.in (link -static): Don't add $link_static_flag; only
 	-all-static should do that.
 	* mdemo/configure.in: Revert the previous delta.
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index ac2540d6a..4bcf3ed44 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -1165,10 +1165,10 @@ load_deplibs(handle, deplibs)
 		ret = 0;
 		goto cleanup;
 	}
-	names = lt_dlmalloc(depcount * sizeof(char*));
+	names = (char**)lt_dlmalloc(depcount * sizeof(char*));
 	if (!names)
 		goto cleanup;
-	handles = lt_dlmalloc(depcount * sizeof(lt_dlhandle*));
+	handles = (lt_dlhandle*)lt_dlmalloc(depcount * sizeof(lt_dlhandle*));
 	if (!handles)
 		goto cleanup;
 	depcount = 0;
@@ -1185,9 +1185,9 @@ load_deplibs(handle, deplibs)
 				*end = 0; /* set a temporary string terminator */
 				if (strncmp(p, "-l", 2) == 0) {
 					name = lt_dlmalloc(3+ /* "lib" */
-					 strlen(p+2)+strlen(shlib_ext)+1);
+							   strlen(p+2)+1);
 					if (name)
-						sprintf(name, "lib%s%s", p+2, shlib_ext);
+						sprintf (name, "lib%s", p+2);
 				} else
 					name = strdup(p);
 				if (name)
@@ -1202,7 +1202,7 @@ load_deplibs(handle, deplibs)
 	}
 	/* load the deplibs (in reverse order) */
 	for (i = 0; i < depcount; i++) {
-		lt_dlhandle handle = lt_dlopen(names[depcount-1-i]);
+		lt_dlhandle handle = lt_dlopenext(names[depcount-1-i]);
 		if (!handle) {
 			int j;
 			for (j = 0; j < i; j++)