From: nhmall <nhmall@nethack.org>
Date: Thu, 2 Jun 2022 20:31:30 +0000 (-0400)
Subject: yet another follow-up for linux.370 ncursesw
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=168ee4c9a8bf0523d7c96be2b44490822408b2ed;p=nethack

yet another follow-up for linux.370 ncursesw
---

diff --git a/sys/unix/hints/linux.370 b/sys/unix/hints/linux.370
index 53f4b1c22..5bcd68afe 100755
--- a/sys/unix/hints/linux.370
+++ b/sys/unix/hints/linux.370
@@ -102,15 +102,16 @@ ifeq "$(USE_CURSESLIB)" "1"
 # Without CURSES_UNICODE the following simpler setting works.
 # CURSESLIB = -lncurses -ltinfo
 ifdef MAKEFILE_SRC
-HAVE_NCURSESW = $(shell expr `pkg-config ncursesw --libs >/dev/null; echo $$?` = 0)
-endif
-ifeq "$(HAVE_NCURSESW)" "1"
-CURSESLIB = -lncursesw
+comma:=,
+NCURSES_LFLAGS = $(shell pkg-config ncursesw --libs)
+CURSESLIB += $(subst -Wl$(comma)-Bsymbolic-functions,,$(NCURSES_LFLAGS))
+ifneq (,$(findstring ncursesw, $(CURSESLIB)))
+HAVE_NCURSESW=1
 else
-CURSESLIB = -lncurses
-endif      #HAVE_NCURSESW
-CURSESLIB += -ltinfo
+HAVE_NCURSESW=0
+endif
 WINLIB += $(CURSESLIB)
+endif      #MAKEFILE_SRC
 endif      #USE_CURSESLIB
 
 # NetHack sources control