From: Albert Chin-A-Young <china@thewrittenword.com>
Date: Sun, 29 Jul 2001 16:48:38 +0000 (+0000)
Subject: * libtool.m4: Prefer shl_load to dlopen	on HP-UX because
X-Git-Tag: release-1-4-1~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51da454e2937cd53085e4dd2436a3940b1da76f1;p=thirdparty%2Flibtool.git

* libtool.m4: Prefer shl_load to dlopen	on HP-UX because
dlopen won't work properly without a patch.
---

diff --git a/ChangeLog b/ChangeLog
index e08317c61..bb1a492f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-29  Albert Chin-A-Young  <china@thewrittenword.com>
+
+	* libtool.m4: Prefer shl_load to dlopen	on HP-UX because
+	dlopen won't work properly without a patch.
+
 2001-07-12  Dan McNichol  <mcnichol@austin.ibm.com>
 
 	From albert chin <china@thewrittenword.com>
diff --git a/NEWS b/NEWS
index c85bf2aec..7b496e814 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,9 @@ NEWS - list of user-visible changes between releases of GNU Libtool
 New in 1.4.1: 2001-??-??; CVS version 1.4.0a, Libtool team:
 * Don't leave here-doc files behind.
 * Improved support for OpenBSD.
-* Libtool will build with autoconf-2.50.
+* Libtool will build with autoconf-2.50 and higher.
 * Plug memory management bugs in libltdl.
+* Prefer shl_load to dlopen for better operation on HP-UX.
 
 New in 1.4: 2001-04-25; CVS version 1.3e, Libtool team:
 * Support for aix5*.
diff --git a/libtool.m4 b/libtool.m4
index 482123c69..a8b96d634 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -624,14 +624,15 @@ else
    ;;
 
   *)
-    AC_CHECK_LIB(dl, dlopen,  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-      [AC_CHECK_FUNC(dlopen, lt_cv_dlopen="dlopen",
-        [AC_CHECK_FUNC(shl_load, lt_cv_dlopen="shl_load",
-          [AC_CHECK_LIB(svld, dlopen,
-	    [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-            [AC_CHECK_LIB(dld, shl_load,
-              [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-	    ])
+    AC_CHECK_FUNC(shl_load, lt_cv_dlopen="shl_load",
+      [AC_CHECK_LIB(dld, shl_load,
+        [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"],
+        [AC_CHECK_LIB(dl, dlopen,
+          [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+          [AC_CHECK_FUNC(dlopen, lt_cv_dlopen="dlopen",
+            [AC_CHECK_LIB(svld, dlopen,
+              [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"])
+            ])
           ])
         ])
       ])