Commit 5fe309ff authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

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: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20170606105339.3613-2-kraxel@redhat.com
parent bfefa6d7

configure

+7 −7
Original line number Diff line number Diff line
@@ -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