[cairo-commit] 2 commits - configure.in pixman/src src/test-fallback-surface.c src/test-meta-surface.c src/test-paginated-surface.c

[Behdad Esfahbod]

 configure.in                 |   10 +++++++---
 pixman/src/Makefile.am       |    4 +---
 src/test-fallback-surface.c  |    1 +
 src/test-meta-surface.c      |    2 ++
 src/test-paginated-surface.c |    1 +
 5 files changed, 12 insertions(+), 6 deletions(-)

New commits:
diff-tree 0d3e886b182b55b147f2ba1a298c2f5ec8a53d87 (from 0263f18f843175e478bd3a14e24445e31e7b0952)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Mar 20 08:49:28 2007 -0400

    Include cairo-mutex-private.h in test backends

diff --git a/src/test-fallback-surface.c b/src/test-fallback-surface.c
index 21ee190..1994f51 100644
--- a/src/test-fallback-surface.c
+++ b/src/test-fallback-surface.c
@@ -54,6 +54,7 @@
 #include "test-fallback-surface.h"
 
 #include "cairoint.h"
+#include "cairo-mutex-private.h"
 
 typedef struct _test_fallback_surface {
     cairo_surface_t base;
diff --git a/src/test-meta-surface.c b/src/test-meta-surface.c
index 6c58779..a21e7b2 100644
--- a/src/test-meta-surface.c
+++ b/src/test-meta-surface.c
@@ -48,6 +48,8 @@
 #include "test-meta-surface.h"
 
 #include "cairoint.h"
+#include "cairo-mutex-private.h"
+
 #include "cairo-meta-surface-private.h"
 
 typedef struct _test_meta_surface {
diff --git a/src/test-paginated-surface.c b/src/test-paginated-surface.c
index d82749f..6a69187 100644
--- a/src/test-paginated-surface.c
+++ b/src/test-paginated-surface.c
@@ -48,6 +48,7 @@
 #include "test-paginated-surface.h"
 
 #include "cairoint.h"
+#include "cairo-mutex-private.h"
 
 #include "cairo-paginated-surface-private.h"
 
diff-tree 0263f18f843175e478bd3a14e24445e31e7b0952 (from 94c367f7d7637fc74ed6d1fbe13d73662c08246b)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Mar 20 08:47:45 2007 -0400

    [configure.in] Define PIXMAN_CFLAGS, to pass -fno-strict-aliasing to pixman

diff --git a/configure.in b/configure.in
index 8cd3790..8acca66 100644
--- a/configure.in
+++ b/configure.in
@@ -223,6 +223,7 @@ CAIRO_NONPKGCONFIG_CFLAGS=""
 CAIRO_NONPKGCONFIG_LIBS="$LIBM"
 CAIRO_CFLAGS=$CAIRO_NONPKGCONFIG_CFLAGS
 CAIRO_LIBS=$CAIRO_NONPKGCONFIG_LIBS
+PIXMAN_CFLAGS=""
 
 dnl ===========================================================================
 
@@ -651,16 +652,19 @@ AC_CACHE_CHECK([for supported warning fl
 
 	AC_MSG_CHECKING([which warning flags were supported])])
 WARN_CFLAGS=$cairo_cv_warn_cflags
-AC_SUBST(WARN_CFLAGS)
 CAIRO_CFLAGS="$CAIRO_CFLAGS $WARN_CFLAGS"
+PIXMAN_CFLAGS="$PIXMAN_CFLAGS $WARN_CFLAGS"
 
-CAIRO_CC_TRY_FLAG([-fno-strict-aliasing], [CAIRO_CFLAGS="$CAIRO_CFLAGS -fno-strict-aliasing"])
+CAIRO_CC_TRY_FLAG([-fno-strict-aliasing],
+		  [CAIRO_CFLAGS="$CAIRO_CFLAGS -fno-strict-aliasing"
+		   PIXMAN_CFLAGS="$PIXMAN_CFLAGS -fno-strict-aliasing"])
 
 AC_SUBST(CAIRO_REQUIRES)
 AC_SUBST(CAIRO_NONPKGCONFIG_CFLAGS)
 AC_SUBST(CAIRO_NONPKGCONFIG_LIBS)
 AC_SUBST(CAIRO_CFLAGS)
 AC_SUBST(CAIRO_LIBS)
+AC_SUBST(PIXMAN_CFLAGS)
 
 dnl ===========================================================================
 dnl Check for gtk-doc and docbook
@@ -705,7 +709,7 @@ if test $have_mmx_intrinsics = yes ; the
 else
    MMX_CFLAGS=
 fi
-AC_SUBST(MMX_CFLAGS)
+PIXMAN_CFLAGS="$PIXMAN_CFLAGS $MMX_CFLAGS"
 
 AM_CONDITIONAL(USE_MMX, test $have_mmx_intrinsics = yes)
 
diff --git a/pixman/src/Makefile.am b/pixman/src/Makefile.am
index aa04c31..7b828f5 100644
--- a/pixman/src/Makefile.am
+++ b/pixman/src/Makefile.am
@@ -35,8 +35,6 @@ noinst_LTLIBRARIES += libpixman-mmx.la
 libpixman_mmx_la_SOURCES = \
 	fbmmx.c		\
 	fbmmx.h
-libpixman_mmx_la_CFLAGS = @MMX_CFLAGS@ $(WARN_CFLAGS)
+libpixman_mmx_la_CFLAGS = $(PIXMAN_CFLAGS)
 libpixman_la_LIBADD = libpixman-mmx.la
 endif
-
-INCLUDES = -I$(top_srcdir) -I$(srcdir) @WARN_CFLAGS@