* libtool.m4 (AC_LIBTOOL_DLOPEN_SELF): Use

`lt_prog_compile_static', not `link_static_flag'.  Expand `$wl'
so expansion of `export_dynamic_flag_spec' works.
(_LT_AC_TRY_DLOPEN_SELF): Show dlerror() in case of failure.
(AC_LIBTOOL_PROG_LD_SHLIBS) [ aix3 ]: Likewise.
(AC_LIBTOOL_PROG_COMPILER_PIC) [ hpux* ]: Use `${wl}'.

diff --git a/ChangeLog b/ChangeLog
index 00fd0b630ba9a2046dcb275a567ef1afaba41ce5..06724fae71dc46d9fd9ceb5398ee198c7d88f9c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-11-01  Kean Johnston  <jkj@sco.com>,
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * libtool.m4 (AC_LIBTOOL_DLOPEN_SELF): Use
+       `lt_prog_compile_static', not `link_static_flag'.  Expand `$wl'
+       so expansion of `export_dynamic_flag_spec' works.
+       (_LT_AC_TRY_DLOPEN_SELF): Show dlerror() in case of failure.
+       (AC_LIBTOOL_PROG_LD_SHLIBS) [ aix3 ]: Likewise.
+       (AC_LIBTOOL_PROG_COMPILER_PIC) [ hpux* ]: Use `${wl}'.
+
 2005-11-01  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * THANKS: Updated.

diff --git a/libtool.m4 b/libtool.m4
index d93e5cc3d2d65d0e08392e4ac03f9b7239b8191a..acd1ee09e0e0ee617823d062d9aef9d9838080be 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -854,6 +854,8 @@ int main ()
       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
+  else
+    puts (dlerror ());
 
     exit (status);
 }]
@@ -960,7 +962,7 @@ else
     ])
 
     if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
          lt_cv_dlopen_self_static, [dnl
          _LT_AC_TRY_DLOPEN_SELF(
@@ -4861,14 +4863,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
        case $cc_basename in
          CC*)
            _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
            if test "$host_cpu" != ia64; then
              _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
            fi
            ;;
          aCC*)
            _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
            case $host_cpu in
            hppa*64*|ia64*)
              # +Z the default
@@ -5527,7 +5529,7 @@ EOF
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
        # Neither direct hardcoding nor static linking is supported with a
        # broken collect2.
        _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported