mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-04 22:51:42 +02:00
Code Releases Activity

24160: build terminfo module if ncursesw is present but curses.h is not.

Browse source
This commit is contained in:
Clint Adams 2007-12-05 15:21:22 +00:00
parent 4592751f32
commit 6dc3cbafb1
3 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-12-05 Clint Adams <clint@zsh.org>
* 24160: Src/Modules/terminfo.c, Src/Modules/terminfo.mdd:
build terminfo module if ncursesw is present but curses.h is not.
2007-12-05 Peter Stephenson <pws@csr.com>
* unposted: Completion/Unix/Command/_ip: typo in "addr replace"

23
Src/Modules/terminfo.c
View file

@ -49,7 +49,28 @@
# undef offsetof
# endif
# include <curses.h>
#ifdef ZSH_IGNORE_NCURSES
# ifdef HAVE_CURSES_H
# include <curses.h>
# endif
#else
# ifdef HAVE_NCURSESW_NCURSES_H
# include <ncursesw/ncurses.h>
# else
# ifdef HAVE_NCURSES_NCURSES_H
# include <ncurses/ncurses.h>
# else
# ifdef HAVE_NCURSES_H
# include <ncurses.h>
# else
# ifdef HAVE_CURSES_H
# include <curses.h>
# endif
# endif
# endif
# endif
#endif
# ifdef HAVE_TERM_H
# include <term.h>
# endif

4
Src/Modules/terminfo.mdd
View file

@ -1,6 +1,8 @@
name=zsh/terminfo
link='if test "x$ac_cv_func_tigetflag" = xyes -a "x$ac_cv_header_curses_h" = xyes; then
link='if test "x$ac_cv_func_tigetflag" = xyes -a "x$ac_cv_header_curses_h" = xyes ||
test x$ac_cv_header_ncurses_h = xyes || test x$ac_cv_header_ncurses_ncurses_h = xyes ||
test x$ac_cv_header_ncursesw_ncurses_h = xyes; then
if test "x$zsh_cv_shared_tigetstr" = xyes; then
echo either
else