mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-01-12 14:06:37 +08:00
* ltmain.in (prefer_static_libs): New variable, set to no by
default, but set to yes by -static and -all-static. Used instead of build_libtool_libs to decide whether to use a shared or static version of a library, when both versions are available.
This commit is contained in:
parent
39328123fa
commit
c4221fc830
@ -1,3 +1,10 @@
|
||||
1999-04-25 Alexandre Oliva <oliva@dcc.unicamp.br>
|
||||
|
||||
* ltmain.in (prefer_static_libs): New variable, set to no by
|
||||
default, but set to yes by -static and -all-static. Used instead
|
||||
of build_libtool_libs to decide whether to use a shared or static
|
||||
version of a library, when both versions are available.
|
||||
|
||||
1999-04-25 Boyd Lynn Gerber <gerberb@zenez.com>
|
||||
|
||||
* ltconfig.in (sco3.2v5*): Use LD_RUN_PATH for hard-coding.
|
||||
|
24
ltmain.in
24
ltmain.in
@ -811,6 +811,7 @@ compiler."
|
||||
ltlibs=
|
||||
module=no
|
||||
objs=
|
||||
prefer_static_libs=no
|
||||
preload=no
|
||||
prev=
|
||||
prevarg=
|
||||
@ -841,6 +842,7 @@ compiler."
|
||||
fi
|
||||
build_libtool_libs=no
|
||||
build_old_libs=yes
|
||||
prefer_static_libs=yes
|
||||
break
|
||||
;;
|
||||
esac
|
||||
@ -1681,7 +1683,8 @@ compiler."
|
||||
fi
|
||||
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
|
||||
|
||||
if test "$build_libtool_libs" = yes && test -n "$library_names"; then
|
||||
if test -n "$library_names" &&
|
||||
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
||||
# This is a shared library
|
||||
if test -n "$old_archive_from_expsyms_cmds"; then
|
||||
# figure out the soname
|
||||
@ -2571,7 +2574,8 @@ EOF
|
||||
fi
|
||||
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
|
||||
|
||||
if test "$build_libtool_libs" = yes && test -n "$library_names"; then
|
||||
if test -n "$library_names" &&
|
||||
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
||||
# We need to hardcode the library path
|
||||
if test -n "$shlibpath_var"; then
|
||||
# Make sure the rpath contains only unique directories.
|
||||
@ -2606,13 +2610,12 @@ EOF
|
||||
esac
|
||||
fi
|
||||
|
||||
if test "$alldeplibs" = yes; then
|
||||
if test "$deplibs_check_method" = pass_all ||
|
||||
(test "$build_libtool_libs" = yes && \
|
||||
test -n "$library_names"); then
|
||||
# Do we only need to link against static libraries?
|
||||
continue
|
||||
fi
|
||||
if test "$alldeplibs" = yes &&
|
||||
{ test "$deplibs_check_method" = pass_all ||
|
||||
{ test "$build_libtool_libs" = yes &&
|
||||
test -n "$library_names"; }; }; then
|
||||
# Do we only need to link against static libraries?
|
||||
continue
|
||||
fi
|
||||
|
||||
if test -z "$libdir"; then
|
||||
@ -2624,7 +2627,8 @@ EOF
|
||||
continue
|
||||
fi
|
||||
|
||||
if test "$build_libtool_libs" = yes && test -n "$library_names"; then
|
||||
if test -n "$library_names" &&
|
||||
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
||||
link_against_libtool_libs="$link_against_libtool_libs $lib"
|
||||
|
||||
if test -n "$old_archive_from_expsyms_cmds"; then
|
||||
|
Loading…
Reference in New Issue
Block a user