Commit 8781595b authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

configure: add X11 vars to config-host.mak 



Simplifies handling the X11 dependency,
also makes ui/Makefile.objs more readable.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-id: 20180301100547.18962-9-kraxel@redhat.com
parent 61b4d9a2

configure

+8 −2
Original line number Diff line number Diff line
@@ -2520,9 +2520,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
@@ -2555,6 +2554,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
@@ -2923,6 +2923,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
@@ -6036,6 +6037,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

ui/Makefile.objs

+4 −1
Original line number Diff line number Diff line
@@ -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