# HG changeset patch # User Christian Brabandt # Date 1513431903 -3600 # Node ID 0a738ac6189b69291893af61af0d237550b67f8d # Parent 91c5b705b55c126d00f7875cdf2b0427083e039c patch 8.0.1392: build fails with --with-features=huge --disable-channel commit https://github.com/vim/vim/commit/8b42328cef294a5d6059ee7c452da75b845f6f8c Author: Bram Moolenaar Date: Sat Dec 16 14:37:06 2017 +0100 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) diff --git a/src/auto/configure b/src/auto/configure --- a/src/auto/configure +++ b/src/auto/configure @@ -7514,7 +7514,7 @@ else $as_echo "no" >&6; } fi fi -if test "$enable_terminal" = "yes"; then +if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then $as_echo "#define FEAT_TERMINAL 1" >>confdefs.h 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" diff --git a/src/configure.ac b/src/configure.ac --- a/src/configure.ac +++ b/src/configure.ac @@ -2059,7 +2059,7 @@ else AC_MSG_RESULT(no) fi fi -if test "$enable_terminal" = "yes"; then +if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then AC_DEFINE(FEAT_TERMINAL) 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" AC_SUBST(TERM_SRC) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1392, +/**/ 1391, /**/ 1390,