Merge branch 'nipunn1313/procps-configure_ncurses'

Macs have the wide stuff in the ncurses (not ncursesw) library.

References:
 procps-ng/procps!110
 procps-ng/procps#47
This commit is contained in:
Craig Small 2020-12-22 11:45:47 +11:00
commit 9c4ad4c419

View File

@ -163,8 +163,11 @@ else
if test "$enable_watch8bit" = yes; then if test "$enable_watch8bit" = yes; then
PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"] PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"]
[WATCH_NCURSES_CFLAGS="$NCURSESW_CFLAGS"], [ [WATCH_NCURSES_CFLAGS="$NCURSESW_CFLAGS"], [
AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw], AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw], [
[AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])]) AC_CHECK_LIB([ncurses], [addwstr], [WATCH_NCURSES_LIBS=-lncurses], [
AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])
])
])
]) ])
else else
WATCH_NCURSES_LIBS="$NCURSES_LIBS" WATCH_NCURSES_LIBS="$NCURSES_LIBS"