Skip to content

Commit 8b42328

Browse files
committed
patch 8.0.1392: build fails with --with-features=huge --disable-channel
Problem: Build fails with --with-features=huge --disable-channel. Solution: Don't enable the terminal feature when the channel feature is missing. (Dominique Pelle, closes #2453)
1 parent b29d328 commit 8b42328

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/auto/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7514,7 +7514,7 @@ $as_echo "defaulting to no" >&6; }
75147514
$as_echo "no" >&6; }
75157515
fi
75167516
fi
7517-
if test "$enable_terminal" = "yes"; then
7517+
if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then
75187518
$as_echo "#define FEAT_TERMINAL 1" >>confdefs.h
75197519

75207520
TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/screen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c"

src/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2059,7 +2059,7 @@ else
20592059
AC_MSG_RESULT(no)
20602060
fi
20612061
fi
2062-
if test "$enable_terminal" = "yes"; then
2062+
if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then
20632063
AC_DEFINE(FEAT_TERMINAL)
20642064
TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/screen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c"
20652065
AC_SUBST(TERM_SRC)

src/version.c

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

772772
static int included_patches[] =
773773
{ /* Add new patch number below this line */
774+
/**/
775+
1392,
774776
/**/
775777
1391,
776778
/**/

0 commit comments

Comments
 (0)