projects/aports·blob master · refs

139 lines · 4.5 KiB

1--- a/configure.ac
2+++ b/configure.ac
3@@ -67,24 +67,24 @@
4 AC_FUNC_STRTOD
5 AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify dcgettext getcwd getwd mempcpy memset munmap nl_langinfo setlocale stpcpy strcasecmp strchr strcspn strdup strstr strtoul])
6
7-# check for libncursesw
8+# check for libncurses
9 case $host_os in
10 *bsd* | darwin*)
11 AC_DEFINE([OS_BSD], [1], [OS BSD's curses includes ncursesw])
12 # check for courses.h
13 AC_CHECK_HEADER(curses.h, [], [AC_MSG_ERROR(
14 [curses.h header is missing: See INSTALL file for further information])])
15- # check for libncursesw
16+ # check for libncurses
17 AC_CHECK_LIB(ncursesw, add_wch, [], [AC_MSG_ERROR(
18 [ncursesw library is missing: See INSTALL file for further information])])
19 ;;
20 *)
21- AC_CHECK_HEADER(ncursesw/ncurses.h, HAVE_NCURSESW_H=1)
22- AC_CHECK_LIB(ncursesw, add_wch, HAVE_LIBNCURSESW=1)
23+ AC_CHECK_HEADER(ncurses.h, HAVE_NCURSESW_H=1)
24+ AC_CHECK_LIB(ncurses, add_wch, HAVE_LIBNCURSESW=1)
25 if test -n "$HAVE_NCURSESW_H" -a -n "$HAVE_LIBNCURSESW"; then
26- LIBS="-lncursesw $LIBS"
27+ LIBS="-lncurses $LIBS"
28 else
29- echo -e "Error: both library and header files for the ncursesw library\n"\
30+ echo -e "Error: both library and header files for the ncurses library\n"\
31 "are required to build this package. See INSTALL file for"\
32 "further information. On Debian/Ubuntu you need to install libncursesw5-dev."
33 exit 1;
34@@ -93,7 +93,7 @@
35 esac
36
37 AC_SEARCH_LIBS(cbreak, tinfo, [],
38- [AC_MSG_ERROR([Can't find cbreak() in -lncursesw or -ltinfo])])
39+ [AC_MSG_ERROR([Can't find cbreak() in -lncurses or -ltinfo])])
40
41
42 # iconv
43diff -wbBur gtypist-2.9.4/src/cursmenu.c gtypist-2.9.4.my/src/cursmenu.c
44--- gtypist-2.9.4/src/cursmenu.c 2013-08-18 18:36:14.000000000 +0400
45+++ gtypist-2.9.4.my/src/cursmenu.c 2014-02-03 13:09:04.669316878 +0400
46@@ -24,7 +24,7 @@
47 #ifdef HAVE_PDCURSES
48 #include <curses.h>
49 #else
50-#include <ncursesw/ncurses.h>
51+#include <ncurses.h>
52 #endif
53
54 #include "error.h"
55diff -wbBur gtypist-2.9.4/src/error.c gtypist-2.9.4.my/src/error.c
56--- gtypist-2.9.4/src/error.c 2013-08-18 18:36:14.000000000 +0400
57+++ gtypist-2.9.4.my/src/error.c 2014-02-03 13:09:04.669316878 +0400
58@@ -25,7 +25,7 @@
59 #ifdef HAVE_PDCURSES
60 #include <curses.h>
61 #else
62-#include <ncursesw/ncurses.h>
63+#include <ncurses.h>
64 #endif
65
66 #include <stdlib.h>
67diff -wbBur gtypist-2.9.4/src/gtypist.c gtypist-2.9.4.my/src/gtypist.c
68--- gtypist-2.9.4/src/gtypist.c 2013-08-18 18:36:14.000000000 +0400
69+++ gtypist-2.9.4.my/src/gtypist.c 2014-02-03 13:09:04.669316878 +0400
70@@ -31,7 +31,7 @@
71 #ifdef HAVE_PDCURSES
72 #include <curses.h>
73 #else
74-#include <ncursesw/ncurses.h>
75+#include <ncurses.h>
76 #endif
77
78 #include <time.h>
79diff -wbBur gtypist-2.9.4/src/script.c gtypist-2.9.4.my/src/script.c
80--- gtypist-2.9.4/src/script.c 2013-08-18 18:36:14.000000000 +0400
81+++ gtypist-2.9.4.my/src/script.c 2014-02-03 13:09:04.669316878 +0400
82@@ -24,7 +24,7 @@
83 #ifdef HAVE_PDCURSES
84 #include <curses.h>
85 #else
86-#include <ncursesw/ncurses.h>
87+#include <ncurses.h>
88 #endif
89
90 #include "error.h"
91diff -wbBur gtypist-2.9.4/src/utf8.c gtypist-2.9.4.my/src/utf8.c
92--- gtypist-2.9.4/src/utf8.c 2013-08-18 18:36:14.000000000 +0400
93+++ gtypist-2.9.4.my/src/utf8.c 2014-02-03 13:09:04.669316878 +0400
94@@ -23,7 +23,7 @@
95 #ifdef HAVE_PDCURSES
96 #include <curses.h>
97 #else
98-#include <ncursesw/ncurses.h>
99+#include <ncurses.h>
100 #endif
101
102 #include <stdlib.h>
103diff -wbBur gtypist-2.9.4/src/infoview.c gtypist-2.9.4.my/src/infoview.c
104--- gtypist-2.9.4/src/infoview.c 2013-08-18 18:36:14.000000000 +0400
105+++ gtypist-2.9.4.my/src/infoview.c 2014-02-03 13:09:04.669316878 +0400
106@@ -23,7 +23,7 @@
107 #ifdef HAVE_PDCURSES
108 #include <curses.h>
109 #else
110-#include <ncursesw/ncurses.h>
111+#include <ncurses.h>
112 #endif
113
114 #include "infoview.h"
115diff -wbBur gtypist-2.9.4/src/speedbox.c gtypist-2.9.4.my/src/speedbox.c
116--- gtypist-2.9.4/src/speedbox.c 2013-08-18 18:36:14.000000000 +0400
117+++ gtypist-2.9.4.my/src/speedbox.c 2014-02-03 13:09:04.669316878 +0400
118@@ -23,7 +23,7 @@
119 #ifdef HAVE_PDCURSES
120 #include <curses.h>
121 #else
122-#include <ncursesw/ncurses.h>
123+#include <ncurses.h>
124 #endif
125
126 #include "speedbox.h"
127diff -wbBur gtypist-2.9.4/src/banner.c gtypist-2.9.4.my/src/banner.c
128--- gtypist-2.9.4/src/banner.c 2013-08-18 18:36:14.000000000 +0400
129+++ gtypist-2.9.4.my/src/banner.c 2014-02-03 13:09:04.669316878 +0400
130@@ -23,7 +23,7 @@
131 #ifdef HAVE_PDCURSES
132 #include <curses.h>
133 #else
134-#include <ncursesw/ncurses.h>
135+#include <ncurses.h>
136 #endif
137
138 #include "banner.h"
139