Skip to content

Commit 45ad495

Browse files
committed
Comment fixes, move have_curses logic.
1 parent 2a4dd46 commit 45ad495

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

Tools/configure/conf_extlibs.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ def detect_uuid(v):
440440
v.export("LIBUUID_CFLAGS", LIBUUID_CFLAGS)
441441
v.export("LIBUUID_LIBS", LIBUUID_LIBS)
442442

443-
# configure_5.ac checks "$HAVE_UUID_GENERATE_TIME_SAFE" = "1" which is a shell var
443+
# configure.ac checks "$HAVE_UUID_GENERATE_TIME_SAFE" = "1" which is a shell var
444444
# that is never assigned (AC_DEFINE only writes to confdefs.h, not shell vars),
445445
# so this block never executes in the old configure. Match that behaviour.
446446
if False and have_uuid is True and ac_cv_have_uuid_generate_time_safe:
@@ -901,6 +901,8 @@ def check_compression_libraries(v):
901901

902902
def _check_curses(v, lib, panel_lib):
903903
"""Detect a curses library pair via pkg-config, with link-test fallback."""
904+
v.have_curses = False
905+
v.have_panel = False
904906
lib_upper = lib.upper()
905907
panel_upper = panel_lib.upper()
906908
pkg = pyconf.pkg_check_modules("CURSES", lib)
@@ -1030,7 +1032,7 @@ def check_curses(v):
10301032
)
10311033

10321034
# _CURSES_INCLUDES: conditionally include the right curses header
1033-
# (mirrors the _CURSES_INCLUDES M4 macro in configure_8.ac lines 47-63)
1035+
# (mirrors the _CURSES_INCLUDES M4 macro in configure.ac)
10341036
CURSES_INCLUDES = """\
10351037
#define NCURSES_OPAQUE 0
10361038
#if defined(HAVE_NCURSESW_NCURSES_H)

Tools/configure/conf_syslibs.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -370,13 +370,6 @@ def check_stat_timestamps(v):
370370
"Define if you have struct stat.st_mtimensec",
371371
)
372372

373-
# ---------------------------------------------------------------------------
374-
# Initialize curses/panel state -- detection happens in configure_8.py
375-
# (configure_7.ac lines 1429-1430)
376-
# ---------------------------------------------------------------------------
377-
v.have_curses = False
378-
v.have_panel = False
379-
380373

381374
WITH_TZPATH = pyconf.arg_with(
382375
"tzpath",

Tools/configure/pyconf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ def init_args() -> None:
265265
# configure.ac's ac_precious_vars list (PKG_CONFIG before CC, no CXX/CXXFLAGS
266266
# since configure.ac does not call AC_ARG_VAR for those). User-level
267267
# precious variables (MACHDEP, PROFILE_TASK, GDBM_CFLAGS, …) are registered
268-
# via env_var() calls in the configure_*.py files instead.
268+
# via env_var() calls in the conf_*.py files instead.
269269
for pvar in [
270270
"PKG_CONFIG",
271271
"PKG_CONFIG_PATH",

0 commit comments

Comments
 (0)