--- configure.orig	2015-10-16 13:22:19 UTC
+++ configure
@@ -6674,11 +6674,8 @@ tools are selected during the Xcode/Deve
     $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h
 
     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
@@ -8332,8 +8329,6 @@ $as_echo "$ac_cv_have_dash_pthreads" >&6
 
 	    	    if test "$ac_cv_have_dash_pthread" = "yes"; then
 	        _PTHREAD_LDFLAGS="-pthread"
-	    else
-	        _PTHREAD_LDFLAGS="-lc_r"
 	    fi
 	    ;;
     *-netbsd*)