diff options
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | mutt_curses.h | 18 |
2 files changed, 11 insertions, 10 deletions
diff --git a/configure.in b/configure.in index 9df0d651..8d9db078 100644 --- a/configure.in +++ b/configure.in @@ -269,7 +269,8 @@ main () if test "$cf_ncurses" = ncursesw; then AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"]) else - AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"]) + AC_CHECK_HEADERS(ncurses/ncurses.h,[cf_cv_ncurses_header="ncurses/ncurses.h"], + [AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"])]) fi], [CF_CURSES_LIBS]) diff --git a/mutt_curses.h b/mutt_curses.h index e0e8b722..a1a2ad22 100644 --- a/mutt_curses.h +++ b/mutt_curses.h @@ -38,16 +38,16 @@ #define M_ENTER_C '\r' #define M_ENTER_S "\r" +#else /* USE_SLANG_CURSES */ + +#if HAVE_NCURSESW_NCURSES_H +# include <ncursesw/ncurses.h> +#elif HAVE_NCURSES_NCURSES_H +# include <ncurses/ncurses.h> +#elif HAVE_NCURSES_H +# include <ncurses.h> #else - -#ifdef HAVE_NCURSESW_NCURSES_H -#include <ncursesw/ncurses.h> -#else -#ifdef HAVE_NCURSES_H -#include <ncurses.h> -#else -#include <curses.h> -#endif +# include <curses.h> #endif #define M_ENTER_C '\n' |