Mercurial > vim
changeset 13033:0a738ac6189b v8.0.1392
patch 8.0.1392: build fails with --with-features=huge --disable-channel
commit https://github.com/vim/vim/commit/8b42328cef294a5d6059ee7c452da75b845f6f8c
Author: Bram Moolenaar <Bram@vim.org>
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)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 16 Dec 2017 14:45:03 +0100 |
parents | 91c5b705b55c |
children | 7608b10442d9 |
files | src/auto/configure src/configure.ac src/version.c |
diffstat | 3 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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"
--- 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)