diff options
| author | Erlend E. Aasland <erlend@python.org> | 2024-07-01 08:10:03 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-01 08:10:03 (GMT) |
| commit | f80376b129ad947263a6b03a6c3a874e9f8706e6 (patch) | |
| tree | 3544f2d954f5a817aae4f6514cf449af2c7e63db /Modules/_cursesmodule.c | |
| parent | bd473aa598c5161521a7018896dc124728214a6c (diff) | |
| download | cpython-f80376b129ad947263a6b03a6c3a874e9f8706e6.zip cpython-f80376b129ad947263a6b03a6c3a874e9f8706e6.tar.gz cpython-f80376b129ad947263a6b03a6c3a874e9f8706e6.tar.bz2 | |
gh-113565: Improve and harden detection of curses dependencies (#119816)
1. Use pkg-config to check for ncursesw/panelw. If that fails, use
pkg-config to check for ncurses/panel.
2. Regardless of pkg-config output, search for curses/panel headers, so
we're sure we have all defines in pyconfig.h.
3. Regardless of pkg-config output, check if libncurses or libncursesw
contains the 'initscr' symbol; if it does _and_ pkg-config failed
earlier, add the resulting -llib linker option to CURSES_LIBS.
Ditto for 'update_panels' and PANEL_LIBS.
4. Wrap the rest of the checks with WITH_SAVE_ENV and make sure we're
using updated LIBS and CPPFLAGS for those.
Add the PY_CHECK_CURSES convenience macro.
Diffstat (limited to 'Modules/_cursesmodule.c')
| -rw-r--r-- | Modules/_cursesmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index 3a01196..b5854e8 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -128,7 +128,7 @@ static const char PyCursesVersion[] = "2.2"; #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 |