diff options
| author | Thomas Roessler <roessler@does-not-exist.org> | 2001-05-31 15:35:09 +0000 |
|---|---|---|
| committer | Thomas Roessler <roessler@does-not-exist.org> | 2001-05-31 15:35:09 +0000 |
| commit | 810f460b2a7822b8007055d64aed02ae5072b8aa (patch) | |
| tree | 626e76219deae8478380c49b790743b679581301 | |
| parent | e26c1c7e8f3ecb631b0ff4b677ad119c94b236d6 (diff) | |
Utf-8 support with ncurses, by Sven Verdoolaege. Thomas E. Dickey
says it looks reasonable, so I include it.
| -rw-r--r-- | configure.in | 16 | ||||
| -rw-r--r-- | mutt_curses.h | 4 |
2 files changed, 16 insertions, 4 deletions
diff --git a/configure.in b/configure.in index d3e0e54a..816a4a04 100644 --- a/configure.in +++ b/configure.in @@ -176,13 +176,21 @@ main () CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include" fi]) - AC_CHECK_LIB(ncurses, initscr, - - [MUTTLIBS="$MUTTLIBS -lncurses" + for cf_ncurses in ncurses ncursesw unknown + do + AC_CHECK_LIB($cf_ncurses,waddnwstr,[break]) + done + if test "$cf_ncurses" = unknow; then cf_curses=ncurses; fi + AC_CHECK_LIB($cf_ncurses, initscr, + [MUTTLIBS="$MUTTLIBS -l$cf_ncurses" if test x$mutt_cv_curses = x/usr -a -d /usr/include/ncurses; then CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" fi - AC_CHECK_HEADERS(ncurses.h)], + if test "$cf_ncurses" = ncursesw; then + AC_CHECK_HEADERS(ncursesw/ncurses.h) + else + AC_CHECK_HEADERS(ncurses.h) + fi], [CF_CURSES_LIBS]) diff --git a/mutt_curses.h b/mutt_curses.h index 46b278e5..08af2163 100644 --- a/mutt_curses.h +++ b/mutt_curses.h @@ -36,11 +36,15 @@ #else +#ifdef HAVE_NCURSESW_NCURSES_H +#include <ncursesw/ncurses.h> +#else #ifdef HAVE_NCURSES_H #include <ncurses.h> #else #include <curses.h> #endif +#endif #define M_ENTER_C '\n' #define M_ENTER_S "\n" |