--- ../configure.orig	2012-02-14 20:06:00.000000000 +0100
+++ ../configure	2012-02-17 17:14:27.862323726 +0100
@@ -4035,11 +4035,8 @@ EOF
 EOF
 
     CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-    MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-    if test "$MOZ_OBJFORMAT" = "elf"; then
-        DLL_SUFFIX=so
-    else
-        DLL_SUFFIX=so.1.0
+    if test -z "$MOZILLA_CLIENT"; then
+        DLL_SUFFIX=so.1
     fi
     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
     DSO_CFLAGS=-fPIC
@@ -6271,11 +6271,9 @@
 #define _THREAD_SAFE 1
 EOF
 
 	    	    if test "$ac_cv_have_dash_pthread" = "yes"; then
 	        _PTHREAD_LDFLAGS="-pthread"
-	    else
-	        _PTHREAD_LDFLAGS="-lc_r"
 	    fi
 	    ;;
     *-netbsd*)
 	    if test "$ac_cv_have_dash_pthread" = "yes"; then