From 918686a995b63537380c830aa940ef956a9ce65a Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Sun, 7 Nov 2010 09:20:51 +0100
Subject: [PATCH] Bug 605406 part 2 - Don't put libfreetype twice on the link
 command line. r=khuey,a=blassey

---
 toolkit/library/Makefile.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index b754dbd8fc43..0be64c69a57f 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -221,8 +221,10 @@ 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)