Bug 735219 - Fix conflict between BigFile and Twitter's http.jsm files, r=bienvenu.
authorFlorian Quèze <florian@instantbird.org>
Thu, 10 May 2012 16:05:03 +0200
changeset 22260 5ee10b1476384ec83d81e5554a176b024dc3d1c8
parent 22259 be48f94b7b41443373cfcbe385d767ee25a796b6
child 22261 a926170eb6577b2bf3cfb30db8a5ea564c3c6dc7
push id1225
push userflorian@queze.net
push dateSat, 11 Jan 2014 23:24:55 +0000
treeherdertry-comm-central@1d7aa08cb2d7 [default view] [failures only]
reviewersbienvenu
bugs735219
Bug 735219 - Fix conflict between BigFile and Twitter's http.jsm files, r=bienvenu.
chat/modules/Makefile.in
--- a/chat/modules/Makefile.in
+++ b/chat/modules/Makefile.in
@@ -37,25 +37,28 @@
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXTRA_JS_MODULES = \
-	http.jsm \
 	imContentSink.jsm \
 	imServices.jsm \
 	imSmileys.jsm \
 	imStatusUtils.jsm \
 	imThemes.jsm \
 	imXPCOMUtils.jsm \
 	jsProtoHelper.jsm \
 	socket.jsm \
 	$(NULL)
 
+ifndef MOZ_THUNDERBIRD
+EXTRA_JS_MODULES += http.jsm
+endif
+
 EXTRA_PP_JS_MODULES = \
 	hiddenWindow.jsm \
 	imTextboxUtils.jsm \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk