diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-04-28 15:45:46 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-04-28 15:45:46 +0200 |
| commit | 696cbd224b4f78b99b8fc34538867303a8a922fc (patch) | |
| tree | 5be9b86fef5861a318caca95a7f85774b5965316 | |
| parent | b7637c44c26b057d1f3721d932bbab06d9f74393 (diff) | |
| download | vim-git-696cbd224b4f78b99b8fc34538867303a8a922fc.tar.gz | |
patch 8.0.0587: configure check for return value of tgetent skippedv8.0.0587
Problem: Configure check for return value of tgetent is skipped.
Solution: Always perform the check. (Marvin Schmidt, closes #1664)
| -rwxr-xr-x | src/auto/configure | 16 | ||||
| -rw-r--r-- | src/configure.ac | 28 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 22 insertions, 24 deletions
diff --git a/src/auto/configure b/src/auto/configure index e9c2c3428..6dd5bb9ba 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -11506,16 +11506,15 @@ if test "x$vim_cv_terminfo" = "xyes" ; then fi -if test "x$olibs" != "x$LIBS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking what tgetent() returns for an unknown terminal" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what tgetent() returns for an unknown terminal" >&5 $as_echo_n "checking what tgetent() returns for an unknown terminal... " >&6; } if ${vim_cv_tgent+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes; then : - as_fn_error $? "failed to compile test program." "$LINENO" 5 + as_fn_error $? "failed to compile test program." "$LINENO" 5 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11535,11 +11534,11 @@ main() _ACEOF if ac_fn_c_try_run "$LINENO"; then : - vim_cv_tgent=zero + vim_cv_tgent=zero else - vim_cv_tgent=non-zero + vim_cv_tgent=non-zero fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -11551,10 +11550,9 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_tgent" >&5 $as_echo "$vim_cv_tgent" >&6; } - if test "x$vim_cv_tgent" = "xzero" ; then - $as_echo "#define TGETENT_ZERO_ERR 0" >>confdefs.h +if test "x$vim_cv_tgent" = "xzero" ; then + $as_echo "#define TGETENT_ZERO_ERR 0" >>confdefs.h - fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether termcap.h contains ospeed" >&5 diff --git a/src/configure.ac b/src/configure.ac index cdf39b3a9..d42455048 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -3355,10 +3355,9 @@ if test "x$vim_cv_terminfo" = "xyes" ; then AC_DEFINE(TERMINFO) fi -if test "x$olibs" != "x$LIBS"; then - AC_CACHE_CHECK([what tgetent() returns for an unknown terminal], [vim_cv_tgent], - [ - AC_RUN_IFELSE([AC_LANG_SOURCE([[ +AC_CACHE_CHECK([what tgetent() returns for an unknown terminal], [vim_cv_tgent], + [ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include "confdefs.h" #ifdef HAVE_TERMCAP_H # include <termcap.h> @@ -3369,18 +3368,17 @@ if test "x$olibs" != "x$LIBS"; then #endif main() {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); } - ]])],[ - vim_cv_tgent=zero - ],[ - vim_cv_tgent=non-zero - ],[ - AC_MSG_ERROR(failed to compile test program.) - ]) + ]])],[ + vim_cv_tgent=zero + ],[ + vim_cv_tgent=non-zero + ],[ + AC_MSG_ERROR(failed to compile test program.) ]) - - if test "x$vim_cv_tgent" = "xzero" ; then - AC_DEFINE(TGETENT_ZERO_ERR, 0) - fi + ]) + +if test "x$vim_cv_tgent" = "xzero" ; then + AC_DEFINE(TGETENT_ZERO_ERR, 0) fi AC_MSG_CHECKING(whether termcap.h contains ospeed) diff --git a/src/version.c b/src/version.c index 3e683e80f..7aae749c2 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 587, +/**/ 586, /**/ 585, |