patch 9.1.1565: configure: does not consider tiny version for wayland
Commit:
https://github.com/vim/vim/commit/f412241fcdf93107353d75c99adcc4c0bc900656
Author: Christoffer Aasted <[email protected]>
Date: Fri Jul 18 20:37:41 2025 +0200
patch 9.1.1565: configure: does not consider tiny version for wayland
Problem: configure: does not consider tiny version for wayland
Solution: Do not try to enable wayland for a tiny vim version
(Christoffer Aasted).
closes: #17783
Signed-off-by: Christoffer Aasted <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/auto/configure b/src/auto/configure
index d01f38c71..2652a2a50 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -9216,12 +9216,20 @@ if test ${with_wayland+y}
then :
withval=$with_wayland; with_wayland=$withval
else case e in #(
- e) with_wayland=yes ;;
+ e) if test "x$features" = xtiny
+then :
+ with_wayland=no
+ { printf "%s
" "$as_me:${as_lineno-$LINENO}: result: cannot use wayland with tiny features"
>&5
+printf "%s
" "cannot use wayland with tiny features" >&6; }
+else case e in #(
+ e) with_wayland=yes
+ { printf "%s
" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s
" "yes" >&6; } ;;
+esac
+fi ;;
esac
fi
-{ printf "%s
" "$as_me:${as_lineno-$LINENO}: result: $with_wayland" >&5
-printf "%s
" "$with_wayland" >&6; }
if test "$with_wayland" = yes; then
cflags_save=$CFLAGS
diff --git a/src/configure.ac b/src/configure.ac
index fc9590f75..b6d528b15 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2408,8 +2408,11 @@ AC_MSG_CHECKING(--with-wayland argument)
AC_ARG_WITH(wayland,
[ --with-wayland Include support for the Wayland protocol.],
[with_wayland=$withval],
- [with_wayland=yes])
-AC_MSG_RESULT([$with_wayland])
+ AS_IF([test "x$features" = xtiny],
+ [with_wayland=no
+ AC_MSG_RESULT([cannot use wayland with tiny
features])],
+ [with_wayland=yes
+ AC_MSG_RESULT([yes])]))
if test "$with_wayland" = yes; then
cflags_save=$CFLAGS
diff --git a/src/version.c b/src/version.c
index 5984778cc..9058b29bc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1565,
/**/
1564,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1ucq4v-00DgSj-Te%40256bit.org.
