diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-01-10 16:29:02 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-01-10 16:29:02 +0000 |
| commit | 823dcd58ea58c7e983cc301ab2c1c55c4c8f4c18 (patch) | |
| tree | 44752f55b4f9ad23f009ee69adbe1479ce1eac7c /configure | |
| parent | d246ff5d3904ea540127228df2bda8af2a294804 (diff) | |
| parent | 766a0a54faa97b8d4cbc7a6bd47f7ea78e625c19 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190110-pull-request' into staging
ui: bugfixes, drop keymap include support, drop dead code.
# gpg: Signature made Thu 10 Jan 2019 08:47:10 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20190110-pull-request:
spice: Remove unused include
keymaps: drop support for include files
keymaps: remove common include
keymaps: drop nl-be map
keymaps: remove modifiers include
ui/console: Remove qemu_create_display_surface_guestmem()
configure: bump spice-server required version to 0.12.5
egl-headless: add egl_create_context
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -4622,7 +4622,7 @@ int main(void) { spice_server_new(); return 0; } EOF spice_cflags=$($pkg_config --cflags spice-protocol spice-server 2>/dev/null) spice_libs=$($pkg_config --libs spice-protocol spice-server 2>/dev/null) - if $pkg_config --atleast-version=0.12.0 spice-server && \ + if $pkg_config --atleast-version=0.12.5 spice-server && \ $pkg_config --atleast-version=0.12.3 spice-protocol && \ compile_prog "$spice_cflags" "$spice_libs" ; then spice="yes" @@ -4633,7 +4633,7 @@ EOF else if test "$spice" = "yes" ; then feature_not_found "spice" \ - "Install spice-server(>=0.12.0) and spice-protocol(>=0.12.3) devel" + "Install spice-server(>=0.12.5) and spice-protocol(>=0.12.3) devel" fi spice="no" fi |