Permalink
Browse files

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)
  • Loading branch information...
brammool committed Dec 16, 2017
1 parent b29d328 commit 8b42328cef294a5d6059ee7c452da75b845f6f8c
Showing with 4 additions and 2 deletions.
  1. +1 −1 src/auto/configure
  2. +1 −1 src/configure.ac
  3. +2 −0 src/version.c
View
@@ -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"
View
@@ -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)
View
@@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1392,
/**/
1391,
/**/

0 comments on commit 8b42328

Please sign in to comment.