* libltdl/m4/libtool.m4 (LT_SYS_DLOPEN_SELF): Use

`lt_prog_compile_static', not `link_static_flag'.  Expand `$wl'
so expansion of `export_dynamic_flag_spec' works.
(_LT_TRY_DLOPEN_SELF): Show dlerror() in case of failure.
(_LT_LINKER_SHLIBS) [ aix3 ]: Likewise.
(_LT_COMPILER_PIC) [ hpux* ]: Use `${wl}'.
This commit is contained in:
Kean Johnston 2005-11-01 16:08:48 +00:00 committed by Ralf Wildenhues
parent 71899651a3
commit 41520bf0e0
2 changed files with 16 additions and 4 deletions

View File

@ -1,3 +1,13 @@
2005-11-01 Kean Johnston <jkj@sco.com>,
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* libltdl/m4/libtool.m4 (LT_SYS_DLOPEN_SELF): Use
`lt_prog_compile_static', not `link_static_flag'. Expand `$wl'
so expansion of `export_dynamic_flag_spec' works.
(_LT_TRY_DLOPEN_SELF): Show dlerror() in case of failure.
(_LT_LINKER_SHLIBS) [ aix3 ]: Likewise.
(_LT_COMPILER_PIC) [ hpux* ]: Use `${wl}'.
2005-11-01 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* THANKS: Updated.

10
libltdl/m4/libtool.m4 vendored
View File

@ -1507,6 +1507,8 @@ int main ()
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
else
puts (dlerror ());
exit (status);
}]
@ -1613,7 +1615,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_TRY_DLOPEN_SELF(
@ -3358,14 +3360,14 @@ m4_if([$1], [CXX], [
case $cc_basename in
CC*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
_LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
if test "$host_cpu" != ia64; then
_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
fi
;;
aCC*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
_LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
case $host_cpu in
hppa*64*|ia64*)
# +Z the default
@ -4065,7 +4067,7 @@ _LT_EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_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_TAGVAR(hardcode_direct, $1)=unsupported