]> git.sur5r.net Git - openldap/commitdiff
ITS#3977, fix libtool -static behavior to match docs
authorHoward Chu <hyc@openldap.org>
Mon, 29 Aug 2005 10:34:14 +0000 (10:34 +0000)
committerHoward Chu <hyc@openldap.org>
Mon, 29 Aug 2005 10:34:14 +0000 (10:34 +0000)
build/ltmain.sh

index 6c9fddecc82e3a1176549f334dbcd5d9b90c8463..a47be7185434c0c9d99c79412a15a4faae6e50f0 100755 (executable)
@@ -1105,14 +1105,15 @@ EOF
          if test -n "$link_static_flag"; then
            dlopen_self=$dlopen_self_static
          fi
+         prefer_static_libs=yes
        else
          if test -z "$pic_flag" && test -n "$link_static_flag"; then
            dlopen_self=$dlopen_self_static
          fi
+         prefer_static_libs=built
        fi
        build_libtool_libs=no
        build_old_libs=yes
-       prefer_static_libs=yes
        break
        ;;
       esac
@@ -2491,8 +2492,12 @@ EOF
        fi
 
        link_static=no # Whether the deplib will be linked statically
+       use_static_libs="$prefer_static_libs"
+       if test "$use_static_libs" = built && test "$installed" = yes ; then
+         use_static_libs=no
+       fi
        if test -n "$library_names" &&
-          { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+          { test "$use_static_libs" = no || test -z "$old_library"; }; then
          if test "$installed" = no; then
            notinst_deplibs="$notinst_deplibs $lib"
            need_relink=yes