--- libjava/classpath/ltconfig.orig	2011-02-13 11:45:53 UTC
+++ libjava/classpath/ltconfig
@@ -249,7 +249,7 @@ hardcode_direct=no
 hardcode_minus_L=no
 hardcode_shlibpath_var=unsupported
 runpath_var=
-link_all_deplibs=unknown
+link_all_deplibs=no
 always_export_symbols=no
 export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
 # include_expsyms should be a list of space-separated symbols to be *always*
@@ -947,7 +947,7 @@ fi
 echo "$ac_t$hardcode_action" 1>&6
 
 echo $ac_n "checking whether stripping libraries is possible... $ac_c" 1>&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
   echo "${ac_t}yes" 1>&6
@@ -1128,12 +1128,32 @@ darwin* | rhapsody*)
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
-freebsd*)
+bsdsunix*)
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+  version_type=bsdsunix-$objformat
+  case $version_type in
+    bsdsunix-elf*)
+      library_names_spec='$libname$release.so$versuffix		 $libname$release.so$major $libname.so'	 soname_spec='$libname$release.so$major'
+      need_version=no
+      need_lc=no
+      need_lib_prefix=no
+      ;;
+    bsdsunix-*)
+      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+ dragonfly* | freebsd*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+      library_names_spec='$libname$release.so$versuffix			 $libname$release.so$major $libname.so'		 soname_spec='$libname$release.so$major'
       need_version=no
       need_lc=no
       need_lib_prefix=no
@@ -1165,7 +1185,7 @@ gnu*)
   hardcode_into_libs=yes
   ;;
 
-kfreebsd*-gnu | knetbsd*-gnu)
+kfreebsd*-gnu | kbsdsunix*-gnu | knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no