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 <chr.aasted@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/auto/configure b/src/auto/configure
index d01f38c71439da19ea9f88c5209f42efcd30f4a2..2652a2a504c83cedab5d47caaece8eb8d860ea76 100755 (executable)
--- 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\n" "$as_me:${as_lineno-$LINENO}: result: cannot use wayland with tiny features" >&5
+printf "%s\n" "cannot use wayland with tiny features" >&6; }
+else case e in #(
+  e) with_wayland=yes
+                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; } ;;
+esac
+fi ;;
 esac
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_wayland" >&5
-printf "%s\n" "$with_wayland" >&6; }
 
 if test "$with_wayland" = yes; then
 cflags_save=$CFLAGS

diff --git a/src/configure.ac b/src/configure.ac
index fc9590f75819c163b7941c6c7bfdbd05b155ac08..b6d528b159c6f092dd989b03680c23d0a5ace00c 100644 (file)
--- 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 5984778cca4570b408694f15ded94aec256f7ffa..9058b29bcfa5b3583cdf9035605d25d61a362deb 100644 (file)
--- 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,
 /**/