From: Thomas Roessler <roessler@does-not-exist.org>
Date: Thu, 31 May 2001 15:35:09 +0000 (+0000)
Subject: Utf-8 support with ncurses, by Sven Verdoolaege.  Thomas E. Dickey
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c24aa630c01b348aa6d76dd5bbc419d8667816b;p=neomutt

Utf-8 support with ncurses, by Sven Verdoolaege.  Thomas E. Dickey
says it looks reasonable, so I include it.
---

diff --git a/configure.in b/configure.in
index d3e0e54af..816a4a042 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 46b278e5c..08af2163e 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"