From Albert Chin <china@thewrittenword.com>:

* libtool.m4 (_LT_AC_LANG_C_CONFIG) [aix4*]: Be careful with
shared namespaces for static and shared libs.
(AC_LIBTOOL_DLOPEN_SELF): If all else fails, try dld_link from GNU
DLD.

diff --git a/ChangeLog b/ChangeLog
index 9bf7f30e762fdd3868ac7e831590f535b1e16140..3e8a407c06621ec1c10f2cda019b6271d357c211 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-02  Gary V. Vaughan  <gary@gnu.org>
+
+       From Albert Chin <china@thewrittenword.com>:
+       * libtool.m4 (_LT_AC_LANG_C_CONFIG) [aix4*]: Be careful with
+       shared namespaces for static and shared libs.
+       (AC_LIBTOOL_DLOPEN_SELF): If all else fails, try dld_link from GNU
+       DLD.
+
 2001-09-02  Christopher Pfisterer <cp@chrisp.de>
 
        * libtool.m4, ltmain.in: Linker flag and version numbering fixes

diff --git a/libtool.m4 b/libtool.m4
index c072818f84caa0486c2f71b7e59574c1698202e8..b23535563d72ffb0538d3faff2a2beb1ab326fd3 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -735,17 +735,22 @@ else
    ;;
 
   *)
-    AC_CHECK_FUNC(shl_load, lt_cv_dlopen="shl_load",
-      [AC_CHECK_LIB(dld, shl_load,
-        [lt_cv_dlopen="shl_load" 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"])
+    AC_CHECK_FUNC([shl_load],
+          [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+            [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+       [AC_CHECK_FUNC([dlopen],
+             [lt_cv_dlopen="dlopen"],
+         [AC_CHECK_LIB([dl], [dlopen],
+               [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+           [AC_CHECK_LIB([svld], [dlopen],
+                 [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+             [AC_CHECK_LIB([dld], [dld_link],
+                   [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+             ])
            ])
-          ])
-        ])
+         ])
+       ])
       ])
     ;;
   esac
@@ -2236,7 +2241,9 @@ aix3*)
   ;;
 
 aix4*)
-  test "$enable_shared" = yes && enable_static=no
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
   ;;
 esac
 AC_MSG_RESULT([$enable_shared])