diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-12 09:51:41 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-12 09:51:41 +0100 |
| commit | 2a2c4830c0068d70443f3dddc4cc668f0c601b5c (patch) | |
| tree | 2892376a5226d2965c07ce558e52d9c7030d95ac /configure | |
| parent | 05fedeef835c3c889e5d2e44f8abb11dcfcadefc (diff) | |
| parent | fa7a1e521943f838ab1dc02fdb29473a608ca5f4 (diff) | |
| download | focaccia-qemu-2a2c4830c0068d70443f3dddc4cc668f0c601b5c.tar.gz focaccia-qemu-2a2c4830c0068d70443f3dddc4cc668f0c601b5c.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20140611-1' into staging
gtk: misc fixes & cleanups. # gpg: Signature made Wed 11 Jun 2014 13:28:12 BST using RSA key ID D3E87138 # 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>" * remotes/kraxel/tags/pull-gtk-20140611-1: gtk: update window size after showing/hiding tabs gtk: factor out gtk3 grab into the new gd_grab_devices function gtk: cleanup backend dependencies gtk: factor out keycode mapping Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure b/configure index ccf3efc125..dfbe75ee75 100755 --- a/configure +++ b/configure @@ -2006,6 +2006,7 @@ fi if test "$gtk" != "no"; then gtkpackage="gtk+-$gtkabi" + gtkx11package="gtk+-x11-$gtkabi" if test "$gtkabi" = "3.0" ; then gtkversion="3.0.0" else @@ -2014,6 +2015,9 @@ if test "$gtk" != "no"; then if $pkg_config --exists "$gtkpackage >= $gtkversion"; then gtk_cflags=`$pkg_config --cflags $gtkpackage` gtk_libs=`$pkg_config --libs $gtkpackage` + if $pkg_config --exists "$gtkx11package >= $gtkversion"; then + gtk_libs="$gtk_libs -lX11" + fi libs_softmmu="$gtk_libs $libs_softmmu" gtk="yes" elif test "$gtk" = "yes"; then |