Fix windows and solaris build bustage.
authorrrelyea%redhat.com
Thu, 19 Jul 2007 22:31:14 +0000
changeset 7949 26960af5bfc88b445b2a1e0cb3fe443bffe4e1d6
parent 7948 95ed3563e905c01c4d4ca860de8db43974648ef6
child 7953 66d9cb69c5a73ce6e8b8f85bb19477bca0178b62
push idunknown
push userunknown
push dateunknown
Fix windows and solaris build bustage.
security/nss/cmd/platlibs.mk
--- a/security/nss/cmd/platlibs.mk
+++ b/security/nss/cmd/platlibs.mk
@@ -118,17 +118,17 @@ EXTRA_LIBS += \
 	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
 	$(CRYPTOLIB) \
 	$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
 	$(PKIXLIB) \
 	$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
-	$(SQLITE) \
+	$(DIST)/lib/$(LIB_PREFIX)sqlite3.$(LIB_SUFFIX) \
 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
 	$(NULL)
 
 # $(PROGRAM) has NO explicit dependencies on $(OS_LIBS)
 #OS_LIBS += \
 	wsock32.lib \
@@ -195,16 +195,17 @@ endif
 ifdef XP_OS2_VACPP
 EXTRA_SHARED_LIBS += \
 	$(NSPR_LIB_DIR)/plc4.lib \
 	$(NSPR_LIB_DIR)/plds4.lib \
 	$(NSPR_LIB_DIR)/nspr4.lib \
 	$(NULL)
 else
 EXTRA_SHARED_LIBS += \
+	-L$(DIST)/lib \
 	$(SQLITE) \
 	-L$(NSPR_LIB_DIR) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
 	$(NULL)
 endif