From 1cd91cabe977225a9a2952c0d0d7f5e8d7308987 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 29 Jun 2011 16:23:18 +0100
Subject: make cairo an unconditional requirement for text rendering

---
 cairo/cairo/makefile.mk  | 9 ++-------
 cairo/pixman/makefile.mk | 6 +-----
 2 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'cairo')

diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 4059504e35bc..a8f6423d8edf 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -35,14 +35,9 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 .INCLUDE :	settings.mk
 
-.IF  "$(ENABLE_CAIRO)" == ""
+.IF "$(SYSTEM_CAIRO)" == "YES"
 all:
-    @echo "Nothing to do (Cairo not enabled)."
-
-.ELIF "$(SYSTEM_CAIRO)" == "YES"
-all:
-    @echo "Nothing to do, using system cairo."
-
+    @echo "Not building cairo."
 .ENDIF
 
 # --- Files --------------------------------------------------------
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index d2124079c5d2..ee07c2f7f699 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -35,11 +35,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 .INCLUDE :	settings.mk
 
-.IF  "$(ENABLE_CAIRO)" == ""
-all:
-    @echo "Nothing to do (Cairo not enabled)."
-
-.ELIF "$(BUILD_PIXMAN)" == ""
+.IF "$(SYSTEM_CAIRO)" == "YES"
 all:
     @echo "Not building pixman."
 
-- 
cgit