Mercurial > vim

comparison 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
comparison
equal deleted inserted replaced
23801:e3163b68805d 23802:17ee19090b85
9260 $as_echo "no GUI support" >&6; } ;; 9260 $as_echo "no GUI support" >&6; } ;;
9261 yes|""|auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes/auto - automatic GUI support" >&5 9261 yes|""|auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes/auto - automatic GUI support" >&5
9262 $as_echo "yes/auto - automatic GUI support" >&6; } 9262 $as_echo "yes/auto - automatic GUI support" >&6; }
9263 gui_auto=yes 9263 gui_auto=yes
9264 SKIP_GTK2= 9264 SKIP_GTK2=
9265 SKIP_GTK3=
9265 SKIP_GNOME= 9266 SKIP_GNOME=
9266 SKIP_MOTIF= 9267 SKIP_MOTIF=
9267 SKIP_ATHENA= 9268 SKIP_ATHENA=
9268 SKIP_NEXTAW=;; 9269 SKIP_NEXTAW=;;
9269 gtk2) { $as_echo "$as_me:${as_lineno-$LINENO}: result: GTK+ 2.x GUI support" >&5 9270 gtk2) { $as_echo "$as_me:${as_lineno-$LINENO}: result: GTK+ 2.x GUI support" >&5
9521 { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk test disabled" >&5 9522 { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk test disabled" >&5
9522 $as_echo "gtk test disabled" >&6; } 9523 $as_echo "gtk test disabled" >&6; }
9523 fi 9524 fi
9524 9525
9525 if test "x$PKG_CONFIG" != "xno"; then 9526 if test "x$PKG_CONFIG" != "xno"; then
9527 save_skip_gtk3=$SKIP_GTK3
9528 SKIP_GTK3=YES
9526 9529
9527 if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then 9530 if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then
9528 { 9531 {
9529 no_gtk="" 9532 no_gtk=""
9530 if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \ 9533 if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \
9664 SKIP_ATHENA=YES 9667 SKIP_ATHENA=YES
9665 SKIP_NEXTAW=YES 9668 SKIP_NEXTAW=YES
9666 SKIP_MOTIF=YES 9669 SKIP_MOTIF=YES
9667 GUITYPE=GTK 9670 GUITYPE=GTK
9668 9671
9672 else
9673 SKIP_GTK3=$save_skip_gtk3
9669 fi 9674 fi
9670 fi 9675 fi
9671 if test "x$GUITYPE" = "xGTK"; then 9676 if test "x$GUITYPE" = "xGTK"; then
9672 if test -z "$SKIP_GNOME"; then 9677 if test -z "$SKIP_GNOME"; then
9673 { 9678 {
9776 { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk test disabled" >&5 9781 { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk test disabled" >&5
9777 $as_echo "gtk test disabled" >&6; } 9782 $as_echo "gtk test disabled" >&6; }
9778 fi 9783 fi
9779 9784
9780 if test "x$PKG_CONFIG" != "xno"; then 9785 if test "x$PKG_CONFIG" != "xno"; then
9786 save_skip_gtk2=$SKIP_GTK2
9787 SKIP_GTK2=YES
9781 9788
9782 if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then 9789 if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then
9783 { 9790 {
9784 no_gtk="" 9791 no_gtk=""
9785 if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \ 9792 if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \
9922 SKIP_MOTIF=YES 9929 SKIP_MOTIF=YES
9923 GUITYPE=GTK 9930 GUITYPE=GTK
9924 9931
9925 $as_echo "#define USE_GTK3 1" >>confdefs.h 9932 $as_echo "#define USE_GTK3 1" >>confdefs.h
9926 9933
9934 else
9935 SKIP_GTK2=$save_skip_gtk2
9927 fi 9936 fi
9928 fi 9937 fi
9929 fi 9938 fi
9930 9939
9931 if test "x$GUITYPE" = "xGTK"; then 9940 if test "x$GUITYPE" = "xGTK"; then