From 799dfd353c738f48e5dfa5ada26fce99502fbdb0 Mon Sep 17 00:00:00 2001
From: "briano%netscape.com"
 <briano%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 27 Jul 1999 22:17:29 +0000
Subject: [PATCH] Temporarily avoid the NECKO-related tests on BSD/OS since I
 can't get them to link.

git-svn-id: svn://10.0.0.236/trunk@41335 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpcom/tests/Makefile.in | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in
index 77f07370d8d..eecbd457554 100644
--- a/mozilla/xpcom/tests/Makefile.in
+++ b/mozilla/xpcom/tests/Makefile.in
@@ -37,9 +37,7 @@ CPPSRCS		= \
 		TestXPIDLString.cpp \
 		TestAtoms.cpp \
 		TestCRT.cpp \
-		CvtURL.cpp \
 		FilesTest.cpp \
-		PropertiesTest.cpp \
 		TestAutoLock.cpp \
 		TestObserverService.cpp \
 		TestBuffers.cpp \
@@ -57,6 +55,14 @@ endif
 
 include $(topsrcdir)/config/config.mk
 
+# These won't link on BSD/OS, due to multiply defined symbols.
+ifneq ($(OS_ARCH),BSD_OS)
+CPPSRCS		+= \
+		CvtURL.cpp \
+		PropertiesTest.cpp \
+		$(NULL)
+endif
+
 ifndef NECKO
 NETLIB_LIBS	= \
 		-lnetlib \
@@ -64,30 +70,31 @@ NETLIB_LIBS	= \
 		-lfileurl \
 		-lremoturl \
 		-lgophurl \
-		-lnetcnvts \
 		-lsockstuburl \
 		-lftpurl \
 		-lmimetype \
 		-lpwcac \
 		-lhttpurl \
 		-lnetwork \
+		-lnetcnvts \
 		-lnetcache \
+		-lnetlib \
 		$(NULL)
 else
 NETLIB_LIBS	= -lneckoutil_s
 endif
 
 LIBS		+= \
+		-limg \
+		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		$(NETLIB_LIBS) \
 		-lpref \
 		-lsecfree \
 		-l$(MOZ_LIB_JS_PREFIX)js \
-		-limg \
-		-l$(MOZ_LIB_UTIL_PREFIX)util \
 		-lxp \
 		-lxpcom \
-		$(TK_LIBS) \
-		$(NETLIB_LIBS) \
 		$(TIMER_LIBS) \
+		$(TK_LIBS) \
 		$(ZLIB_LIBS) \
 		$(LOST_SYM_LIBS) \
 		$(NSPR_LIBS) \