fixup: require wide-char support even on PDCurses and document new requirementsHEADmaster-fmsbw-cimaster

Also, Scinterm had to be updated again since NetBSD curses stores up to 8 wchar_t per cell.

1 files changed, 11 insertions, 8 deletions

diff --git a/configure.ac b/configure.ac
index a469a98..ebe7b8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -289,7 +289,8 @@ case $INTERFACE in
 	case $INTERFACE in
 	ncurses)
 		# This gives precendence to the widechar version of ncurses,
-		# which is necessary for Unicode support even when not using widechar APIs.
+		# which is necessary for Unicode support and when using more than
+		# 256 color pairs.
 		# However we also accept libncurses.so if it also contains the
 		# enhanced definitions.
 		# NOTE: This also defines CURSES_CFLAGS and CURSES_LIBS arguments,
@@ -376,16 +377,18 @@ case $INTERFACE in
 			LIBS="$LIBS $CURSES_LIBS"
 		fi
 
+		AC_CHECK_FUNC([add_wch], [], [
+			AC_MSG_ERROR([libpdcurses does not include wide-character support!])
+		])
+
 		# It is crucial to define PDC_WIDE before including curses.h.
 		# FIXME: MinGW has a pdcurses.h that already defines all necessary macros,
 		# but it's not in upstream PDCurses/PDCursesMod.
-		AC_CHECK_FUNC([add_wch], [
-			AC_DEFINE(PDC_WIDE, 1, [PDCurses built with wide-character support])
-			# FIXME: It would be better to check for PDC_FORCE_UTF8.
-			# Theoretically, we could check for endwin_u[32|64]_4302,
-			# but I'm not sure this will work reliably in the future.
-			AC_DEFINE(PDC_FORCE_UTF8, 1, [PDCursesMod forces use of UTF8])
-		])
+		AC_DEFINE(PDC_WIDE, 1, [PDCurses built with wide-character support])
+		# FIXME: It would be better to check for PDC_FORCE_UTF8.
+		# Theoretically, we could check for endwin_u[32|64]_4302,
+		# but I'm not sure this will work reliably in the future.
+		AC_DEFINE(PDC_FORCE_UTF8, 1, [PDCursesMod forces use of UTF8])
 
 		AC_CHECK_FUNC([has_mouse], [
 			AC_DEFINE(PDC_NCMOUSE, 1, [PDCurses built with ncurses mouse API])