* 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.

diff --git a/ChangeLog b/ChangeLog
index 54cf0f97ce44441683af1f9678863a85c0aa244a..2f88465910bb89bf76bac8788b77c52a3039614d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/ltmain.in b/ltmain.in
index 33bf5fcbe8da402a5f14f88bcb3a83119b176c93..a77881f40843001d40c2f9fd2e860393036ed3a7 100644 (file)
--- 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.