From df2ef6f0c006cf955574be63b99e5337e6cea165 Mon Sep 17 00:00:00 2001
From: "briano%netscape.com"
 <briano%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 30 Apr 1999 21:43:50 +0000
Subject: [PATCH] Fix to properly support Sun's WorkShop compilers.  Thanks to
 Tim Rowley (tor@boojum.cs.brown.edu).

git-svn-id: svn://10.0.0.236/trunk@29891 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/config/autoconf.mk.in |  7 ++++---
 mozilla/config/config.mk      |  1 -
 mozilla/configure.in          | 13 +++++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in
index 82c71cc96e7..66e7d34004a 100644
--- a/mozilla/config/autoconf.mk.in
+++ b/mozilla/config/autoconf.mk.in
@@ -82,9 +82,10 @@ XCFLAGS		= @XCFLAGS@
 XLDFLAGS	= @XLDFLAGS@
 XLIBS		= @XLIBS@
 
-AS			= @AS@
-ASFLAGS     = @ASFLAGS@
-AS_DASH_C_FLAG = @AS_DASH_C_FLAG@
+AR		= @AR@
+AS		= @AS@
+ASFLAGS		= @ASFLAGS@
+AS_DASH_C_FLAG	= @AS_DASH_C_FLAG@
 
 # Temp hack.  It is not my intention to leave this crap in here for ever.
 # Im talking to fur right now to solve the problem without introducing 
diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index 89211d98b31..7fa50d8bb6c 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -231,7 +231,6 @@ INSTALL		= $(NSINSTALL)
 JAVA_PROG	= java
 else
 PATH_SEPARATOR	:= :
-AR		= ar cr $@
 ifndef USE_AUTOCONF
 DLL_SUFFIX	= so
 endif
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 96b9e84cb55..3aa44a70ee1 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -171,6 +171,7 @@ AC_SUBST(GNU_CXX)
 
 dnl set the defaults first
 dnl ========================================================
+AR='ar cr $@'
 AS=
 AS_DASH_C_FLAG='-c'
 NS_USE_NATIVE=
@@ -268,6 +269,7 @@ case "$target" in
        MKSHLIB_FORCE_ALL='-z allextract'
        MKSHLIB_UNFORCE_ALL=''
        DSO_LDOPTS='-G -h $(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))'
+       AR='$(CXX) -xar -o $@'
        AS='/usr/ccs/bin/as'
        AS_DASH_C_FLAG=''
 
@@ -761,6 +763,10 @@ then
 	case "$target" in
 	    *-*-solaris*) 
     			AC_DEFINE(_REENTRANT) 
+			if test ! "$GNU_CC"; then
+				CFLAGS="$CFLAGS -mt" 
+				CXXFLAGS="$CXXFLAGS -mt" 
+			fi
 			;;
 
 	    *-*-linux*) 
@@ -769,17 +775,11 @@ then
 
 	    alpha*-*-osf*)
 			AC_DEFINE(_REENTRANT)
-dnl			if test ! "$GNU_CC"; then
-dnl				CFLAGS="$CFLAGS -pthread" 
-dnl				CXXFLAGS="$CXXFLAGS -pthread" 
-dnl			fi
 			;;
 
 	    *-*-freebsd*)
 			AC_DEFINE(_REENTRANT)
 			AC_DEFINE(_THREAD_SAFE)
-dnl			CFLAGS="$CFLAGS -pthread"
-dnl			CXXFLAGS="$CXXFLAGS -pthread"
 			dnl -pthread links in -lc_r, so don't specify it explicitly.
 			if test "$ac_cv_have_dash_pthread" = "yes"; then
 				PTHREAD_LDFLAGS=""
@@ -1427,6 +1427,7 @@ MOZ_ARG_DISABLE_BOOL(static,
   NO_STATIC_LIB=1)
 
 
+AC_SUBST(AR)
 AC_SUBST(AS)
 AC_SUBST(ASFLAGS)
 AC_SUBST(AS_DASH_C_FLAG)