Changed direct uses of -lz or -lzlib to $(ZLIB_LIBS)

Changed direct use of -lnspr3 and friends to $(NSPR_LIBS)

mailnews/compose/tests/smtp/Makefile.in

@@ -69,7 +69,7 @@ LIBS = \
 	-lmozutil \
 	-lgmbase$(MOZ_TOOLKIT) \
 	-lsecfree \
-	-lzlib \
+	$(ZLIB_LIB) \
 	$(DIST)/lib/librdfbase_s.a \
 	$(NSPR_LIBS) \
 	$(TK_LIBS) \

mailnews/imap/tests/harness/Makefile.in

@@ -33,9 +33,7 @@ LIBS =	\
 		-L$(DIST)/bin			\
 		-lxpcom					\
 		-lreg					\
-		-lnspr3				\
-		-lplc3					\
-		-lplds3				\
+		$(NSPR_LIBS)			\
 		$(NULL)
 
 

mailnews/local/tests/mailbox/Makefile.in

@@ -59,7 +59,7 @@ LIBS = \
 	-lraptorbase \
 	-lgmbase$(MOZ_TOOLKIT) \
 	-lsecfree \
-	-lz \
+	$(ZLIB_LIBS) \
 	$(NSPR_LIBS) \
 	$(TK_LIBS) \
 	$(NULL)

mailnews/local/tests/mboxParser/Makefile.in

@@ -56,7 +56,7 @@ LIBS = \
 	-lraptorbase \
 	-lgmbase$(MOZ_TOOLKIT) \
 	-lsecfree \
-	-lz \
+	$(ZLIB_LIBS) \
 	$(NSPR_LIBS) \
 	$(TK_LIBS) \
 	$(NULL)

mailnews/local/tests/pop3/Makefile.in

@@ -58,7 +58,7 @@ LIBS = \
 	-lrdfutil_s \
 	-lgmbase$(MOZ_TOOLKIT) \
 	-lsecfree \
-	-lz \
+	$(ZLIB_LIBS) \
 	$(NSPR_LIBS) \
 	$(TK_LIBS) \
 	$(NULL)

mailnews/news/tests/nntp/Makefile.in

@@ -66,7 +66,7 @@ LIBS = \
 	-lpng	\
 	-ljpeg	\
 	-lmozutil	\
-	-lz \
+	$(ZLIB_LIBS) \
 	$(DIST)/lib/librdfbase_s.a \
 	$(NSPR_LIBS) \
 	$(TK_LIBS) \