65 lines
2.7 KiB
Plaintext
65 lines
2.7 KiB
Plaintext
$OpenBSD: patch-autotools_ltmain_sh,v 1.2 2004/06/24 19:27:00 sturm Exp $
|
|
--- autotools/ltmain.sh.orig 2003-12-20 03:49:10.000000000 -0800
|
|
+++ autotools/ltmain.sh 2004-06-18 18:09:03.000000000 -0700
|
|
@@ -2206,10 +2206,6 @@ EOF
|
|
link_static=no # Whether the deplib will be linked statically
|
|
if test -n "$library_names" &&
|
|
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
|
- if test "$installed" = no; then
|
|
- notinst_deplibs="$notinst_deplibs $lib"
|
|
- need_relink=yes
|
|
- fi
|
|
# This is a shared library
|
|
|
|
# Warn about portability, can't link against -module's on some systems (darwin)
|
|
@@ -3334,7 +3330,7 @@ EOF
|
|
if test -n "$a_deplib" ; then
|
|
libname=`eval \\$echo \"$libname_spec\"`
|
|
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
|
|
- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
|
|
+ potential_libs=`ls $i/$libname[.-]* $i/${libname}_pic.a 2>/dev/null`
|
|
for potent_lib in $potential_libs; do
|
|
potlib="$potent_lib" # see symlink-check above in file_magic test
|
|
if eval $echo \"$potent_lib\" 2>/dev/null \
|
|
@@ -5696,40 +5692,6 @@ relink_command=\"$relink_command\""
|
|
# Exit here if they wanted silent mode.
|
|
test "$show" = : && exit 0
|
|
|
|
- $echo "----------------------------------------------------------------------"
|
|
- $echo "Libraries have been installed in:"
|
|
- for libdir in $libdirs; do
|
|
- $echo " $libdir"
|
|
- done
|
|
- $echo
|
|
- $echo "If you ever happen to want to link against installed libraries"
|
|
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
|
|
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
|
- $echo "flag during linking and do at least one of the following:"
|
|
- if test -n "$shlibpath_var"; then
|
|
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
|
- $echo " during execution"
|
|
- fi
|
|
- if test -n "$runpath_var"; then
|
|
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
|
- $echo " during linking"
|
|
- fi
|
|
- if test -n "$hardcode_libdir_flag_spec"; then
|
|
- libdir=LIBDIR
|
|
- eval flag=\"$hardcode_libdir_flag_spec\"
|
|
-
|
|
- $echo " - use the \`$flag' linker flag"
|
|
- fi
|
|
- if test -n "$admincmds"; then
|
|
- $echo " - have your system administrator run these commands:$admincmds"
|
|
- fi
|
|
- if test -f /etc/ld.so.conf; then
|
|
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
|
- fi
|
|
- $echo
|
|
- $echo "See any operating system documentation about shared libraries for"
|
|
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
|
- $echo "----------------------------------------------------------------------"
|
|
exit 0
|
|
;;
|
|
|