The difference between curses.h and ncurses shouldn't matter to gpsd.

3 files changed, 1 insertions, 16 deletions

diff --git a/cgps.c b/cgps.c
index 57e92f33..98e65a14 100644
--- a/cgps.c
+++ b/cgps.c
@@ -83,17 +83,12 @@
 #include <string.h>
 #include <math.h>
 #include <errno.h>
+#include <curses.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
 
 #include "gpsd_config.h"
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#else
-#include <curses.h>
-#endif /* HAVE_NCURSES_H */
-
 #include "gps.h"
 #include "gpsdclient.h"
 #include "revision.h"
diff --git a/configure.ac b/configure.ac
index 5f13a370..d8c6d54e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -269,11 +269,6 @@ size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size);
 
 dnl Check for curses headers and libraries.  The presence of the
 dnl library is used to decide whether or not to build some programs.
-dnl Those programs use ncurses.h if found, and otherwise use curses.h.
-dnl TODO: give an example of what system uses curses.h with
-dnl libncurses.  We define our own variables to reduce the risk of
-dnl breaking if autoconf changes (private) variable names.
-AC_CHECK_HEADERS(ncurses.h)
 AC_CHECK_LIB(ncurses, initscr, NCURSES_LIBS="-lncurses")
 AC_SUBST(NCURSES_LIBS)
 if test x"$NCURSES_LIBS" = x"" ; then
diff --git a/gpsmon.h b/gpsmon.h
index a7485088..a45fc111 100644
--- a/gpsmon.h
+++ b/gpsmon.h
@@ -8,12 +8,7 @@
 #ifndef _GPSD_GPSMON_H_
 #define _GPSD_GPSMON_H_
 
-#include "gpsd_config.h"
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#else
 #include <curses.h>
-#endif /* HAVE_NCURSES_H */
 
 #define COMMAND_TERMINATE	-1
 #define COMMAND_MATCH		1