diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-10-28 20:28:23 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-10-28 20:28:23 +0200 |
| commit | ef83956e1e67736b4c6b886d897b74f022622a74 (patch) | |
| tree | 7f3a9843323ccadb416d2ee3a8fda8170517f6b8 | |
| parent | a6ce1ccf5c10baa5c2a25897c46961d751a21dda (diff) | |
patch 8.0.1235: cannot disable the terminal feature in a huge buildv8.0.1235
Problem: Cannot disable the terminal feature in a huge build. (lindhobe)
Solution: Adjust the autoconf check. (Kazunobu Kuriyama, closes #2242)
| -rw-r--r-- | src/Makefile | 9 | ||||
| -rwxr-xr-x | src/auto/configure | 2 | ||||
| -rw-r--r-- | src/configure.ac | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index 75e528e12d..bda65abe48 100644 --- 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. diff --git a/src/auto/configure b/src/auto/configure index 4ee62b3717..fa9276a136 100755 --- 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 diff --git a/src/configure.ac b/src/configure.ac index f4650962bb..2185c9e889 100644 --- 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]) diff --git a/src/version.c b/src/version.c index 24557e3876..60ea4f37c7 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1235, +/**/ 1234, /**/ 1233, |