patches by Rostislav Beneš: mc-40-ncurses

Extende support of ncurses
This commit is contained in:
Slava Zanko 2008-12-29 01:59:52 +02:00
parent b7b74c2f03
commit 8d94909d0f
2 changed files with 10 additions and 1 deletions

View File

@ -483,13 +483,20 @@ dnl
AC_DEFUN([MC_WITH_NCURSES], [ AC_DEFUN([MC_WITH_NCURSES], [
dnl has_colors() is specific to ncurses, it's not in the old curses dnl has_colors() is specific to ncurses, it's not in the old curses
save_LIBS="$LIBS" save_LIBS="$LIBS"
ncursesw_found=
LIBS=
AC_SEARCH_LIBS([addwstr], [ncursesw ncurses curses], [MCLIBS="$MCLIBS $LIBS";ncursesw_found=yes],
[AC_MSG_WARN([Cannot find ncurses library, that support wide characters])])
if test -z "$ncursesw_found"; then
LIBS= LIBS=
AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"], AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"],
[AC_MSG_ERROR([Cannot find ncurses library])]) [AC_MSG_ERROR([Cannot find ncurses library])])
fi
dnl Check the header dnl Check the header
ncurses_h_found= ncurses_h_found=
AC_CHECK_HEADERS([ncurses/curses.h ncurses.h curses.h], AC_CHECK_HEADERS([ncursesw/curses.h ncurses/curses.h ncurses.h curses.h],
[ncurses_h_found=yes; break]) [ncurses_h_found=yes; break])
if test -z "$ncurses_h_found"; then if test -z "$ncurses_h_found"; then

View File

@ -15,6 +15,8 @@
#ifdef USE_NCURSES #ifdef USE_NCURSES
# ifdef HAVE_NCURSES_CURSES_H # ifdef HAVE_NCURSES_CURSES_H
# include <ncurses/curses.h> # include <ncurses/curses.h>
# elif HAVE_NCURSESW_CURSES_H
# include <ncursesw/curses.h>
# elif HAVE_NCURSES_H # elif HAVE_NCURSES_H
# include <ncurses.h> # include <ncurses.h>
# else # else