[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/7] gtk: prefer gtk3 over gtk2
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 3/7] gtk: prefer gtk3 over gtk2 |
Date: |
Thu, 8 Jun 2017 09:07:12 +0200 |
In case the configure script finds both gtk2 and gtk3 installed it
still prefers gtk2 over gtk3. Prefer gtk3 instead.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden
---
configure | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index 13e040d28c..b75b9c57c0 100755
--- a/configure
+++ b/configure
@@ -2325,14 +2325,14 @@ fi
# GTK probe
if test "$gtkabi" = ""; then
- # The GTK ABI was not specified explicitly, so try whether 2.0 is
available.
- # Use 3.0 as a fallback if that is available.
- if $pkg_config --exists "gtk+-2.0 >= 2.18.0"; then
- gtkabi=2.0
- elif $pkg_config --exists "gtk+-3.0 >= 3.0.0"; then
+ # The GTK ABI was not specified explicitly, so try whether 3.0 is
available.
+ # Use 2.0 as a fallback if that is available.
+ if $pkg_config --exists "gtk+-3.0 >= 3.0.0"; then
gtkabi=3.0
+ elif $pkg_config --exists "gtk+-2.0 >= 2.18.0"; then
+ gtkabi=2.0
else
- gtkabi=2.0
+ gtkabi=3.0
fi
fi
@@ -2355,7 +2355,7 @@ if test "$gtk" != "no"; then
libs_softmmu="$gtk_libs $libs_softmmu"
gtk="yes"
elif test "$gtk" = "yes"; then
- feature_not_found "gtk" "Install gtk2 or gtk3 devel"
+ feature_not_found "gtk" "Install gtk3-devel"
else
gtk="no"
fi
--
2.9.3
- [Qemu-devel] [PULL 0/7] ui patch queue, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 6/7] sdl: add deprecation warning for sdl1, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 3/7] gtk: prefer gtk3 over gtk2,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 5/7] gtk: add deprecation warning for gtk2, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 2/7] spice: Use proper enum type for kbd led state, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 1/7] Improve Cocoa modifier key handling, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 4/7] sdl: prefer sdl2 over sdl1, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 7/7] spice: don't enter opengl mode in case another UI provides opengl support, Gerd Hoffmann, 2017/06/08
- Re: [Qemu-devel] [PULL 0/7] ui patch queue, Peter Maydell, 2017/06/12
- Re: [Qemu-devel] [PULL 0/7] ui patch queue, Gerd Hoffmann, 2017/06/13