Necko changes.

rdf/tests/rdfcat/Makefile.in

@@ -59,6 +59,7 @@ IMGLIB_LIBS =	     \
 	$(JPEG_LIBS) \
 	$(PNG_LIBS)  \
 	$(NULL)
+ifndef NECKO
 
 NETLIB_LIBS =	      \
 	-labouturl    \
@@ -77,6 +78,14 @@ NETLIB_LIBS =	      \
 	-ljsurl	      \
 	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
 	-lpwcac	      \
+else
+NETLIB_LIBS =	      \
+	-lneckoutil_s \
+	-lxp	      \
+	-ljsurl	      \
+	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
+	$(NULL)
+endif
 	$(NULL)
 
 LIBS		= \

rdf/tests/rdfcat/rdfcat.cpp

@@ -35,6 +35,7 @@
 #else
 #include "nsIIOService.h"
 #endif // NECKO
+#include "prio.h"
 #include "nsIOutputStream.h"
 #include "nsIGenericFactory.h"
 #include "nsIRDFCompositeDataSource.h"

rdf/tests/rdfpoll/Makefile.in

@@ -59,6 +59,7 @@ IMGLIB_LIBS =	     \
 	$(JPEG_LIBS) \
 	$(PNG_LIBS)  \
 	$(NULL)
+ifndef NECKO
 
 NETLIB_LIBS =	      \
 	-labouturl    \
@@ -77,6 +78,14 @@ NETLIB_LIBS =	      \
 	-ljsurl	      \
 	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
 	-lpwcac	      \
+else
+NETLIB_LIBS =	      \
+	-lneckoutil_s \
+	-lxp	      \
+	-ljsurl	      \
+	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
+	$(NULL)
+endif
 	$(NULL)
 
 LIBS		= \