erts: Fix termcap support on solaris

fix #8025
erlang · Jan 31, 2024 · 168eca3 · 168eca3
1 parent b4bd697
commit 168eca3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/erts/configure.ac b/erts/configure.ac
@@ -1250,6 +1250,7 @@ AS_IF([test "x$with_termcap" != "xno" && test "X$host" != "Xwin32"],
   ])
 
 AC_SUBST(TERMCAP_LIB)
+AC_CHECK_HEADERS([termcap.h curses.h term.h])
 
 if test "x$TERMCAP_LIB" != "x"; then
 

diff --git a/erts/emulator/nifs/common/prim_tty_nif.c b/erts/emulator/nifs/common/prim_tty_nif.c
@@ -41,9 +41,17 @@
 #include <stdio.h>
 #include <signal.h>
 #include <locale.h>
-#ifdef HAVE_TERMCAP
+#if defined(HAVE_TERMCAP) && (defined(HAVE_TERMCAP_H) || (defined(HAVE_CURSES_H) && defined(HAVE_TERM_H)))
 #include <termios.h>
+#ifdef HAVE_TERMCAP_H
 #include <termcap.h>
+#else /* !HAVE_TERMCAP_H */
+#include <curses.h>
+#include <term.h>
+#endif
+#else
+/* We detected TERMCAP support, but could not find the correct headers to include */
+#undef HAVE_TERMCAP
 #endif
 #ifndef __WIN32__
 #include <unistd.h>