To: vim_dev@googlegroups.com Subject: Patch 8.0.1392 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.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) Files: src/configure.ac, src/auto/configure *** ../vim-8.0.1391/src/configure.ac 2017-12-07 22:29:07.620581060 +0100 --- src/configure.ac 2017-12-16 14:31:06.103649580 +0100 *************** *** 2059,2065 **** AC_MSG_RESULT(no) fi fi ! if test "$enable_terminal" = "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) --- 2059,2065 ---- AC_MSG_RESULT(no) fi fi ! 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) *** ../vim-8.0.1391/src/auto/configure 2017-12-07 22:29:07.624581042 +0100 --- src/auto/configure 2017-12-16 14:32:32.515073153 +0100 *************** *** 7514,7520 **** $as_echo "no" >&6; } fi fi ! if test "$enable_terminal" = "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" --- 7514,7520 ---- $as_echo "no" >&6; } fi fi ! 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" *** ../vim-8.0.1391/src/version.c 2017-12-15 21:24:56.241651799 +0100 --- src/version.c 2017-12-16 14:32:23.583132677 +0100 *************** *** 773,774 **** --- 773,776 ---- { /* Add new patch number below this line */ + /**/ + 1392, /**/ -- hundred-and-one symptoms of being an internet addict: 104. When people ask about the Presidential Election you ask "Which country?" /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///