From 9ec7d0f1e6ee4f7f45b4950d483006ab53786901 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Sun, 17 Aug 2025 22:12:37 +0300 Subject: curses: fixed configuration for native netbsd-curses and ncurses (several corner cases) * pkg-config check for `ncurses` fails if it failed previously for `ncursesw`. This is the case e.g. for ncurses from NetBSD's pkgsrc. * No longer assume that any libncurses is not enhanced (X/Open compatible). * SciTECO and Scinterm require to find a curses.h in the include paths. The ncurses check must therefore not be limited to the first best ncurses/ncurses.h and the like. * We now always check for X/Open compatibility and always require a curses.h in the standard directories or as given by pkg-config. * AX_WITH_CURSES was radically rewritten and is now called AX_WITH_NCURSES. * --with-interface=netbsd-curses gets its own detection code. It always requires a curses.h in the standard paths and a libcurses. It should now be fixed for real NetBSD installations if the ncurses port is installed as well. * Unified all of the curses-arguments to CURSES_CFLAGS and CURSES_LIBS. There is no reason we need PDCURSES_CFLAGS, XCURSES_CFLAGS etc. --- contrib/scintilla.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/scintilla.am b/contrib/scintilla.am index 46159c1..d24e5bb 100644 --- a/contrib/scintilla.am +++ b/contrib/scintilla.am @@ -26,7 +26,7 @@ MAKE_SCINTILLA = $(MAKE) -C @top_builddir@/contrib/scintilla/bin \ srcdir=@SCINTERM_PATH@ basedir=@SCINTILLA_PATH@ \ scintilla=$(LIBSCINTILLA) \ CXXFLAGS='@SCINTILLA_CXXFLAGS@' \ - CURSES_FLAGS='@PDCURSES_CFLAGS@ @XCURSES_CFLAGS@ @CURSES_CFLAGS@' + CURSES_FLAGS='@CURSES_CFLAGS@' endif # Pass toolchain configuration to Scintilla. -- cgit v1.2.3