]>
Commit | Line | Data |
---|---|---|
c9efd171 JK |
1 | diff -durN gpsd-2.37.orig/cgps.c gpsd-2.37/cgps.c |
2 | --- gpsd-2.37.orig/cgps.c 2007-12-13 06:35:30.000000000 +0100 | |
57c4cd10 JK |
3 | +++ gpsd-2.37/cgps.c 2008-07-22 09:56:57.000000000 +0200 |
4 | @@ -96,11 +96,7 @@ | |
5 | #include <signal.h> | |
81be6522 | 6 | |
c9efd171 | 7 | #include "gpsd_config.h" |
57c4cd10 | 8 | -#ifdef HAVE_NCURSES_H |
c9efd171 | 9 | -#include <ncurses.h> |
57c4cd10 JK |
10 | -#else |
11 | -#include <curses.h> | |
12 | -#endif /* HAVE_NCURSES_H */ | |
c9efd171 | 13 | +#include <ncurses/ncurses.h> |
57c4cd10 JK |
14 | |
15 | #include "gps.h" | |
16 | ||
c9efd171 JK |
17 | diff -durN gpsd-2.37.orig/configure.ac gpsd-2.37/configure.ac |
18 | --- gpsd-2.37.orig/configure.ac 2008-02-17 03:26:37.000000000 +0100 | |
57c4cd10 | 19 | +++ gpsd-2.37/configure.ac 2008-07-22 09:56:17.000000000 +0200 |
c9efd171 JK |
20 | @@ -88,7 +88,7 @@ |
21 | #include netinet/ip.h | |
22 | #endif | |
23 | ]]) | |
24 | -AC_CHECK_HEADERS(termios.h strings.h ncurses.h getopt.h netdb.h) | |
25 | +AC_CHECK_HEADERS(termios.h strings.h ncurses/ncurses.h getopt.h netdb.h) | |
81be6522 | 26 | |
c9efd171 JK |
27 | AC_CHECK_FUNCS(round, roundf) |
28 | AC_CHECK_FUNCS(strlcpy) | |
29 | @@ -237,7 +237,7 @@ | |
30 | fi | |
31 | dnl End of X11 checks | |
32 | ||
33 | -AC_CHECK_HEADER(ncurses.h, ac_ncurses='yes', ac_ncurses='no') | |
34 | +AC_CHECK_HEADER(ncurses/ncurses.h, ac_ncurses='yes', ac_ncurses='no') | |
35 | AM_CONDITIONAL([HAVE_NCURSES], [test x"$ac_ncurses" = "xyes"]) | |
36 | AC_CHECK_LIB(ncurses, initscr, ac_ncurses_lib='yes', ac_ncurses_lib='no') | |
37 | if test x"$ac_ncurses_lib" = "xyes" -a x"$ac_ncurses" = "xno" ; then | |
38 | diff -durN gpsd-2.37.orig/sirfmon.c gpsd-2.37/sirfmon.c | |
39 | --- gpsd-2.37.orig/sirfmon.c 2007-06-26 20:54:32.000000000 +0200 | |
57c4cd10 JK |
40 | +++ gpsd-2.37/sirfmon.c 2008-07-22 09:57:32.000000000 +0200 |
41 | @@ -42,11 +42,8 @@ | |
42 | #include <stdbool.h> | |
c9efd171 JK |
43 | |
44 | #include "gpsd_config.h" | |
57c4cd10 | 45 | -#ifdef HAVE_NCURSES_H |
c9efd171 | 46 | -#include <ncurses.h> |
57c4cd10 JK |
47 | -#else |
48 | -#include <curses.h> | |
49 | -#endif /* HAVE_NCURSES_H */ | |
c9efd171 | 50 | +#include <ncurses/ncurses.h> |
57c4cd10 JK |
51 | + |
52 | #include "gps.h" /* for DEFAULT_GPSD_PORT; brings in PI as well */ | |
53 | ||
54 | #define PUT_ORIGIN -4 |