patch 9.1.1794: configure: terminfo test does not work with musl

Problem:  configure: terminfo test does not work with musl
          (T3rm1, after v9.9.1.0837)
Solution: include term.h in configure script, add forward declarations,
          in case headers are not found

fixes: #18393
closes: #18405

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/auto/configure b/src/auto/configure
index c99feb0507d3f717843aa8a4dd0d3546e8b1d855..d3aa017fc174a3944ad940bb3aa94280ac3011fe 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -13547,8 +13547,13 @@ else case e in #(
 /* end confdefs.h.  */
 
 #include "confdefs.h"
-#ifdef HAVE_TERMCAP_H
+#ifdef HAVE_TERM_H
+# include <term.h>
+#elif defined(HAVE_TERMCAP_H)
 # include <termcap.h>
+#else
+  /* forward declare tgoto */
+  extern char *tgoto(const char *, int, int);
 #endif
 #ifdef HAVE_STRING_H
 # include <string.h>

diff --git a/src/configure.ac b/src/configure.ac
index 6a641c2f2b83d3e6aea843a2c590962ed25901d7..aacb45d1153c6f024612c58325fa37c5f9cf2dc5 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3651,8 +3651,13 @@ AC_CACHE_CHECK([whether we talk terminfo], [vim_cv_terminfo],
   [
     AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include "confdefs.h"
-#ifdef HAVE_TERMCAP_H
+#ifdef HAVE_TERM_H
+# include <term.h>
+#elif defined(HAVE_TERMCAP_H)
 # include <termcap.h>
+#else
+  /* forward declare tgoto */
+  extern char *tgoto(const char *, int, int);
 #endif
 #ifdef HAVE_STRING_H
 # include <string.h>

diff --git a/src/version.c b/src/version.c
index b83c5cee5b7299dc639b1f2751ae08bb1e29c932..c41a20e046925f2aa5dab3f11b8971a31d8f5a94 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1794,
 /**/
     1793,
 /**/