diff --git a/ChangeLog b/ChangeLog
index 40f5a613..0e4cf8e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-03-13  Adam Fedor  <fedor@gnu.org>
+
+	* configure.in (objc_thread_lib): Correct test for threading
+	on non GNU/Linux, no bsd systems - actually add -lthread to link
+	line. Don't set -lthread when cross-compiling. Also add extra_LIBS
+	to objc_thread_lib.
+	* target.make (solaris/TARGET_SYSTEM_LIBS): Don't add posix4 (should
+	be in objc_thread_lib if needed.
+
 2001-03-10  Adam Fedor  <fedor@gnu.org>
 
 	* Version 0.9.2
diff --git a/configure b/configure
index acbfaf40..25b36fbc 100755
--- a/configure
+++ b/configure
@@ -1870,7 +1870,7 @@ fi
 else
   LIBS="-lobjc $LIBS $extra_LIBS"
   if test "$cross_compiling" = yes; then
-  objc_threaded="-lthread"
+  objc_threaded=""
 else
   cat > conftest.$ac_ext <<EOF
 #line 1877 "configure"
diff --git a/configure.in b/configure.in
index cd3b5d4c..a57b5075 100644
--- a/configure.in
+++ b/configure.in
@@ -303,7 +303,6 @@ esac
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -x objective-c"
 saved_LIBS="$LIBS"
-objc_thread_lib=""
 if test $host_os = linux-gnu; then
   LIBS="-lobjc -lpthread"
   AC_TRY_RUN([#include "config_thread.m"], objc_threaded="-lpthread",
@@ -323,9 +322,10 @@ elif test "`echo $host_os|sed 's/[[0-9]].*//'|sed s/elf//`" = freebsd; then
 	objc_threaded="", objc_threaded="-lpcthread")
   fi
 else
-  LIBS="-lobjc $LIBS $extra_LIBS"
-  AC_TRY_RUN([#include "config_thread.m"], objc_threaded="-lthread",
-	objc_threaded="", objc_threaded="-lthread")
+  LIBS="-lobjc $LIBS -lthread $extra_LIBS"
+  AC_TRY_RUN([#include "config_thread.m"], 
+	objc_threaded="-lthread $extra_LIBS",
+	objc_threaded="", objc_threaded="")
 fi
 LIBS="$saved_LIBS"
 CFLAGS="$saved_CFLAGS"
@@ -334,7 +334,7 @@ if test x"$objc_threaded" = x""; then
 else
   AC_MSG_RESULT(yes)
 fi
-ac_cv_objc_threaded=$objc_threaded
+ac_cv_objc_threaded="$objc_threaded"
 AC_SUBST(objc_threaded)
 AC_SUBST(ac_cv_objc_threaded)
 
diff --git a/target.make b/target.make
index 9c0c044f..00798f1e 100644
--- a/target.make
+++ b/target.make
@@ -56,7 +56,7 @@ ifeq ($(findstring solaris, $(GNUSTEP_TARGET_OS)), solaris)
   else
     INTERNAL_CFLAGS    = -D_REENTRANT
     INTERNAL_OBJCFLAGS = -D_REENTRANT
-    TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) $(objc_threaded) -lsocket -lnsl -ldl -lm -lposix4
+    TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) $(objc_threaded) -lsocket -lnsl -ldl -lm
   endif
 endif
 ifeq ($(findstring irix, $(GNUSTEP_TARGET_OS)), irix)