From 1ef2844582ad38be911153b591dfd728f856c2a8 Mon Sep 17 00:00:00 2001 From: "cbiesinger%web.de" Date: Tue, 14 Mar 2006 20:46:30 +0000 Subject: [PATCH] bug 329140 make layout/build link to cairo when needed r=vlad git-svn-id: svn://10.0.0.236/trunk@192334 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/build/Makefile.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in index 802698af766..9ddb16ecaaa 100644 --- a/mozilla/layout/build/Makefile.in +++ b/mozilla/layout/build/Makefile.in @@ -235,6 +235,14 @@ EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \ endif endif +ifdef MOZ_ENABLE_CAIRO_GFX +ifndef MOZ_TREE_CAIRO +# In an in-tree cairo build, cairo is part of libthebes +# otherwise, we need to link it separately. +EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) +endif +endif + ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) EXTRA_DSO_LDOPTS += \ $(TK_LIBS) \