mozilla-central: changeset 57046:3671421f858c56d1d6d4ff29fe8c5c6d6f9aab10

author	Mike Hommey <mh+mozilla@glandium.org>
	Sun, 07 Nov 2010 09:20:51 +0100
changeset 57046	3671421f858c56d1d6d4ff29fe8c5c6d6f9aab10
parent 57045	c2c173d7091c69f421a07f843b125888ce464ad6
child 57047	129428f0d81ee998756ad6d833788403c86497b8
push id	16767
push user	mh@glandium.org
push date	Sun, 07 Nov 2010 08:25:16 +0000
treeherder	mozilla-central@4f11a96707f7 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	khuey, blassey
bugs	605406
milestone	2.0b8pre
first release with	nightly linux32 8cbe83542596 / 4.0b8pre / 20101107015940 / files nightly linux64 8cbe83542596 / 4.0b8pre / 20101107030815 / files nightly mac 8cbe83542596 / 4.0b8pre / 20101107030911 / files nightly win32 8cbe83542596 / 4.0b8pre / 20101107042528 / files nightly win64 5f427b7d7b60 / 4.0b8pre / 20101107060025 / files
last release without	nightly linux32 2b612890113b / 4.0b8pre / 20101106025958 / files nightly linux64 2b612890113b / 4.0b8pre / 20101106031112 / files nightly mac 2b612890113b / 4.0b8pre / 20101106030745 / files nightly win32 2b612890113b / 4.0b8pre / 20101106042135 / files nightly win64 a1705bc179e4 / 4.0b8pre / 20101105054821 / files

--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -216,18 +216,20 @@ EXTRA_DSO_LDOPTS += $(FT2_LIBS)
 endif
 
 ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
 EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
 EXTRA_DSO_LDOPTS += $(FT2_LIBS) $(MOZ_PANGO_LIBS)
 endif
 
 ifdef MOZ_TREE_FREETYPE
+ifndef MOZ_TREE_CAIRO
 EXTRA_DSO_LDOPTS += $(FT2_LIBS)
 endif
+endif
 
 ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
 EXTRA_DSO_LDOPTS += $(MOZ_STARTUP_NOTIFICATION_LIBS)
 endif
 
 ifdef MOZ_ENABLE_LIBPROXY
 EXTRA_DSO_LDOPTS += $(MOZ_LIBPROXY_LIBS)
 endif