From ed1b28fcebd26a8476a8922139666dbfd19b275a Mon Sep 17 00:00:00 2001
From: Ginn Chen <ginn.chen@oracle.com>
Date: Tue, 30 Nov 2010 14:38:02 +0800
Subject: [PATCH] Bug 612234 Part 1: Define MOZ_TREE_PIXMAN when using internal
 pixman r=jmuizelaar a=blocking-2.0

---
 config/Makefile.in              | 1 +
 configure.in                    | 1 +
 gfx/cairo/cairo/src/Makefile.in | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/config/Makefile.in b/config/Makefile.in
index 13b0f2d63eb..bbb67b59695 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -125,6 +125,7 @@ export::
 	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
 		-DBUILD_STATIC_LIBS=$(BUILD_STATIC_LIBS) \
 		-DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \
+		-DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \
 		-DMOZ_ENABLE_LIBXUL=$(MOZ_ENABLE_LIBXUL) \
 		-DMOZ_NATIVE_HUNSPELL=$(MOZ_NATIVE_HUNSPELL) \
 		-DMOZ_NATIVE_BZ2=$(MOZ_NATIVE_BZ2) \
diff --git a/configure.in b/configure.in
index 7a79a678429..a5de777f411 100644
--- a/configure.in
+++ b/configure.in
@@ -8598,6 +8598,7 @@ if test "$MOZ_TREE_CAIRO"; then
     MOZ_CAIRO_LIBS='$(call EXPAND_LIBNAME_PATH,mozcairo,$(DEPTH)/gfx/cairo/cairo/src)'" $CAIRO_FT_LIBS"
 
     if test "$MOZ_TREE_PIXMAN"; then
+        AC_DEFINE(MOZ_TREE_PIXMAN)
         MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS"' $(call EXPAND_LIBNAME_PATH,mozlibpixman,$(DEPTH)/gfx/cairo/libpixman/src)'
     else
         PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.19.2)
diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in
index 7421fe5f8a3..08ebce44ffd 100644
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -266,6 +266,8 @@ endif
 ifndef MOZ_TREE_PIXMAN
 CFLAGS += $(MOZ_CAIRO_CFLAGS)
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
+else
+DEFINES += -DMOZ_TREE_PIXMAN
 endif
 
 cairo-features.h: $(srcdir)/cairo-features.h.in $(GLOBAL_DEPS)