From dbb17b1d2ac69490d80bb7b92b9aa0410ae34f8d Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Sun, 25 Apr 1999 09:40:42 +0000 Subject: [PATCH] * 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. --- ChangeLog | 7 +++++++ ltmain.in | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 54cf0f97c..2f8846591 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +1999-04-25 Alexandre Oliva + + * 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 * ltconfig.in (sco3.2v5*): Use LD_RUN_PATH for hard-coding. diff --git a/ltmain.in b/ltmain.in index 33bf5fcbe..a77881f40 100644 --- a/ltmain.in +++ b/ltmain.in @@ -820,6 +820,7 @@ compiler." ltlibs= module=no objs= + prefer_static_libs=no preload=no prev= prevarg= @@ -850,6 +851,7 @@ compiler." fi build_libtool_libs=no build_old_libs=yes + prefer_static_libs=yes break ;; esac @@ -1273,7 +1275,8 @@ compiler." prev= 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 $arg" if test -n "$shlibpath_var"; then # Make sure the rpath contains only unique directories. -- 2.47.3