summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2012-11-27 13:19:40 +0100
committerBlue Swirl <blauwirbel@gmail.com>2012-12-08 14:25:46 +0000
commit288fa40736e6eb63132d01aa6dc21ee831b796ae (patch)
tree4f58ec2d360b9948569bcb8c91d4712b91068670
parent94788f54e9deeaa2c82891a7d216fdd6e0e58749 (diff)
downloadqemu-288fa40736e6eb63132d01aa6dc21ee831b796ae.tar.gz
pixman: require 0.18.4 or newer
When older versions are found the internal pixman version is prefered. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 994f7310b8..44034d66b9 100755
--- a/configure
+++ b/configure
@@ -2118,7 +2118,7 @@ fi
# pixman support probe
if test "$pixman" = ""; then
- if $pkg_config pixman-1 > /dev/null 2>&1; then
+ if $pkg_config --atleast-version=0.18.4 pixman-1 > /dev/null 2>&1; then
pixman="system"
else
pixman="internal"
@@ -2129,7 +2129,7 @@ if test "$pixman" = "system"; then
pixman_libs=`$pkg_config --libs pixman-1 2>/dev/null`
else
if test ! -d ${source_path}/pixman/pixman; then
- echo "ERROR: pixman not present. Your options:"
+ echo "ERROR: pixman not present (or older than 0.18.4). Your options:"
echo " (1) Prefered: Install the pixman devel package (any recent"
echo " distro should have packages as Xorg needs pixman too)."
echo " (2) Fetch the pixman submodule, using:"