Mercurial > vim
changeset 12714:baf88919c791 v8.0.1235
patch 8.0.1235: cannot disable the terminal feature in a huge build
commit https://github.com/vim/vim/commit/ef83956e1e67736b4c6b886d897b74f022622a74
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Oct 28 20:28:23 2017 +0200
patch 8.0.1235: cannot disable the terminal feature in a huge build
Problem: Cannot disable the terminal feature in a huge build. (lindhobe)
Solution: Adjust the autoconf check. (Kazunobu Kuriyama, closes https://github.com/vim/vim/issues/2242)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 28 Oct 2017 20:30:05 +0200 |
parents | a730e6fb8e5c |
children | 279ec0abb4ac |
files | src/Makefile src/auto/configure src/configure.ac src/version.c |
diffstat | 4 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -340,7 +340,7 @@ CClink = $(CC) # When both GTK+ 2 and GTK+ 3 are possible then GTK+ 2 will be selected. # To use GTK+ 3 instead use --enable-gui=gtk3 (see below). #CONF_OPT_GUI = --disable-gtk2-check -#CONF_OPT_GUI = --enable-gnome2-check +#CONF_OPT_GUI = --enable-gnome-check #CONF_OPT_GUI = --disable-gtk3-check #CONF_OPT_GUI = --disable-motif-check #CONF_OPT_GUI = --disable-athena-check @@ -483,9 +483,12 @@ CClink = $(CC) #CONF_OPT_CHANNEL = --disable-channel # TERMINAL - Terminal emulator support, :terminal command. Requires the -# channel feature. -# Uncomment this when you want terminal emulator support. +# channel feature. The default is enable for when using "huge" features. +# Uncomment the first line when you want terminal emulator support for +# not-huge builds. Uncomment the second line when you don't want terminal +# emulator support in the huge build. #CONF_OPT_TERMINAL = --enable-terminal +#CONF_OPT_TERMINAL = --disable-terminal # MULTIBYTE - To edit multi-byte characters. # Uncomment this when you want to edit a multibyte language.
--- a/src/auto/configure +++ b/src/auto/configure @@ -7475,7 +7475,7 @@ fi $as_echo_n "checking --enable-terminal argument... " >&6; } # Check whether --enable-terminal was given. if test "${enable_terminal+set}" = set; then : - enableval=$enable_terminal; enable_terminal="yes" + enableval=$enable_terminal; else enable_terminal="auto" fi
--- a/src/configure.ac +++ b/src/configure.ac @@ -2035,7 +2035,7 @@ fi AC_MSG_CHECKING(--enable-terminal argument) AC_ARG_ENABLE(terminal, [ --enable-terminal Enable terminal emulation support.], - [enable_terminal="yes"], [enable_terminal="auto"]) + , [enable_terminal="auto"]) if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a "x$features" = "xhuge" ; then if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then AC_MSG_RESULT([cannot use terminal emulator with tiny or small features])