Fix url-classifier+libxul warnings and test errors, r=luser (no bug)

toolkit/components/url-classifier/Makefile.in

@@ -46,7 +46,9 @@ include $(DEPTH)/config/autoconf.mk
 DIRS      = public src
 
 ifdef ENABLE_TESTS
-DIRS     += tests
+ifndef MOZ_ENABLE_LIBXUL
+TOOL_DIRS     += tests
+endif
 endif
 
 include $(topsrcdir)/config/rules.mk

toolkit/components/url-classifier/src/Makefile.in

@@ -8,7 +8,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = url-classifier
 LIBRARY_NAME = urlclassifier_s
 XPIDL_MODULE = url-classifier
-MOZILLA_INTERNAL_API = 1
+LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1