From nobody Mon Feb 9 08:57:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504620179228863.4829856919258; Tue, 5 Sep 2017 07:02:59 -0700 (PDT) Received: from localhost ([::1]:59095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpERO-0000o8-9F for importer@patchew.org; Tue, 05 Sep 2017 10:02:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpEPt-0008Kr-Uc for qemu-devel@nongnu.org; Tue, 05 Sep 2017 10:01:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpEPp-00030y-An for qemu-devel@nongnu.org; Tue, 05 Sep 2017 10:01:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49396) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpEPp-0002zu-5p for qemu-devel@nongnu.org; Tue, 05 Sep 2017 10:01:21 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7799F76A1E; Tue, 5 Sep 2017 14:01:19 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-175.ams2.redhat.com [10.36.117.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CFD98A70E; Tue, 5 Sep 2017 14:01:17 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3082497D; Tue, 5 Sep 2017 16:01:16 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7799F76A1E Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 5 Sep 2017 16:01:16 +0200 Message-Id: <20170905140116.28181-3-kraxel@redhat.com> In-Reply-To: <20170905140116.28181-1-kraxel@redhat.com> References: <20170905140116.28181-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 05 Sep 2017 14:01:19 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 2/2] pixman: drop configure switches X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Remove pixman switches from configure, should not be needed any more, configure can figure by itself whenever pixman is needed or not. Signed-off-by: Gerd Hoffmann --- configure | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 73760430b0..fdef7e138b 100755 --- a/configure +++ b/configure @@ -282,7 +282,6 @@ curses=3D"" docs=3D"" fdt=3D"" netmap=3D"no" -pixman=3D"" sdl=3D"" sdlabi=3D"" virtfs=3D"" @@ -928,10 +927,6 @@ for opt do # configure to be used by RPM and similar macros that set # lots of directory switches by default. ;; - --with-system-pixman) pixman=3D"system" - ;; - --without-pixman) pixman=3D"none" - ;; --disable-sdl) sdl=3D"no" ;; --enable-sdl) sdl=3D"yes" @@ -3298,24 +3293,10 @@ fi ########################################## # pixman support probe =20 -if test "$pixman" =3D ""; then - if test "$want_tools" =3D "no" -a "$softmmu" =3D "no"; then - pixman=3D"none" - elif $pkg_config --atleast-version=3D0.21.8 pixman-1 > /dev/null 2>&1; t= hen - pixman=3D"system" - fi -fi -if test "$pixman" =3D "none"; then - if test "$want_tools" !=3D "no" -o "$softmmu" !=3D "no"; then - error_exit "pixman disabled but system emulation or tools build" \ - "enabled. You can turn off pixman only if you also" \ - "disable all system emulation targets and the tools" \ - "build with '--disable-tools --disable-system'." - fi +if test "$want_tools" =3D "no" -a "$softmmu" =3D "no"; then pixman_cflags=3D pixman_libs=3D -elif test "$pixman" =3D "system"; then - # pixman version has been checked above +elif $pkg_config --atleast-version=3D0.21.8 pixman-1 > /dev/null 2>&1; then pixman_cflags=3D$($pkg_config --cflags pixman-1) pixman_libs=3D$($pkg_config --libs pixman-1) else @@ -5293,7 +5274,6 @@ echo "static build $static" if test "$darwin" =3D "yes" ; then echo "Cocoa support $cocoa" fi -echo "pixman $pixman" echo "SDL support $sdl $(echo_version $sdl $sdlversion)" echo "GTK support $gtk $(echo_version $gtk $gtk_version)" echo "GTK GL support $gtk_gl" --=20 2.9.3