[cairo-commit] configure.in src/cairoint.h src/cairo-region-private.h test/buffer-diff.c

[Søren Sandmann Pedersen]

 configure.in               |   11 +++++++----
 src/cairo-region-private.h |    2 +-
 src/cairoint.h             |    2 +-
 test/buffer-diff.c         |    2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

New commits:
diff-tree 4ca0ca153a847337452bbb237d42f6d7b0a163d0 (from 13cae8b5e6d3fc93c4eb1853b91ba356b572b551)
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Mon Aug 6 19:24:31 2007 -0400

    Bump pixman dependency to 0.9.4
    
    Also print the download location if the library wasn't found.

diff --git a/configure.in b/configure.in
index c3f7b4f..cda59de 100644
--- a/configure.in
+++ b/configure.in
@@ -236,12 +236,15 @@ CAIRO_LIBS=$CAIRO_NONPKGCONFIG_LIBS
 
 dnl ===========================================================================
 
-PIXMAN_REQUIRES="pixman >= 0.9.2"
-PKG_CHECK_MODULES(PIXMAN,  $PIXMAN_REQUIRES)
+PIXMAN_VERSION="0.9.4"
+PIXMAN_REQUIRES="pixman-1 >= $PIXMAN_VERSION"
+PKG_CHECK_MODULES(pixman, $PIXMAN_REQUIRES, ,
+	[AC_MSG_ERROR([pixman >= $PIXMAN_VERSION is required
+(http://xorg.freedesktop.org/releases/individual/lib/pixman-$PIXMAN_VERSION.tar.gz)])])
 
 CAIRO_REQUIRES="$PIXMAN_REQUIRES $CAIRO_REQUIRES"
-CAIRO_CFLAGS="$PIXMAN_CFLAGS $CAIRO_CFLAGS"
-CAIRO_LIBS="$PIXMAN_LIBS $CAIRO_LIBS"
+CAIRO_CFLAGS="$pixman_CFLAGS $CAIRO_CFLAGS"
+CAIRO_LIBS="$pixman_LIBS $CAIRO_LIBS"
 
 dnl ===========================================================================
 
diff --git a/src/cairo-region-private.h b/src/cairo-region-private.h
index efb01ce..a3ee759 100644
--- a/src/cairo-region-private.h
+++ b/src/cairo-region-private.h
@@ -37,7 +37,7 @@
 #ifndef CAIRO_REGION_PRIVATE_H
 #define CAIRO_REGION_PRIVATE_H
 
-#include <pixman/pixman.h>
+#include <pixman.h>
 
 /* cairo_region_t is defined in cairoint.h */
 
diff --git a/src/cairoint.h b/src/cairoint.h
index 37b672b..788537f 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -64,7 +64,7 @@
 #include <stdio.h>
 
 #include "cairo.h"
-#include <pixman/pixman.h>
+#include <pixman.h>
 
 #ifdef _MSC_VER
 #define snprintf _snprintf
diff --git a/test/buffer-diff.c b/test/buffer-diff.c
index 59a9e5d..24fdad3 100644
--- a/test/buffer-diff.c
+++ b/test/buffer-diff.c
@@ -34,7 +34,7 @@
 #endif
 #include <errno.h>
 #include <string.h>
-#include <pixman/pixman.h>
+#include <pixman.h>
 
 #include "cairo-test.h"