From bfd7c81702671a504b998d819982d5bc89a38025 Mon Sep 17 00:00:00 2001
From: "benjamin@smedbergs.us" <none@none>
Date: Wed, 18 Jul 2007 12:51:32 -0700
Subject: [PATCH] Tbird build bustage from bug 388542 and/or bug 373535, always
 link up cairo libs into a static build.

---
 config/static-config.mk | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/config/static-config.mk b/config/static-config.mk
index 7d037fc065f..8b9c9f82089 100644
--- a/config/static-config.mk
+++ b/config/static-config.mk
@@ -83,15 +83,7 @@ STATIC_EXTRA_LIBS	+= \
 		$(NULL)
 endif
 
-ifndef MOZ_ENABLE_CAIRO_GFX
-ifdef MOZ_SVG
 STATIC_EXTRA_LIBS	+= $(MOZ_CAIRO_LIBS)
-else # not MOZ_SVG
-ifdef MOZ_ENABLE_CANVAS # not SVG, but yes on canvas
-STATIC_EXTRA_LIBS	+= $(MOZ_CAIRO_LIBS)
-endif
-endif
-endif
 
 ifdef MOZ_ENABLE_GTK2
 STATIC_EXTRA_LIBS	+= $(XLDFLAGS) $(XT_LIBS) -lgthread-2.0