[patch] Patch fixing both problems

hunspell-1.7.0-ncurses.patch (text/plain), 1.40 KB, created by Petr Zima on 2019-08-20 13:37:04 UTC

diff -ur hunspell-1.7.0.orig/configure.ac hunspell-1.7.0/configure.ac
--- hunspell-1.7.0.orig/configure.ac	2018-11-12 21:38:56.000000000 +0100
+++ hunspell-1.7.0/configure.ac	2019-08-20 15:17:16.881027813 +0200
@@ -52,11 +52,23 @@
 AS_IF([test "x$with_ui" != xno], [
 	AC_CHECK_LIB([ncursesw],[tparm],[
 		CURSESLIB=-lncursesw
+        AC_CHECK_LIB([tinfow],[tgetent], [
+            CURSESLIB="$CURSESLIB -ltinfow"
+        ])
 	],[AC_CHECK_LIB([curses],[tparm],[
 		CURSESLIB=-lcurses
+        AC_CHECK_LIB([tinfow],[tgetent], [
+            CURSESLIB="$CURSESLIB -ltinfo"
+        ])
 	],[AC_CHECK_LIB([ncurses],[tparm],[
 		CURSESLIB=-lncurses
-	])])])
+        AC_CHECK_LIB([tinfow],[tgetent], [
+            CURSESLIB="$CURSESLIB -ltinfo"
+        ])
+	],
+    [-ltinfo])],
+    [-ltinfo])],
+    [-ltinfow])
    if test "$CURSESLIB" != "" ; then
 	echo Compiling with curses user interface.
 	AC_CHECK_HEADERS([curses.h])
@@ -78,13 +90,15 @@
 )
 READLINELIB=""
 AS_IF([test "x$with_readline" != xno],
-	[AC_CHECK_LIB([tinfo],[tgetent], [
+	[AC_CHECK_LIB([tinfow],[tgetent], [
+		TERMLIB=-ltinfow
+    ],[AC_CHECK_LIB([tinfo],[tgetent], [
 		TERMLIB=-ltinfo
-        ],[AC_CHECK_LIB([curses],[tparm],[
+    ],[AC_CHECK_LIB([curses],[tparm],[
 		TERMLIB=-lncurses
 	],[AC_CHECK_LIB([termcap],[tgetent],[
 		TERMLIB=-ltermcap
-	])])])
+	])])])])
 	LDSAVE=$LDFLAGS
 	LDFLAGS="$LDFLAGS $TERMLIB"
 	AC_CHECK_LIB([readline],[readline],[