Tweak ncurses autoconflation to check for ncurses/ncurses.h everywhere, not

just in /usr. With --with-curses=/usr/local, should Close: #2095.

diff --git a/configure.in b/configure.in
index 9df0d6511764605a6f125c1ac0897d0c308c996f..8d9db0780602c3e5cef41e6e45fef008422a19ef 100644 (file)
--- 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 e0e8b7226b245970e5f9d522b933177e230d7685..a1a2ad22fd392ee80ae1fbd85bd8b9d7b8a06f46 100644 (file)
--- 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'