projects / packages / wine.git / blame
| Commit | Line | Data |
|---|---|---|
| 83204ca1 KK |
1 | --- wine-0.9.28/configure.ac.orig 2006-12-22 17:17:47.000000000 +0100 |
| 2 | +++ wine-0.9.28/configure.ac 2006-12-24 03:10:15.504363300 +0100 | |
| 3 | @@ -194,6 +194,7 @@ | |
| 55cd00fd | 4 | machine/soundcard.h \ |
| 5 | mntent.h \ | |
| 6 | ncurses.h \ | |
| 7 | + ncurses/ncurses.h \ | |
| 8 | netdb.h \ | |
| 9 | netinet/in.h \ | |
| 10 | netinet/in_systm.h \ | |
| 83204ca1 KK |
11 | @@ -519,7 +520,7 @@ |
| 12 | ||
| 13 | dnl **** Check which curses lib to use *** | |
| 55cd00fd | 14 | CURSESLIBS="" |
| 83204ca1 KK |
15 | -if test "$ac_cv_header_ncurses_h" = "yes" |
| 16 | +if test "$ac_cv_header_ncurses_h" = "yes" || test "$ac_cv_header_ncurses_ncurses_h" = "yes" | |
| 55cd00fd | 17 | then |
| 83204ca1 KK |
18 | AC_CHECK_LIB(ncurses,waddch,[CURSESLIBS="-lncurses"]) |
| 19 | elif test "$ac_cv_header_curses_h" = "yes" | |
| 25386ae9 | 20 | --- wine-0.9.41/programs/wineconsole/curses.c.old 2007-07-14 22:00:49.124363079 +0200 |
| 21 | +++ wine-0.9.41/programs/wineconsole/curses.c 2007-07-14 22:07:46.714791368 +0200 | |
| 22 | @@ -39,6 +39,8 @@ | |
| 23 | # include <ncurses.h> | |
| 55cd00fd | 24 | #elif defined(HAVE_CURSES_H) |
| 25 | # include <curses.h> | |
| 25386ae9 | 26 | +#elif defined(HAVE_NCURSES_NCURSES_H) |
| 27 | +# include <ncurses/ncurses.h> | |
| 55cd00fd | 28 | #endif |
| 25386ae9 | 29 | /* avoid redefinition warnings */ |
| 30 | #undef KEY_EVENT | |
| 31 | @@ -62,7 +64,7 @@ | |
| 55cd00fd | 32 | |
| 0d46bf62 | 33 | #if defined(SONAME_LIBCURSES) || defined(SONAME_LIBNCURSES) |
| 55cd00fd | 34 | |
| 35 | -#ifdef HAVE_NCURSES_H | |
| 25386ae9 | 36 | +#if defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H) |
| 55cd00fd | 37 | # define CURSES_NAME "ncurses" |
| 38 | #else | |
| 39 | # define CURSES_NAME "curses" | |
| beafc810 MM |
40 | --- wine-1.3.13/dlls/kernel32/term.c~ 2011-02-04 20:06:51.000000000 +0100 |
| 41 | +++ wine-1.3.13/dlls/kernel32/term.c 2011-02-05 16:25:43.627060372 +0100 | |
| 42 | @@ -27,6 +27,8 @@ | |
| 43 | # include <ncurses.h> | |
| 44 | #elif defined(HAVE_CURSES_H) | |
| 45 | # include <curses.h> | |
| 46 | +#elif defined(HAVE_NCURSES_NCURSES_H) | |
| 47 | +# include <ncurses/ncurses.h> | |
| 48 | #endif | |
| 49 | /* avoid redefinition warnings */ | |
| 50 | #undef KEY_EVENT | |
| 51 | @@ -34,6 +36,8 @@ | |
| 52 | ||
| 53 | #if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H) | |
| 54 | #include <term.h> | |
| 55 | +#elif defined(HAVE_NCURSES_NCURSES_H) | |
| 56 | +#include <ncurses/term.h> | |
| 57 | #endif | |
| 58 | ||
| 59 | #include <windef.h> | |
| 60 | @@ -148,7 +152,7 @@ | |
| 61 | ||
| 62 | #if defined(SONAME_LIBCURSES) || defined(SONAME_LIBNCURSES) | |
| 63 | ||
| 64 | -#ifdef HAVE_NCURSES_H | |
| 65 | +#ifdef HAVE_NCURSES_H || defined(HAVE_NCURSES_NCURSES_H) | |
| 66 | # define CURSES_NAME "ncurses" | |
| 67 | #else | |
| 68 | # define CURSES_NAME "curses" | |
| 7acebd3b AM |
69 | diff -urN wine-1.4.1.org/configure.ac wine-1.4.1/configure.ac |
| 70 | --- wine-1.4.1.org/configure.ac 2012-06-15 21:17:00.000000000 +0200 | |
| 71 | +++ wine-1.4.1/configure.ac 2013-06-13 17:34:25.210134842 +0200 | |
| 72 | @@ -1281,6 +1281,9 @@ | |
| 73 | if test "$ac_cv_header_ncurses_h" = "yes" | |
| 74 | then | |
| 75 | WINE_CHECK_SONAME(ncurses,waddch,[CURSESLIBS="-lncurses"]) | |
| 76 | + if test "x$ac_cv_lib_soname_ncurses" = "x"; then | |
| 77 | + WINE_CHECK_SONAME(ncursesw,waddch,[CURSESLIBS="-lncursesw"]) | |
| 78 | + fi | |
| 79 | elif test "$ac_cv_header_curses_h" = "yes" | |
| 80 | then | |
| 81 | WINE_CHECK_SONAME(curses,waddch,[CURSESLIBS="-lcurses"]) | |
| 82 | @@ -1289,8 +1292,8 @@ | |
| 83 | LIBS="$LIBS $CURSESLIBS" | |
| 84 | AC_CHECK_FUNCS(mousemask) | |
| 85 | LIBS="$ac_save_LIBS" | |
| 86 | -WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"], | |
| 87 | - [lib(n)curses ${notice_platform}development files not found, curses won't be supported.]) | |
| 88 | +WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses$ac_cv_lib_soname_ncursesw" = "x"], | |
| 89 | + [lib(n)curses(w) ${notice_platform}development files not found, curses won't be supported.]) | |
| 90 | ||
| 91 | dnl **** Check for SANE **** | |
| 92 | if test "x$with_sane" != "xno" |