From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Mon, 22 Feb 1999 19:24:55 +0000 (+0000)
Subject: * libltdl/configure.in: check for dld.h
X-Git-Tag: release-1-2f~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f95e55ad09ff81713c81a882b49bc2165990c52b;p=thirdparty%2Flibtool.git

* libltdl/configure.in: check for dld.h
* libltdl/ltdl.c: include dld.h
(dld_open) it's spelled memory_error, not no_memory_error
Reported by Stefan Burstroem <f94sbu@efd.lth.se>
---

diff --git a/ChangeLog b/ChangeLog
index 5b2a3f919..918be46dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-02-22  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* libltdl/configure.in: check for dld.h
+	* libltdl/ltdl.c: include dld.h
+	(dld_open) it's spelled memory_error, not no_memory_error
+	Reported by Stefan Burstroem <f94sbu@efd.lth.se>
+	
 	* ltmain.in: fix typos in my last change (s/ocmpile/compile/)
 
 1999-02-21  Thomas Tanner  <tanner@gmx.de>
diff --git a/libltdl/configure.in b/libltdl/configure.in
index 391367d96..3785958af 100644
--- a/libltdl/configure.in
+++ b/libltdl/configure.in
@@ -82,7 +82,7 @@ AC_DEFINE_UNQUOTED(LTDL_OBJDIR, "$libltdl_cv_objdir/",
   [Define to the sub-directory in which libtool stores uninstalled libraries. ])
 
 AC_HEADER_STDC
-AC_CHECK_HEADERS(malloc.h memory.h stdlib.h stdio.h ctype.h dlfcn.h dl.h)
+AC_CHECK_HEADERS(malloc.h memory.h stdlib.h stdio.h ctype.h dlfcn.h dl.h dld.h)
 AC_CHECK_HEADERS(string.h strings.h, break)
 AC_CHECK_FUNCS(strdup strchr strrchr index rindex)
 
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 228126bfb..9f08672b8 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -407,6 +407,10 @@ shl = { LTDL_TYPE_TOP, 0, shl_init, shl_exit,
 
 /* dynamic linking with dld */
 
+#if HAVE_DLD_H
+#include <dld.h>
+#endif
+
 static int
 dld_init ()
 {
@@ -426,7 +430,7 @@ dld_open (handle, filename)
 {
 	handle->handle = strdup(filename);
 	if (!handle->handle) {
-		last_error = no_memory_error;
+		last_error = memory_error;
 		return 1;
 	}
 	if (dld_link(filename) != 0) {