Mercurial > vim

diff src/auto/configure @ 23802:17ee19090b85 v8.2.2442

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2442: automatic GUI selection does not check for GTK 3 Commit: https://github.com/vim/vim/commit/f272ae12ac064856b710046393d5bf9b1670076d Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 31 19:52:50 2021 +0100 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.
author Bram Moolenaar <Bram@vim.org>
date Sun, 31 Jan 2021 20:00:04 +0100
parents de74b00b15bb
children a77ea73f4db5
line wrap: on
line diff
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -9262,6 +9262,7 @@ else
 $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
   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 @@ fi
       SKIP_MOTIF=YES
       GUITYPE=GTK
 
+    else
+      SKIP_GTK3=$save_skip_gtk3
     fi
   fi
   if test "x$GUITYPE" = "xGTK"; then
@@ -9778,6 +9783,8 @@ fi
   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 @@ fi
 
       $as_echo "#define USE_GTK3 1" >>confdefs.h
 
+    else
+      SKIP_GTK2=$save_skip_gtk2
     fi
   fi
 fi