summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLaurent Vivier <laurent@vivier.eu>2017-10-19 21:16:06 +0200
committerGerd Hoffmann <kraxel@redhat.com>2017-10-23 08:10:18 +0200
commitff69fd8cbfb6c9c9a6052aa714c661f7cdc4eeea (patch)
tree665d8f60b14cb1041bc840b3d7e25c01fcc40487
parente822e81e350825dd94f41ee2538ff1432b812eb9 (diff)
downloadfocaccia-qemu-ff69fd8cbfb6c9c9a6052aa714c661f7cdc4eeea.tar.gz
focaccia-qemu-ff69fd8cbfb6c9c9a6052aa714c661f7cdc4eeea.zip
configure: disable qemu-keymap for linux-user qemu
We don't need qemu-keymap when we build only linux-user qemu.

When we compile in static mode, the libxkbcommon is detected
by configure if the shared one is available, but cannot
be linked if the static version is not available.

As we don't need it for qemu-linux-user, and we generally need
a static link to use it in a chroot, disable qemu-keymap in
this case.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-id: 20171019191606.14129-1-laurent@vivier.eu
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rwxr-xr-xconfigure6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index 6f21aaf989..03547cea6a 100755
--- a/configure
+++ b/configure
@@ -5136,9 +5136,9 @@ if test "$softmmu" = yes ; then
     fi
     mpath=no
   fi
-fi
-if test "$xkbcommon" = "yes"; then
-  tools="qemu-keymap\$(EXESUF) $tools"
+  if test "$xkbcommon" = "yes"; then
+    tools="qemu-keymap\$(EXESUF) $tools"
+  fi
 fi
 
 # Probe for guest agent support/options