commit f272ae12ac064856b710046393d5bf9b1670076d
author Bram Moolenaar <Bram@vim.org> Sun Jan 31 19:52:50 2021 +0100
committer Bram Moolenaar <Bram@vim.org> Sun Jan 31 19:52:50 2021 +0100
tree e487bc36460d011a505d4772a23194d3317225bf
parent c03f5c677a1fba99d2379550ccf2391eaa43e2ac

patch 8.2.2442: automatic GUI selection does not check for GTK 3

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.

src/auto/configure

diff --git a/src/auto/configure b/src/auto/configure
index 12d8f24..250e5ae 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -9262,6 +9262,7 @@
 $as_echo "yes/auto - automatic GUI support" >&6; }
 		gui_auto=yes
 		SKIP_GTK2=
+		SKIP_GTK3=
 		SKIP_GNOME=
 		SKIP_MOTIF=
 		SKIP_ATHENA=
@@ -9523,6 +9524,8 @@
   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,6 +9669,8 @@
       SKIP_MOTIF=YES
       GUITYPE=GTK
 
+    else
+      SKIP_GTK3=$save_skip_gtk3
     fi
   fi
   if test "x$GUITYPE" = "xGTK"; then
@@ -9778,6 +9783,8 @@
   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,6 +9931,8 @@
 
       $as_echo "#define USE_GTK3 1" >>confdefs.h
 
+    else
+      SKIP_GTK2=$save_skip_gtk2
     fi
   fi
 fi