diff options
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | src/cairo-region-private.h | 2 | ||||
| -rw-r--r-- | src/cairoint.h | 2 | ||||
| -rw-r--r-- | test/buffer-diff.c | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/configure.in b/configure.in index c3f7b4ffb..cda59de8d 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 efb01cefb..a3ee75965 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 37b672b46..788537f9f 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 59a9e5d89..24fdad3a6 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" |