projects / packages / cone.git / blame
| Commit | Line | Data |
|---|---|---|
| b848eaf8 JB |
1 | --- cone-0.96.2/curses/configure.ac.orig 2017-03-09 15:52:04.000000000 +0100 |
| 2 | +++ cone-0.96.2/curses/configure.ac 2018-03-22 18:47:51.458660590 +0100 | |
| 3 | @@ -44,12 +44,18 @@ | |
| 4 | AC_MSG_ERROR([curses library not found.]) | |
| 5 | fi | |
| 6 | ||
| 7 | +for f in tinfow tinfo | |
| 8 | +do | |
| 9 | + AC_CHECK_LIB($f, keypad, [CURSESLIBRARY="$CURSESLIBRARY -l$f"; break]) | |
| 10 | +done | |
| 11 | + | |
| 12 | CURSESLIB="-l$CURSESLIBRARY" | |
| 13 | AC_SUBST(CURSESLIB) | |
| 14 | ||
| 15 | dnl Checks for header files. | |
| 16 | AC_CHECK_HEADERS(sys/time.h unistd.h sys/wait.h glob.h) | |
| 17 | AC_CHECK_HEADERS(ncursesw/curses.h) | |
| 18 | +AC_CHECK_HEADERS(ncurses/curses.h) | |
| 19 | ||
| 20 | AC_HEADER_TIME | |
| 21 | AC_HEADER_DIRENT | |
| 22 | @@ -61,7 +67,13 @@ | |
| 23 | AC_MSG_CHECKING(for use_default_colors()) | |
| 24 | ||
| 25 | AC_TRY_LINK([ | |
| 26 | +#if HAVE_NCURSESW_CURSES_H | |
| 27 | +#include <ncursesw/curses.h> | |
| 28 | +#elif HAVE_NCURSES_CURSES_H | |
| 29 | +#include <ncursesw/curses.h> | |
| 30 | +#else | |
| 31 | #include <curses.h> | |
| 32 | +#endif | |
| 33 | ],[ | |
| 34 | use_default_colors(); | |
| 35 | ], [AC_MSG_RESULT(yes) | |
| 36 | @@ -72,6 +84,8 @@ | |
| 37 | AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ | |
| 38 | #if HAVE_NCURSESW_CURSES_H | |
| 39 | #include <ncursesw/curses.h> | |
| 40 | +#elif HAVE_NCURSES_CURSES_H | |
| 41 | +#include <ncursesw/curses.h> | |
| 42 | #else | |
| 43 | #include <curses.h> | |
| 44 | #endif | |
| 45 | --- cone-0.96.2/curses/cursesscreen.H.orig 2017-03-06 02:28:33.000000000 +0100 | |
| 46 | +++ cone-0.96.2/curses/cursesscreen.H 2018-03-22 18:48:36.601993408 +0100 | |
| 47 | @@ -13,6 +13,8 @@ | |
| 48 | ||
| 49 | #if HAVE_NCURSESW_CURSES_H | |
| 50 | #include <ncursesw/curses.h> | |
| 51 | +#if HAVE_NCURSES_CURSES_H | |
| 52 | +#include <ncurses/curses.h> | |
| 53 | #else | |
| 54 | #include <curses.h> | |
| 55 | #endif |