diff options
author | Bram Moolenaar <Bram@vim.org> | 2017-12-16 14:37:06 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2017-12-16 14:37:06 +0100 |
commit | 8b42328cef294a5d6059ee7c452da75b845f6f8c (patch) | |
tree | 5e4cdccbfcc5d366bad4b821efc5d13c6aa59bf5 | |
parent | b29d328eb403a243431f4d0d5b360b4ac46bbc3e (diff) | |
download | vim-git-8b42328cef294a5d6059ee7c452da75b845f6f8c.tar.gz |
patch 8.0.1392: build fails with --with-features=huge --disable-channelv8.0.1392
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)
-rwxr-xr-x | src/auto/configure | 2 | ||||
-rw-r--r-- | src/configure.ac | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index 208032ad6..fd73e92d0 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -7514,7 +7514,7 @@ $as_echo "defaulting to no" >&6; } $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 index d08986ed9..0883cb7d8 100644 --- 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 index af507e4b7..ab1f81627 100644 --- 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, |