diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-03 19:15:57 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-03 19:15:57 +0200 |
| commit | 595a40226ea1285689b622042534fd8442402db3 (patch) | |
| tree | 9ad063cf0aaf7f073131116e42d59ab5dfda9089 | |
| parent | d8d85bfb7d650d2fb584ea48aaaebdbc8a2e3dce (diff) | |
patch 8.0.1050: terminal window feature not included by defaultv8.0.1050
Problem: Terminal window feature not included by default.
Solution: Include the terminal feature for the "huge" build.
| -rwxr-xr-x | src/auto/configure | 20 | ||||
| -rw-r--r-- | src/configure.ac | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 33 insertions, 7 deletions
diff --git a/src/auto/configure b/src/auto/configure index df4c962bd5..7e46662023 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -7473,20 +7473,34 @@ $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" +else + enable_terminal="auto" fi -if test "$enable_terminal" = "yes"; 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 { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use terminal emulator with tiny or small features" >&5 $as_echo "cannot use terminal emulator with tiny or small features" >&6; } enable_terminal="no" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + if test "$enable_terminal" = "auto"; then + enable_terminal="yes" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to yes" >&5 +$as_echo "defaulting to yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + if test "$enable_terminal" = "auto"; then + enable_terminal="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to no" >&5 +$as_echo "defaulting to no" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + fi fi if test "$enable_terminal" = "yes"; then $as_echo "#define FEAT_TERMINAL 1" >>confdefs.h diff --git a/src/configure.ac b/src/configure.ac index ea4df8f0ea..918c36c1da 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -2031,16 +2031,26 @@ fi AC_MSG_CHECKING(--enable-terminal argument) AC_ARG_ENABLE(terminal, [ --enable-terminal Enable terminal emulation support.], - [enable_terminal="yes"], ) -if test "$enable_terminal" = "yes"; then + [enable_terminal="yes"], [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]) enable_terminal="no" else - AC_MSG_RESULT(yes) + if test "$enable_terminal" = "auto"; then + enable_terminal="yes" + AC_MSG_RESULT(defaulting to yes) + else + AC_MSG_RESULT(yes) + fi fi else - AC_MSG_RESULT(no) + if test "$enable_terminal" = "auto"; then + enable_terminal="no" + AC_MSG_RESULT(defaulting to no) + else + AC_MSG_RESULT(no) + fi fi if test "$enable_terminal" = "yes"; then AC_DEFINE(FEAT_TERMINAL) diff --git a/src/version.c b/src/version.c index 4a5282fd72..45537fe059 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1050, +/**/ 1049, /**/ 1048, |