[Libreoffice-commits] .: cairo/cairo cairo/pixman

[Caolán McNamara]

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

New commits:
commit 080e4ce9da7fcff4fafc5253349d75c80f050735
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 29 16:23:18 2011 +0100

    make cairo an unconditional requirement for text rendering

diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 4059504..a8f6423 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 d212407..ee07c2f 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."