diff --git a/configure b/configure index 961bf6fd4396c9e2c5ce57e930b14782b47429f3..1a9daa516e62b64f62c92b3fb39743568456bec8 100755 --- a/configure +++ b/configure @@ -2737,7 +2737,7 @@ fi if test "$pixman" = ""; then if test "$want_tools" = "no" -a "$softmmu" = "no"; then pixman="none" - elif $pkg_config pixman-1 > /dev/null 2>&1; then + elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then pixman="system" else pixman="internal" @@ -2753,11 +2753,12 @@ if test "$pixman" = "none"; then pixman_cflags= pixman_libs= elif test "$pixman" = "system"; then + # pixman version has been checked above pixman_cflags=`$pkg_config --cflags pixman-1` pixman_libs=`$pkg_config --libs pixman-1` else if test ! -d ${source_path}/pixman/pixman; then - error_exit "pixman not present. Your options:" \ + error_exit "pixman >= 0.21.8 not present. Your options:" \ " (1) Preferred: Install the pixman devel package (any recent" \ " distro should have packages as Xorg needs pixman too)." \ " (2) Fetch the pixman submodule, using:" \ diff --git a/pixman b/pixman index 97336fad32acf802003855cd8bd6477fa49a12e3..87eea99e443b389c978cf37efc52788bf03a0ee0 160000 --- a/pixman +++ b/pixman @@ -1 +1 @@ -Subproject commit 97336fad32acf802003855cd8bd6477fa49a12e3 +Subproject commit 87eea99e443b389c978cf37efc52788bf03a0ee0