Skip to content

Commit f412241

Browse files
dezzachrisbra
authored andcommitted
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]>
1 parent a2fff3f commit f412241

3 files changed

Lines changed: 18 additions & 5 deletions

File tree

src/auto/configure

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9216,12 +9216,20 @@ if test ${with_wayland+y}
92169216
then :
92179217
withval=$with_wayland; with_wayland=$withval
92189218
else case e in #(
9219-
e) with_wayland=yes ;;
9219+
e) if test "x$features" = xtiny
9220+
then :
9221+
with_wayland=no
9222+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot use wayland with tiny features" >&5
9223+
printf "%s\n" "cannot use wayland with tiny features" >&6; }
9224+
else case e in #(
9225+
e) with_wayland=yes
9226+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9227+
printf "%s\n" "yes" >&6; } ;;
9228+
esac
9229+
fi ;;
92209230
esac
92219231
fi
92229232

9223-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_wayland" >&5
9224-
printf "%s\n" "$with_wayland" >&6; }
92259233

92269234
if test "$with_wayland" = yes; then
92279235
cflags_save=$CFLAGS

src/configure.ac

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2408,8 +2408,11 @@ AC_MSG_CHECKING(--with-wayland argument)
24082408
AC_ARG_WITH(wayland,
24092409
[ --with-wayland Include support for the Wayland protocol.],
24102410
[with_wayland=$withval],
2411-
[with_wayland=yes])
2412-
AC_MSG_RESULT([$with_wayland])
2411+
AS_IF([test "x$features" = xtiny],
2412+
[with_wayland=no
2413+
AC_MSG_RESULT([cannot use wayland with tiny features])],
2414+
[with_wayland=yes
2415+
AC_MSG_RESULT([yes])]))
24132416

24142417
if test "$with_wayland" = yes; then
24152418
cflags_save=$CFLAGS

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -719,6 +719,8 @@ static char *(features[]) =
719719

720720
static int included_patches[] =
721721
{ /* Add new patch number below this line */
722+
/**/
723+
1565,
722724
/**/
723725
1564,
724726
/**/

0 commit comments

Comments
 (0)