thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1235: cannot disable the terminal feature in a huge build

Browse Source 
Problem:    Cannot disable the terminal feature in a huge build. (lindhobe)
Solution:   Adjust the autoconf check. (Kazunobu Kuriyama, closes #2242)
This commit is contained in:
Bram Moolenaar
2017-10-28 20:28:23 +02:00
parent a6ce1ccf5c
commit ef83956e1e
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Makefile
View File

@@ -340,7 +340,7 @@ CClink = $(CC)
# When both GTK+ 2 and GTK+ 3 are possible then GTK+ 2 will be selected. # 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). # To use GTK+ 3 instead use --enable-gui=gtk3 (see below).
#CONF_OPT_GUI = --disable-gtk2-check #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-gtk3-check
#CONF_OPT_GUI = --disable-motif-check #CONF_OPT_GUI = --disable-motif-check
#CONF_OPT_GUI = --disable-athena-check #CONF_OPT_GUI = --disable-athena-check
@@ -483,9 +483,12 @@ CClink = $(CC)
#CONF_OPT_CHANNEL = --disable-channel #CONF_OPT_CHANNEL = --disable-channel
# TERMINAL - Terminal emulator support, :terminal command. Requires the # TERMINAL - Terminal emulator support, :terminal command. Requires the
# channel feature. # channel feature. The default is enable for when using "huge" features.
# Uncomment this when you want terminal emulator support. # 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 = --enable-terminal
#CONF_OPT_TERMINAL = --disable-terminal
# MULTIBYTE - To edit multi-byte characters. # MULTIBYTE - To edit multi-byte characters.
# Uncomment this when you want to edit a multibyte language. # Uncomment this when you want to edit a multibyte language.

2
src/auto/configure vendored
View File

@@ -7475,7 +7475,7 @@ fi
$as_echo_n "checking --enable-terminal argument... " >&6; } $as_echo_n "checking --enable-terminal argument... " >&6; }
# Check whether --enable-terminal was given. # Check whether --enable-terminal was given.
if test "${enable_terminal+set}" = set; then : if test "${enable_terminal+set}" = set; then :
enableval=$enable_terminal; enable_terminal="yes" enableval=$enable_terminal;
else else
enable_terminal="auto" enable_terminal="auto"
fi fi

2
src/configure.ac
View File

@@ -2035,7 +2035,7 @@ fi
AC_MSG_CHECKING(--enable-terminal argument) AC_MSG_CHECKING(--enable-terminal argument)
AC_ARG_ENABLE(terminal, AC_ARG_ENABLE(terminal,
[ --enable-terminal Enable terminal emulation support.], [ --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 "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a "x$features" = "xhuge" ; then
if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
AC_MSG_RESULT([cannot use terminal emulator with tiny or small features]) AC_MSG_RESULT([cannot use terminal emulator with tiny or small features])

2
src/version.c
View File

@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1235,
/**/ /**/
1234, 1234,
/**/ /**/