From 9cc58faeac2119ffe8e61bb41e83c6893be05df6 Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Fri, 26 Sep 2025 16:23:06 +0000 Subject: [PATCH] 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 --- src/auto/configure | 7 ++++++- src/configure.ac | 7 ++++++- src/version.c | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/auto/configure b/src/auto/configure index c99feb0507..d3aa017fc1 100755 --- 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 +#elif defined(HAVE_TERMCAP_H) # include +#else + /* forward declare tgoto */ + extern char *tgoto(const char *, int, int); #endif #ifdef HAVE_STRING_H # include diff --git a/src/configure.ac b/src/configure.ac index 6a641c2f2b..aacb45d115 100644 --- 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 +#elif defined(HAVE_TERMCAP_H) # include +#else + /* forward declare tgoto */ + extern char *tgoto(const char *, int, int); #endif #ifdef HAVE_STRING_H # include diff --git a/src/version.c b/src/version.c index b83c5cee5b..c41a20e046 100644 --- 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, /**/