diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2017-06-06 12:53:36 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2017-06-14 09:51:45 +0200 |
| commit | 5fe309ff0d1e8234fd79c21544bfcc436ece6386 (patch) | |
| tree | 0d41fa914af1d14e97b8acfb44dca491cdcbecd6 | |
| parent | bfefa6d7d6e930429ac3a7ff3347c9c67f069289 (diff) | |
| download | focaccia-qemu-5fe309ff0d1e8234fd79c21544bfcc436ece6386.tar.gz focaccia-qemu-5fe309ff0d1e8234fd79c21544bfcc436ece6386.zip | |
gtk: prefer gtk3 over gtk2
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 <kraxel@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-id: 20170606105339.3613-2-kraxel@redhat.com
| -rwxr-xr-x | configure | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure b/configure index b147191ae6..bfba156a41 100755 --- a/configure +++ b/configure @@ -2301,14 +2301,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 - else + elif $pkg_config --exists "gtk+-2.0 >= 2.18.0"; then gtkabi=2.0 + else + gtkabi=3.0 fi fi @@ -2331,7 +2331,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 |