[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/12] configure: add X11 vars to config-host.mak
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 08/12] configure: add X11 vars to config-host.mak |
Date: |
Tue, 27 Feb 2018 09:07:20 +0100 |
Simplifies handling the X11 dependency,
also makes ui/Makefile.objs more readable.
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
---
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
##########################################
# X11 probe
-x11_cflags=
-x11_libs=-lX11
if $pkg_config --exists "x11"; then
+ have_x11=yes
x11_cflags=$($pkg_config --cflags x11)
x11_libs=$($pkg_config --libs x11)
fi
@@ -2544,6 +2543,7 @@ if test "$gtk" != "no"; then
gtk_libs=$($pkg_config --libs $gtkpackage)
gtk_version=$($pkg_config --modversion $gtkpackage)
if $pkg_config --exists "$gtkx11package >= $gtkversion"; then
+ need_x11=yes
gtk_cflags="$gtk_cflags $x11_cflags"
gtk_libs="$gtk_libs $x11_libs"
fi
@@ -2912,6 +2912,7 @@ if test "$sdl" = "yes" ; then
int main(void) { return 0; }
EOF
if compile_prog "$sdl_cflags $x11_cflags" "$sdl_libs $x11_libs" ; then
+ need_x11=yes
sdl_cflags="$sdl_cflags $x11_cflags"
sdl_libs="$sdl_libs $x11_libs"
fi
@@ -6024,6 +6025,11 @@ if test "$modules" = "yes"; then
echo "CONFIG_STAMP=_$( (echo $qemu_version; echo $pkgversion; cat $0) |
$shacmd - | cut -f1 -d\ )" >> $config_host_mak
echo "CONFIG_MODULES=y" >> $config_host_mak
fi
+if test "$have_x11" = "yes" -a "$need_x11" = "yes"; then
+ echo "CONFIG_X11=y" >> $config_host_mak
+ echo "X11_CFLAGS=$x11_cflags" >> $config_host_mak
+ echo "X11_LIBS=$x11_libs" >> $config_host_mak
+fi
if test "$sdl" = "yes" ; then
echo "CONFIG_SDL=y" >> $config_host_mak
echo "CONFIG_SDLABI=$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) += curses.o
common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
common-obj-$(call lnot,$(CONFIG_VNC)) += vnc-stubs.o
common-obj-$(CONFIG_GTK) += gtk.o
-common-obj-$(if $(CONFIG_WIN32),n,$(if $(CONFIG_SDL),y,$(CONFIG_GTK))) +=
x_keymap.o
+
+common-obj-$(CONFIG_X11) += x_keymap.o
+x_keymap.o-cflags := $(X11_CFLAGS)
+x_keymap.o-libs := $(X11_LIBS)
ifeq ($(CONFIG_SDLABI),1.2)
sdl.mo-objs := sdl.o sdl_zoom.o
--
2.9.3
- [Qemu-devel] [PULL 00/12] Ui 20180227 patches, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 03/12] cocoa: switch over to new display registry, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 09/12] configure: opengl doesn't depend on x11, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 08/12] configure: add X11 vars to config-host.mak,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 02/12] sdl: switch over to new display registry, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 10/12] sdl: build as ui module, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 11/12] gtk: build as ui module, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 06/12] console: add and use qemu_display_find_default, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 04/12] curses: switch over to new display registry, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 07/12] console: add ui module loading support, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 01/12] console: add qemu display registry, add gtk, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 12/12] curses: build as ui module, Gerd Hoffmann, 2018/02/27
- [Qemu-devel] [PULL 05/12] egl-headless: switch over to new display registry, Gerd Hoffmann, 2018/02/27
- Re: [Qemu-devel] [PULL 00/12] Ui 20180227 patches, Peter Maydell, 2018/02/27