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. --- .github/workflows/nightly.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.github/workflows/nightly.yml') diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f84a532..3081414 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -206,7 +206,7 @@ jobs: - name: Configure Build env: - PDCURSES_CFLAGS: -I/mingw64/include/pdcurses/ + CURSES_CFLAGS: -I/mingw64/include/pdcurses/ # FIXME: glib on MinGW supports static linking but the gspawn # helper binaries are still linked dynamically, forcing us to ship # all DLLs anyway. Therefore it makes little sense to link SciTECO @@ -225,11 +225,11 @@ jobs: (cd build-wingui ../configure --with-interface=pdcurses-gui --enable-html-docs --program-prefix=g \ --with-scitecodatadir=. \ - PDCURSES_LIBS="-lpdcurses_wingui -lgdi32 -lcomdlg32 -lwinmm") + CURSES_LIBS="-lpdcurses_wingui -lgdi32 -lcomdlg32 -lwinmm") (cd build-wincon ../configure --with-interface=pdcurses --enable-html-docs \ --with-scitecodatadir=. \ - PDCURSES_LIBS="-lpdcurses_wincon -lgdi32 -lwinmm") + CURSES_LIBS="-lpdcurses_wincon -lgdi32 -lwinmm") - name: make run: | -- cgit v1.2.3