Correctly choose includes in configure.ac and py_curses.h; use NCURSE…

…S_VERSION to guard ncurses features

Include/py_curses.h

@@ -36,13 +36,21 @@
 #define NCURSES_OPAQUE 0
 #endif
 
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#else
-#include <curses.h>
+#if defined(HAVE_NCURSESW_NCURSES_H)
+#  include <ncursesw/ncurses.h>
+#elif defined(HAVE_NCURSESW_CURSES_H)
+#  include <ncursesw/curses.h>
+#elif defined(HAVE_NCURSES_NCURSES_H)
+#  include <ncurses/ncurses.h>
+#elif defined(HAVE_NCURSES_CURSES_H)
+#  include <ncurses/curses.h>
+#elif defined(HAVE_NCURSES_H)
+#  include <ncurses.h>
+#elif defined(HAVE_CURSES_H)
+#  include <curses.h>
 #endif
 
-#ifdef HAVE_NCURSES_H
+#ifdef NCURSES_VERSION
 /* configure was checking <curses.h>, but we will
    use <ncurses.h>, which has some or all these features. */
 #if !defined(WINDOW_HAS_FLAGS) && \
@@ -69,7 +77,7 @@
 
 typedef struct {
     PyObject_HEAD
     WINDOW *win;
     char *encoding;
 } PyCursesWindowObject;
 

Modules/_cursesmodule.c

@@ -128,7 +128,7 @@
 #include <langinfo.h>
 #endif
 
-#if !defined(HAVE_NCURSES_H) && (defined(sgi) || defined(__sun) || defined(SCO5))
+#if !defined(NCURSES_VERSION) && (defined(sgi) || defined(__sun) || defined(SCO5))
 #define STRICT_SYSV_CURSES       /* Don't use ncurses extensions */
 typedef chtype attr_t;           /* No attr_t type is available */
 #endif
@@ -170,7 +170,7 @@
 static PyObject *PyCursesError;
 
 /* Tells whether setupterm() has been called to initialise terminfo.  */
 static int initialised_setupterm = FALSE;
 
 /* Tells whether initscr() has been called to initialise curses.  */
 static int initialised = FALSE;
@@ -182,13 +182,13 @@
 
 /* Utility Macros */
 #define PyCursesSetupTermCalled                                         \
     if (initialised_setupterm != TRUE) {                                \
         PyErr_SetString(PyCursesError,                                  \
                         "must call (at least) setupterm() first");      \
         return 0; }
 
 #define PyCursesInitialised                             \
     if (initialised != TRUE) {                          \
         PyErr_SetString(PyCursesError,                  \
                         "must call initscr() first");   \
         return 0; }
@@ -210,7 +210,7 @@
 static PyObject *
 PyCursesCheckERR(int code, const char *fname)
 {
     if (code != ERR) {
         Py_RETURN_NONE;
     } else {
         if (fname == NULL) {
@@ -230,7 +230,7 @@
 
    Return 1 on success, 0 on error (invalid type or integer overflow). */
 static int
 PyCurses_ConvertToChtype(PyCursesWindowObject *win, PyObject *obj, chtype *ch)
 {
     long value;
     if (PyBytes_Check(obj)) {
@@ -307,7 +307,7 @@
     - 0 on error: raise an exception */
 static int
 PyCurses_ConvertToCchar_t(PyCursesWindowObject *win, PyObject *obj,
                           chtype *ch
 #ifdef HAVE_NCURSESW
                           , wchar_t *wch
 #endif
@@ -425,7 +425,7 @@
     if (color_number == -1 && PyErr_Occurred())
         return 0;
 
     if (overflow > 0 || color_number >= COLORS) {
         PyErr_Format(PyExc_ValueError,
                      "Color number is greater than COLORS-1 (%d).",
                      COLORS - 1);
@@ -485,7 +485,7 @@
         return 0;
     }
 #else
     if (overflow > 0 || pair_number >= COLOR_PAIRS) {
         PyErr_Format(PyExc_ValueError,
                      "Color pair is greater than COLOR_PAIRS-1 (%d).",
                      COLOR_PAIRS - 1);
@@ -1315,14 +1315,14 @@
 {
     WINDOW *win;
 
     win = derwin(self->win,nlines,ncols,begin_y,begin_x);
 
     if (win == NULL) {
         PyErr_SetString(PyCursesError, catchall_NULL);
         return NULL;
     }
 
     return (PyObject *)PyCursesWindow_New(win, NULL);
 }
 
 /*[clinic input]
@@ -1481,7 +1481,7 @@
 #endif
         return PyUnicode_FromOrdinal(rtn);
     } else {
         const char *knp = keyname(rtn);
         return PyUnicode_FromString((knp == NULL) ? "" : knp);
     }
 }
@@ -2342,14 +2342,14 @@
     }
     else
 #endif
         win = subwin(self->win, nlines, ncols, begin_y, begin_x);
 
     if (win == NULL) {
         PyErr_SetString(PyCursesError, catchall_NULL);
         return NULL;
     }
 
     return (PyObject *)PyCursesWindow_New(win, self->encoding);
 }
 
 /*[clinic input]
@@ -3092,12 +3092,12 @@
     Py_DECREF(data);
 
     fseek(fp, 0, 0);
     win = getwin(fp);
     if (win == NULL) {
         PyErr_SetString(PyCursesError, catchall_NULL);
         goto error;
     }
     res = PyCursesWindow_New(win, NULL);
 
 error:
     fclose(fp);
@@ -3273,7 +3273,7 @@
         return (PyObject *)PyCursesWindow_New(stdscr, NULL);
     }
 
     win = initscr();
 
     if (win == NULL) {
         PyErr_SetString(PyCursesError, catchall_NULL);

configure.ac

@@ -6625,20 +6625,18 @@ dnl configuration.
 AC_DEFUN([_CURSES_INCLUDES],dnl
 [
 #define NCURSES_OPAQUE 0
-#ifdef HAVE_NCURSESW_CURSES_H
-#  include <ncursesw/curses.h>
-#endif
-#ifdef HAVE_NCURSESW_NCURSES_H
+#if defined(HAVE_NCURSESW_NCURSES_H)
 #  include <ncursesw/ncurses.h>
-#endif
-#ifdef HAVE_NCURSES_CURSES_H
-#  include <ncurses/curses.h>
-#endif
-#ifdef HAVE_NCURSES_NCURSES_H
+#elif defined(HAVE_NCURSESW_CURSES_H)
+#  include <ncursesw/curses.h>
+#elif defined(HAVE_NCURSES_NCURSES_H)
 #  include <ncurses/ncurses.h>
-#endif
-#ifdef HAVE_NCURSES_H
+#elif defined(HAVE_NCURSES_CURSES_H)
+#  include <ncurses/curses.h>
+#elif defined(HAVE_NCURSES_H)
 #  include <ncurses.h>
+#elif defined(HAVE_CURSES_H)
+#  include <curses.h>
 #endif
 ])