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>
This commit is contained in:
Gerd Hoffmann 2012-11-27 13:19:40 +01:00 committed by Blue Swirl
parent 94788f54e9
commit 288fa40736

4
configure vendored
View File

@ -2118,7 +2118,7 @@ fi
# pixman support probe # pixman support probe
if test "$pixman" = ""; then 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" pixman="system"
else else
pixman="internal" pixman="internal"
@ -2129,7 +2129,7 @@ if test "$pixman" = "system"; then
pixman_libs=`$pkg_config --libs pixman-1 2>/dev/null` pixman_libs=`$pkg_config --libs pixman-1 2>/dev/null`
else else
if test ! -d ${source_path}/pixman/pixman; then 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 " (1) Prefered: Install the pixman devel package (any recent"
echo " distro should have packages as Xorg needs pixman too)." echo " distro should have packages as Xorg needs pixman too)."
echo " (2) Fetch the pixman submodule, using:" echo " (2) Fetch the pixman submodule, using:"