From 133ae214a8bb9f961b18357df4081364b0facef5 Mon Sep 17 00:00:00 2001
From: "seawood%netscape.com"
 <seawood%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 8 Feb 2002 19:17:37 +0000
Subject: [PATCH] Backing out fix for win32 gmake static bustage until we
 figure out how to resolve bug 114748 for OS/2.  Should fix current OS/2
 bustage.

git-svn-id: svn://10.0.0.236/trunk@114044 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/config/config.mk                     | 19 ++++--------------
 mozilla/security/manager/ssl/src/Makefile.in | 21 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index fb1353ea9ad..4563a370ddd 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -160,11 +160,11 @@ FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names
 
 # The use of LIB_PREFIX for OS/2 VA builds is inconsistent 
 # due to bug 114748, so use _NSS_LIB_PREFIX instead
-#ifeq ($(MOZ_OS2_TOOLS),VACPP)
-#NSS_LIB_PREFIX=lib
-#else
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+NSS_LIB_PREFIX=lib
+else
 NSS_LIB_PREFIX=$(LIB_PREFIX)
-#endif
+endif
 
 # 
 # NSS libs needed for final link in static build
@@ -172,16 +172,6 @@ NSS_LIB_PREFIX=$(LIB_PREFIX)
 NSS_3_4=1
 
 ifdef NSS_3_4
-# win32 msvc & OS/2 VA builds use import libs
-ifneq (,$(filter WINNT OS2,$(OS_ARCH)))
-NSS_LIBS	= \
-	$(DIST)/lib/$(NSS_LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(NSS_LIB_PREFIX)smime3.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(NSS_LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(NSS_LIB_PREFIX)nss3.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(NSS_LIB_PREFIX)softokn3.$(LIB_SUFFIX) \
-	$(NULL)
-else
 NSS_LIBS	= \
 	$(DIST)/lib/$(NSS_LIB_PREFIX)crmf.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(NSS_LIB_PREFIX)smime3$(DLL_SUFFIX) \
@@ -189,7 +179,6 @@ NSS_LIBS	= \
 	$(DIST)/lib/$(NSS_LIB_PREFIX)nss3$(DLL_SUFFIX) \
 	$(DIST)/lib/$(NSS_LIB_PREFIX)softokn3$(DLL_SUFFIX) \
 	$(NULL)
-endif
 else
 NSS_LIBS	= \
 	$(DIST)/lib/$(NSS_LIB_PREFIX)smime.$(LIB_SUFFIX) \
diff --git a/mozilla/security/manager/ssl/src/Makefile.in b/mozilla/security/manager/ssl/src/Makefile.in
index 82c6b188006..b8d2611e15b 100644
--- a/mozilla/security/manager/ssl/src/Makefile.in
+++ b/mozilla/security/manager/ssl/src/Makefile.in
@@ -100,9 +100,30 @@ NSS_3_4=1
 
 ifdef NSS_3_4
 DEFINES += -DNSS_3_4
+
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
+# Link with import libs on OS/2
+NSS3_LIB = nss3.$(LIB_SUFFIX)
+SMIME3_LIB = smime3.$(LIB_SUFFIX)
+SSL3_LIB = ssl3.$(LIB_SUFFIX)
+SOFTOKEN3_LIB = softokn3.$(LIB_SUFFIX)
+else
+NSS3_LIB = $(LIB_PREFIX)nss3$(DLL_SUFFIX)
+SMIME3_LIB = $(LIB_PREFIX)smime3$(DLL_SUFFIX)
+SSL3_LIB = $(LIB_PREFIX)ssl3$(DLL_SUFFIX)
+SOFTOKEN3_LIB = $(LIB_PREFIX)softokn3$(DLL_SUFFIX)
 endif
 
+EXTRA_LIBS = \
+    $(DIST)/lib/$(NSS_LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+    $(DIST)/lib/$(SMIME3_LIB) \
+    $(DIST)/lib/$(SSL3_LIB) \
+    $(DIST)/lib/$(NSS3_LIB) \
+    $(DIST)/lib/$(SOFTOKEN3_LIB) \
+    $(NULL)
+else
 EXTRA_LIBS = $(NSS_LIBS)
+endif
 
 EXTRA_DEPS = $(EXTRA_LIBS)