* ltdl.m4 (AC_LTDL_DLLIB): Even though HP-UX 10.20 and 11.00

support shl_load *and* dlopen, dlopen works correctly only
with a patch. Because we want to avoid the situation where we
build on a system with the patch but deploy on a system without,
use shl_load exclusively if found.

diff --git a/ChangeLog b/ChangeLog
index c0bbbd2c6e843561baf94aa950f9294184881974..43dddbafe431e3cfca7772e04aea0d6d28190c78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-22  Albert Chin-A-Young  <china@thewrittenword.com>
+
+       * ltdl.m4 (AC_LTDL_DLLIB): Even though HP-UX 10.20 and 11.00
+       support shl_load *and* dlopen, dlopen works correctly only
+       with a patch. Because we want to avoid the situation where we
+       build on a system with the patch but deploy on a system without,
+       use shl_load exclusively if found.
+
 2001-09-22  Gary V. Vaughan  <gary@gnu.org>
 
        * libtool.m4 (_LT_AC_FILE_LTDLL_C): Be carefule that the start

diff --git a/ltdl.m4 b/ltdl.m4
index 2f5ab1193742d1721f281f3209dacbc9e2e3bd3b..337046dd9df15b040f92ae1d502ba3f0f9a2176f 100644 (file)
--- a/ltdl.m4
+++ b/ltdl.m4
@@ -250,40 +250,39 @@ AC_DEFUN([AC_LTDL_DLLIB],
 [LIBADD_DL=
 AC_SUBST(LIBADD_DL)
 AC_LANG_PUSH([C])
-AC_CHECK_LIB([dl], [dlopen],
-  [AC_DEFINE([HAVE_LIBDL], [1],
-     [Define if you have the libdl library or equivalent.])
-   LIBADD_DL="-ldl"],
-  [AC_TRY_LINK([#if HAVE_DLFCN_H
+
+AC_CHECK_FUNC([shl_load],
+      [AC_DEFINE([HAVE_SHL_LOAD], [1],
+                [Define if you have the shl_load function.])],
+  [AC_CHECK_LIB([dld], [shl_load],
+       [AC_DEFINE([HAVE_SHL_LOAD], [1],
+                  [Define if you have the shl_load function.])
+       LIBADD_DL="$LIBADD_DL -ldld"],
+    [AC_CHECK_LIB([dl], [dlopen],
+         [AC_DEFINE([HAVE_LIBDL], [1],
+                    [Define if you have the libdl library or equivalent.])
+         LIBADD_DL="-ldl"],
+      [AC_TRY_LINK([#if HAVE_DLFCN_H
 #  include <dlfcn.h>
 #endif
-    ],
-    [dlopen(0, 0);],
-    [AC_DEFINE(HAVE_LIBDL, 1,
-      [Define if you have the libdl library or equivalent.])],
-    [AC_CHECK_LIB(svld, dlopen,
-      [AC_DEFINE(HAVE_LIBDL, 1,
-        [Define if you have the libdl library or equivalent.])
-      LIBADD_DL="-lsvld"
+      ],
+       [dlopen(0, 0);],
+           [AC_DEFINE([HAVE_LIBDL], [1],
+                      [Define if you have the libdl library or equivalent.])],
+       [AC_CHECK_LIB([svld], [dlopen],
+             [AC_DEFINE([HAVE_LIBDL], [1],
+                        [Define if you have the libdl library or equivalent.])
+             LIBADD_DL="-lsvld"],
+         [AC_CHECK_LIB([dld], [dld_link],
+               [AC_DEFINE([HAVE_DLD], [1],
+                          [Define if you have the GNU dld library.])
+               LIBADD_DL="$LIBADD_DL -ldld"
+          ])
+        ])
       ])
     ])
   ])
-
-AC_CHECK_FUNC(shl_load,
-  [AC_DEFINE([HAVE_SHL_LOAD], [1],
-    [Define if you have the shl_load function.])],
-  [AC_CHECK_LIB([dld], [shl_load],
-    [AC_DEFINE([HAVE_SHL_LOAD], [1],
-      [Define if you have the shl_load function.])
-    LIBADD_DL="$LIBADD_DL -ldld"
-    ])
-  ])
-
-AC_CHECK_LIB([dld], [dld_link],
-  [AC_DEFINE([HAVE_DLD], [1],
-    [Define if you have the GNU dld library.])
-  test x"$ac_cv_lib_dld_shl_load" = xyes || LIBADD_DL="$LIBADD_DL -ldld"
-  ])
+])
 
 if test x"$ac_cv_func_dlopen" = xyes || test x"$ac_cv_lib_dl_dlopen" = xyes
 then