luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

check for ncursesw 

use ncursesw in teminal.c
This commit is contained in:
Holger Vogt 2025-02-04 21:56:18 +01:00
parent a246820fce
commit cfab408b2d
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -1276,8 +1276,8 @@ else
[AC_MSG_ERROR([Couldn't find GNU readline headers.])])
AC_CHECK_HEADER([curses.h],
[AC_DEFINE([HAVE_CURSES_H], [], [Define if we have curses header in include])],
[AC_CHECK_HEADER([ncurses/curses.h],
[AC_DEFINE([HAVE_NCURSES_CURSES_H], [], [Define if we have curses.h in include/ncurses])],
[AC_CHECK_HEADER([ncursesw/curses.h],
[AC_DEFINE([HAVE_NCURSES_CURSES_H], [], [Define if we have curses.h in include/ncursesw])],
[AC_MSG_ERROR([Couldn't find curses.h.])])])
AC_SEARCH_LIBS([tputs], [ncursesw tinfo termcap],
[AC_DEFINE([HAVE_TERMCAP], [], [Define if we have ncurses/terminfo or termcap])],
@ -1286,18 +1286,8 @@ else
[LIBS="$LIBS -lreadline"],
[AC_MSG_ERROR([Couldn't find readline libraries.])])
AC_CHECK_LIB([ncursesw], [tputs],
[LIBS="$LIBS -lncurses"],
[LIBS="$LIBS -lncursesw"],
[AC_MSG_ERROR([Couldn't find ncurses libraries.])])
# PKG_CHECK_MODULES([NCURSES], [ncursesw], [
# AC_SUBST([CURSES_CFLAGS], ["$NCURSES_CFLAGS"])
# AC_SUBST([CURSES_LIBS], ["$NCURSES_LIBS"])
# AC_DEFINE([HAVE_CURSES_H], [1], [Define if curses.h is available])
# CPPFLAGS="$CPPFLAGS $NCURSES_CFLAGS"
# ])
# Now check for curses.h using the updated CPPFLAGS
AC_CHECK_HEADERS([curses.h], [], [
AC_MSG_WARN([curses.h not found.])
])
fi
else
# Especially defined for macOS (Big Sur), with readline installed from Brew

6
src/frontend/terminal.c
View File

@ -26,8 +26,8 @@ Author: 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
#include <curses.h>
#include <term.h>
#elif defined(HAVE_NCURSES_CURSES_H)
#include <ncurses/curses.h>
#include <ncurses/term.h>
#include <ncursesw/curses.h>
#include <ncursesw/term.h>
#endif
#endif
@ -35,7 +35,7 @@ Author: 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
#ifdef HAVE_TERMCAP_H
#include <termcap.h>
#elif HAVE_NCURSES_TERMCAP_H
#include <ncurses/termcap.h>
#include <ncursesw/termcap.h>
#endif
#include "ngspice/cpdefs.h"