]> granicus.if.org Git - nethack/commitdiff
follow-up on linux.370 ncursesw
authornhmall <nhmall@nethack.org>
Thu, 2 Jun 2022 19:10:15 +0000 (15:10 -0400)
committernhmall <nhmall@nethack.org>
Thu, 2 Jun 2022 19:10:15 +0000 (15:10 -0400)
sys/unix/hints/linux.370

index 16b4099bf59d8abc8c1b72283af241e68352942f..5e077007f28499a80cb4f6e83a31fc45a00a7464 100755 (executable)
@@ -140,7 +140,12 @@ ifndef MAKEFILE_UTL
 # If CURSES_UNICODE is defined, we need ncursesw.
 # Without CURSES_UNICODE the following simpler setting works.
 # CURSESLIB = -lncurses -ltinfo
-CURSESLIB = $(shell pkg-config ncursesw --libs || echo -lncursesw)
+HAVE_NCURSESW = $(shell expr `pkg-config ncursesw --libs >/dev/null; echo $$?` = 0)
+ifeq "$(HAVE_NCURSESW)" "1"
+CURSESLIB = -lncursesw
+else
+CURSESLIB = -lncurses
+endif      #HAVE_NCURSESW
 CURSESLIB += -ltinfo
 endif      #not MAKEFILE_UTL
 endif      #not MAKEFILE_DAT