From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XTPhf-0003LF-2d for qemu-devel@nongnu.org; Mon, 15 Sep 2014 02:24:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XTPhX-00037V-Ep for qemu-devel@nongnu.org; Mon, 15 Sep 2014 02:23:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30019) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XTPhX-00037J-62 for qemu-devel@nongnu.org; Mon, 15 Sep 2014 02:23:51 -0400 From: Gerd Hoffmann Date: Mon, 15 Sep 2014 08:23:05 +0200 Message-Id: <1410762185-23820-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1410762185-23820-1-git-send-email-kraxel@redhat.com> References: <1410762185-23820-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 2/2] configure: check for pixman-1 version List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Hu Tao , Gerd Hoffmann From: Hu Tao commit a93a3af9 introduces use of PIXMAN_TYPE_RGBA, but it's only availab= le in pixman >=3D 0.21.8. If pixman doesn't meet the version requirement, qe= mu will fail to build with following message: qemu/ui/qemu-pixman.c: In function =E2=80=98qemu_pixelformat_from_pixman=E2= =80=99: qemu/ui/qemu-pixman.c:42: error: =E2=80=98PIXMAN_TYPE_RGBA=E2=80=99 undec= lared (first use in this function) qemu/ui/qemu-pixman.c:42: error: (Each undeclared identifier is reported = only once qemu/ui/qemu-pixman.c:42: error: for each function it appears in.) This patch fixes the problem by checking the pixman version. Signed-off-by: Hu Tao Signed-off-by: Gerd Hoffmann --- configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 961bf6f..1a9daa5 100755 --- a/configure +++ b/configure @@ -2737,7 +2737,7 @@ fi if test "$pixman" =3D ""; then if test "$want_tools" =3D "no" -a "$softmmu" =3D "no"; then pixman=3D"none" - elif $pkg_config pixman-1 > /dev/null 2>&1; then + elif $pkg_config --atleast-version=3D0.21.8 pixman-1 > /dev/null 2>&1;= then pixman=3D"system" else pixman=3D"internal" @@ -2753,11 +2753,12 @@ if test "$pixman" =3D "none"; then pixman_cflags=3D pixman_libs=3D elif test "$pixman" =3D "system"; then + # pixman version has been checked above pixman_cflags=3D`$pkg_config --cflags pixman-1` pixman_libs=3D`$pkg_config --libs pixman-1` else if test ! -d ${source_path}/pixman/pixman; then - error_exit "pixman not present. Your options:" \ + error_exit "pixman >=3D 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:" \ --=20 1.8.3.1