From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ds3EG-0006Cm-Aj for qemu-devel@nongnu.org; Wed, 13 Sep 2017 04:41:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ds3E6-0000t4-Dr for qemu-devel@nongnu.org; Wed, 13 Sep 2017 04:41:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51724) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ds3E6-0000sD-8S for qemu-devel@nongnu.org; Wed, 13 Sep 2017 04:40:54 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 37050101709 for ; Wed, 13 Sep 2017 08:40:53 +0000 (UTC) From: Gerd Hoffmann Date: Wed, 13 Sep 2017 10:40:49 +0200 Message-Id: <20170913084051.21378-3-kraxel@redhat.com> In-Reply-To: <20170913084051.21378-1-kraxel@redhat.com> References: <20170913084051.21378-1-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 2/4] pixman: drop configure switches List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 Message-id: 20170905140116.28181-3-kraxel@redhat.com --- configure | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/configure b/configure index ee32ad0530..7ea9cb3247 100755 --- a/configure +++ b/configure @@ -287,7 +287,6 @@ curses="" docs="" fdt="" netmap="no" -pixman="" sdl="" sdlabi="" virtfs="" @@ -923,10 +922,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="system" - ;; - --without-pixman) pixman="none" - ;; --disable-sdl) sdl="no" ;; --enable-sdl) sdl="yes" @@ -3293,24 +3288,10 @@ fi ########################################## # pixman support probe -if test "$pixman" = ""; then - if test "$want_tools" = "no" -a "$softmmu" = "no"; then - pixman="none" - elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then - pixman="system" - fi -fi -if test "$pixman" = "none"; then - if test "$want_tools" != "no" -o "$softmmu" != "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" = "no" -a "$softmmu" = "no"; then pixman_cflags= pixman_libs= -elif test "$pixman" = "system"; then - # pixman version has been checked above +elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then pixman_cflags=$($pkg_config --cflags pixman-1) pixman_libs=$($pkg_config --libs pixman-1) else @@ -5288,7 +5269,6 @@ echo "static build $static" if test "$darwin" = "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" -- 2.9.3