Patch 8.2.2442

[Bram Moolenaar]

Patch 8.2.2442
Problem: Automatic GUI selection does not check for GTK 3.
Solution: Make SKIP_GTK3 empty for automatic GUI support. Set SKIP_GTK3 to
YES when checking for GTK2.
Files: src/configure.ac, src/auto/configure


*** ../vim-8.2.2441/src/configure.ac 2021-01-31 14:36:02.375888833 +0100
--- src/configure.ac 2021-01-31 19:51:30.758198479 +0100
***************
*** 2448,2453 ****
--- 2448,2454 ----
yes|""|auto) AC_MSG_RESULT(yes/auto - automatic GUI support)
gui_auto=yes
SKIP_GTK2=
+ SKIP_GTK3=
SKIP_GNOME=
SKIP_MOTIF=
SKIP_ATHENA=
***************
*** 2759,2764 ****
--- 2760,2769 ----
if test "x$PKG_CONFIG" != "xno"; then
dnl First try finding version 2.2.0 or later. The 2.0.x series has
dnl problems (bold fonts, --remote doesn't work).
+ dnl Disable checking for GTK3 here, otherwise it's found when GTK2 is not
+ dnl found.
+ save_skip_gtk3=$SKIP_GTK3
+ SKIP_GTK3=YES
AM_PATH_GTK(2.2.0,
[GUI_LIB_LOC="$GTK_LIBDIR"
GTK_LIBNAME="$GTK_LIBS"
***************
*** 2770,2775 ****
--- 2775,2782 ----
SKIP_MOTIF=YES
GUITYPE=GTK
AC_SUBST(GTK_LIBNAME)
+ else
+ SKIP_GTK3=$save_skip_gtk3
fi
fi
if test "x$GUITYPE" = "xGTK"; then
***************
*** 2805,2810 ****
--- 2812,2819 ----
fi

if test "x$PKG_CONFIG" != "xno"; then
+ save_skip_gtk2=$SKIP_GTK2
+ SKIP_GTK2=YES
AM_PATH_GTK(3.0.0,
[GUI_LIB_LOC="$GTK_LIBDIR"
GTK_LIBNAME="$GTK_LIBS"
***************
*** 2818,2823 ****
--- 2827,2834 ----
GUITYPE=GTK
AC_SUBST(GTK_LIBNAME)
AC_DEFINE(USE_GTK3)
+ else
+ SKIP_GTK2=$save_skip_gtk2
fi
fi
fi
*** ../vim-8.2.2441/src/auto/configure 2021-01-31 14:36:02.375888833 +0100
--- src/auto/configure 2021-01-31 19:51:36.586178627 +0100
***************
*** 9262,9267 ****
--- 9262,9268 ----
$as_echo "yes/auto - automatic GUI support" >&6; }
gui_auto=yes
SKIP_GTK2=
+ SKIP_GTK3=
SKIP_GNOME=
SKIP_MOTIF=
SKIP_ATHENA=
***************
*** 9523,9528 ****
--- 9524,9531 ----
fi

if test "x$PKG_CONFIG" != "xno"; then
+ save_skip_gtk3=$SKIP_GTK3
+ SKIP_GTK3=YES

if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then
{
***************
*** 9666,9671 ****
--- 9669,9676 ----
SKIP_MOTIF=YES
GUITYPE=GTK

+ else
+ SKIP_GTK3=$save_skip_gtk3
fi
fi
if test "x$GUITYPE" = "xGTK"; then
***************
*** 9778,9783 ****
--- 9783,9790 ----
fi

if test "x$PKG_CONFIG" != "xno"; then
+ save_skip_gtk2=$SKIP_GTK2
+ SKIP_GTK2=YES

if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then
{
***************
*** 9924,9929 ****
--- 9931,9938 ----

$as_echo "#define USE_GTK3 1" >>confdefs.h

+ else
+ SKIP_GTK2=$save_skip_gtk2
fi
fi
fi
*** ../vim-8.2.2441/src/version.c 2021-01-31 17:48:26.358330166 +0100
--- src/version.c 2021-01-31 19:50:08.218480323 +0100
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2442,
/**/

--
press CTRL-ALT-DEL for more information

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///