patch 8.0.0587: configure check for return value of tgetent skipped

Problem:    Configure check for return value of tgetent is skipped.
Solution:   Always perform the check. (Marvin Schmidt, closes #1664)

diff --git a/src/auto/configure b/src/auto/configure
index e9c2c34284bfc860db05d387ef0fce6f3046aa09..6dd5bb9ba573ee8c1c93854f46c2f6afa218f9a7 100755 (executable)
--- 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 cdf39b3a96eea0f13c5d36a7a00a96297ca6abe5..d4245504831247a021254029343b2059b6ab559a 100644 (file)
--- 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 3e683e80fffed6b54852416d3fbed162b0e6e921..7aae749c284b77c07ab1e26ae2361710538ba133 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    587,
 /**/
     586,
 /**/