]> git.proxmox.com Git - qemu.git/commitdiff
pixman: require 0.18.4 or newer
authorGerd Hoffmann <kraxel@redhat.com>
Tue, 27 Nov 2012 12:19:40 +0000 (13:19 +0100)
committerBlue Swirl <blauwirbel@gmail.com>
Sat, 8 Dec 2012 14:25:46 +0000 (14:25 +0000)
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>
configure

index 994f7310b83609afb5ae2ec70bee21ba64636cca..44034d66b90f96f0cd00c0ca763e165e0ac0b2b0 100755 (executable)
--- 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:"