* ltconfig.in: Get rid of hardcode_into_libs=all; use

hardcode_into_libs=yes && shlibpath_overrides_runpath!=yes
instead.
[FreeBSD 3.[01]] (shlibpath_overrides_runpath): Set to no.
* ltmain.in: Likewise.
* tests/build-relink.test, tests/build-relink2.test: Adjust.

ChangeLog

@@ -1,5 +1,12 @@
 2000-09-03  Alexandre Oliva  <aoliva@redhat.com>
 
+	* ltconfig.in: Get rid of hardcode_into_libs=all; use
+	hardcode_into_libs=yes && shlibpath_overrides_runpath!=yes
+	instead.
+	[FreeBSD 3.[01]] (shlibpath_overrides_runpath): Set to no.
+	* ltmain.in: Likewise.
+	* tests/build-relink.test, tests/build-relink2.test: Adjust.
+	
 	* libtool.m4: Fix typo I introduced in yesterday's patch.
 	
 	* libltdl/ltdl.c (lt_dlopen): Set dlname from library_names if

ltconfig.in

@@ -1607,11 +1607,7 @@ freebsd*)
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
+  *)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
@@ -2086,7 +2082,9 @@ test "$enable_shared" = yes || enable_static=yes
 
 echo "checking whether to build static libraries... $enable_static" 1>&6
 
-if test "$hardcode_action" = relink || test "$hardcode_into_libs" = all; then
+if test "$hardcode_action" = relink ||
+   { test "$hardcode_into_libs" = yes &&
+     test "$shlibpath_overrides_runpath" != yes; }; then
   # Fast installation is not supported
   enable_fast_install=no
 elif test "$shlibpath_overrides_runpath" = yes ||

ltmain.in

@@ -1691,7 +1691,9 @@ compiler."
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$hardcode_into_libs" != all || test "$alldeplibs" != yes; } &&
+	     { test "$hardcode_into_libs" != yes ||
+	       test "$shlibpath_overrides_runpath" = yes ||
+	       test "$alldeplibs" != yes; } &&
 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var"; then
@@ -1744,7 +1746,9 @@ compiler."
 	    need_relink=yes
 	  fi
 	  # This is a shared library
-	  if test $linkmode = lib && test "$hardcode_into_libs" = all; then
+	  if test $linkmode = lib &&
+	     test "$hardcode_into_libs" = yes &&
+	     test "$shlibpath_overrides_runpath" != yes; then
 	    # Hardcode the library path.
 	    # Skip directories that are in the system default run-time
 	    # search path.
@@ -2786,7 +2790,9 @@ EOF
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink && test "$hardcode_into_libs" = all; then
+	if test "$mode" = relink &&
+	   test "$hardcode_into_libs" = yes &&
+	   test "$shlibpath_overrides_runpath" != yes; then
 	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
 	fi
 
@@ -2805,7 +2811,9 @@ EOF
 	IFS="$save_ifs"
 
 	# Restore the uninstalled library and exit
-	if test "$mode" = relink && test "$hardcode_into_libs" = all; then
+	if test "$mode" = relink &&
+	   test "$hardcode_into_libs" = yes &&
+	   test "$shlibpath_overrides_runpath" != yes; then
 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
 	  exit 0
 	fi
@@ -3372,7 +3380,9 @@ static const void *lt_preloaded_setup() {
 	exit 0
       fi
 
-      if test "$hardcode_action" = relink || test "$hardcode_into_libs" = all; then
+      if test "$hardcode_action" = relink ||
+         { test "$hardcode_into_libs" = yes &&
+	   test "$shlibpath_overrides_runpath" != yes; }; then
 	# Fast installation is not supported
 	link_command="$compile_var$compile_command$compile_rpath"
 	relink_command="$finalize_var$finalize_command$finalize_rpath"
@@ -3828,7 +3838,8 @@ dlpreopen='$dlprefiles'
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-	  if test $hardcode_into_libs = all &&
+	  if test "$hardcode_into_libs" = yes &&
+	     test "$shlibpath_overrides_runpath" != yes &&
 	     test "$installed" = no && test $need_relink = yes; then
 	    $echo >> $output "\
 relink_command=\"$relink_command\""
@@ -4039,7 +4050,9 @@ relink_command=\"$relink_command\""
 	test "X$dir" = "X$file/" && dir=
 	dir="$dir$objdir"
 
-	if test "$hardcode_into_libs" = all && test -n "$relink_command"; then
+	if test "$hardcode_into_libs" = yes &&
+	   test "$shlibpath_overrides_runpath" != yes &&
+	   test -n "$relink_command"; then
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
 	  $show "$relink_command"
 	  if $run eval "$relink_command"; then :
@@ -4057,7 +4070,9 @@ relink_command=\"$relink_command\""
 	  shift
 
 	  srcname="$realname"
-	  test "$hardcode_into_libs" = all && test -n "$relink_command" && srcname="$realname"T
+	  test "$hardcode_into_libs" = yes &&
+	  test "$shlibpath_overrides_runpath" != yes &&
+	  test -n "$relink_command" && srcname="$realname"T
 
 	  # Install the shared library and build the symlinks.
 	  $show "$install_prog $dir/$srcname $destdir/$realname"

tests/build-relink.test

@@ -100,7 +100,8 @@ else
 fi
 
 if test "x$hardcode_action" = xrelink ||
-   test "x$hardcode_into_libs" = xall; then
+   { test "x$hardcode_into_libs" = xyes &&
+     test "x$shlibpath_overrides_runpath" != xyes; }; then
   echo "= Exiting: install-time relinking is required"
   exit 0
 fi

tests/build-relink2.test

@@ -100,7 +100,8 @@ else
 fi
 
 if test "x$hardcode_action" = xrelink ||
-   test "x$hardcode_into_libs" = xall; then
+   { test "x$hardcode_into_libs" = xyes &&
+     test "x$shlibpath_overrides_runpath" != xyes; }; then
   echo "= Exiting: install-time relinking is required"
   exit 0
 fi