From nobody Wed Oct 22 13:07:06 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519820536958168.0110147918341; Wed, 28 Feb 2018 04:22:16 -0800 (PST) Received: from localhost ([::1]:43631 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er0kR-0003AV-PZ for importer@patchew.org; Wed, 28 Feb 2018 07:22:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er0ff-0007mM-Vq for qemu-devel@nongnu.org; Wed, 28 Feb 2018 07:17:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1er0fc-0002GY-Th for qemu-devel@nongnu.org; Wed, 28 Feb 2018 07:17:19 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36618 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1er0fc-0002F5-MV for qemu-devel@nongnu.org; Wed, 28 Feb 2018 07:17:16 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 72405818535B for ; Wed, 28 Feb 2018 12:17:11 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-147.ams2.redhat.com [10.36.116.147]) by smtp.corp.redhat.com (Postfix) with ESMTP id 140AC2026E04; Wed, 28 Feb 2018 12:17:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 322E8A1EA; Wed, 28 Feb 2018 13:17:04 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 28 Feb 2018 13:17:00 +0100 Message-Id: <20180228121703.20816-9-kraxel@redhat.com> In-Reply-To: <20180228121703.20816-1-kraxel@redhat.com> References: <20180228121703.20816-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 28 Feb 2018 12:17:11 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 28 Feb 2018 12:17:11 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 08/11] configure: add X11 vars to config-host.mak 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: 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" Simplifies handling the X11 dependency, also makes ui/Makefile.objs more readable. Signed-off-by: Gerd Hoffmann Message-id: 20180221131537.31341-9-kraxel@redhat.com --- configure | 10 ++++++++-- ui/Makefile.objs | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 39f3a43001..f6dc1c92b3 100755 --- a/configure +++ b/configure @@ -2509,9 +2509,8 @@ fi =20 ########################################## # X11 probe -x11_cflags=3D -x11_libs=3D-lX11 if $pkg_config --exists "x11"; then + have_x11=3Dyes x11_cflags=3D$($pkg_config --cflags x11) x11_libs=3D$($pkg_config --libs x11) fi @@ -2544,6 +2543,7 @@ if test "$gtk" !=3D "no"; then gtk_libs=3D$($pkg_config --libs $gtkpackage) gtk_version=3D$($pkg_config --modversion $gtkpackage) if $pkg_config --exists "$gtkx11package >=3D $gtkversion"; then + need_x11=3Dyes gtk_cflags=3D"$gtk_cflags $x11_cflags" gtk_libs=3D"$gtk_libs $x11_libs" fi @@ -2912,6 +2912,7 @@ if test "$sdl" =3D "yes" ; then int main(void) { return 0; } EOF if compile_prog "$sdl_cflags $x11_cflags" "$sdl_libs $x11_libs" ; then + need_x11=3Dyes sdl_cflags=3D"$sdl_cflags $x11_cflags" sdl_libs=3D"$sdl_libs $x11_libs" fi @@ -6024,6 +6025,11 @@ if test "$modules" =3D "yes"; then echo "CONFIG_STAMP=3D_$( (echo $qemu_version; echo $pkgversion; cat $0) = | $shacmd - | cut -f1 -d\ )" >> $config_host_mak echo "CONFIG_MODULES=3Dy" >> $config_host_mak fi +if test "$have_x11" =3D "yes" -a "$need_x11" =3D "yes"; then + echo "CONFIG_X11=3Dy" >> $config_host_mak + echo "X11_CFLAGS=3D$x11_cflags" >> $config_host_mak + echo "X11_LIBS=3D$x11_libs" >> $config_host_mak +fi if test "$sdl" =3D "yes" ; then echo "CONFIG_SDL=3Dy" >> $config_host_mak echo "CONFIG_SDLABI=3D$sdlabi" >> $config_host_mak diff --git a/ui/Makefile.objs b/ui/Makefile.objs index ced7d91a63..9b725b07aa 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -17,7 +17,10 @@ common-obj-$(CONFIG_CURSES) +=3D curses.o common-obj-$(CONFIG_VNC) +=3D $(vnc-obj-y) common-obj-$(call lnot,$(CONFIG_VNC)) +=3D vnc-stubs.o common-obj-$(CONFIG_GTK) +=3D gtk.o -common-obj-$(if $(CONFIG_WIN32),n,$(if $(CONFIG_SDL),y,$(CONFIG_GTK))) += =3D x_keymap.o + +common-obj-$(CONFIG_X11) +=3D x_keymap.o +x_keymap.o-cflags :=3D $(X11_CFLAGS) +x_keymap.o-libs :=3D $(X11_LIBS) =20 ifeq ($(CONFIG_SDLABI),1.2) sdl.mo-objs :=3D sdl.o sdl_zoom.o --=20 2.9.3