From: Brendan Cully <brendan@kublai.com>
Date: Sun, 9 Oct 2005 20:21:33 +0000 (+0000)
Subject: Tweak ncurses autoconflation to check for ncurses/ncurses.h everywhere, not
X-Git-Tag: mutt-1-5-12-rel~295
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82e4d2637814f94898023b8994c4aacff13a7a08;p=mutt

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 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'