]> git.pld-linux.org Git - packages/wine.git/blob - wine-ncurses.patch
- fixed detection of ncurses
[packages/wine.git] / wine-ncurses.patch
1 --- wine-0.9.13/configure.ac.old        2006-05-19 12:01:20.424979808 +0200
2 +++ wine-0.9.13/configure.ac    2006-05-19 12:01:49.894499760 +0200
3 @@ -201,6 +201,7 @@
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 \
11 @@ -528,7 +529,7 @@
12  CURSESLIBS=""
13  if test "x$with_curses" != "xno"
14  then
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"
17      then
18          AC_CHECK_LIB(ncurses,waddch,
19              [AC_DEFINE(HAVE_LIBNCURSES, 1, [Define if you have the ncurses library (-lncurses)])
20 --- wine-0.9.13/programs/wineconsole/curses.c.old       2006-05-19 12:01:34.492841168 +0200
21 +++ wine-0.9.13/programs/wineconsole/curses.c   2006-05-19 12:04:32.524776200 +0200
22 @@ -37,6 +37,8 @@
23  #include <stdlib.h>
24  #ifdef HAVE_NCURSES_H
25  # include <ncurses.h>
26 +#elif defined(HAVE_NCURSES_NCURSES_H)
27 +# include <ncurses/ncurses.h>
28  #elif defined(HAVE_CURSES_H)
29  # include <curses.h>
30  #endif
31 @@ -57,9 +59,9 @@
32  
33  #define PRIVATE(data)   ((struct inner_data_curse*)((data)->private))
34  
35 -#if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H)
36 +#if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H)
37  
38 -#ifdef HAVE_NCURSES_H
39 +#if defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H)
40  # define CURSES_NAME "ncurses"
41  #else
42  # define CURSES_NAME "curses"
43 @@ -115,7 +117,7 @@
44  
45  static BOOL WCCURSES_bind_libcurses(void)
46  {
47 -#ifdef HAVE_NCURSES_H
48 +#if defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H)
49      static const char *ncname = SONAME_LIBNCURSES;
50  #else
51      static const char *ncname = SONAME_LIBCURSES;
This page took 0.080681 seconds and 3 git commands to generate.