1*4882a593SmuzhiyunFrom 98ed72177c49a8015a443b3ec272fee3fb5a4eb3 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Paul Barker <pbarker@toganlabs.com> 3*4882a593SmuzhiyunDate: Sun, 5 Nov 2017 22:07:30 +0000 4*4882a593SmuzhiyunSubject: [PATCH] htop: Update to v2.0.2 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunWe need to use pkg-config to find the ncurses library instead of the 7*4882a593Smuzhiyunncurses*-config applications. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Paul Barker <pbarker@toganlabs.com> 10*4882a593SmuzhiyunSigned-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunUpstream-status: Inappropriate 13*4882a593Smuzhiyun (`ncurses*-config` can be used outside of OpenEmbedded) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyun--- 16*4882a593Smuzhiyun configure.ac | 12 ++++++------ 17*4882a593Smuzhiyun 1 file changed, 6 insertions(+), 6 deletions(-) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 20*4882a593Smuzhiyunindex 0e69096..d20014f 100644 21*4882a593Smuzhiyun--- a/configure.ac 22*4882a593Smuzhiyun+++ b/configure.ac 23*4882a593Smuzhiyun@@ -322,10 +322,10 @@ AC_ARG_ENABLE([unicode], 24*4882a593Smuzhiyun [], 25*4882a593Smuzhiyun [enable_unicode=yes]) 26*4882a593Smuzhiyun if test "x$enable_unicode" = xyes; then 27*4882a593Smuzhiyun- HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", 28*4882a593Smuzhiyun- HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", 29*4882a593Smuzhiyun- HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "ncursesw5-config", 30*4882a593Smuzhiyun- HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [HAVE_LIBNCURSESW], "ncurses5-config", 31*4882a593Smuzhiyun+ HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", 32*4882a593Smuzhiyun+ HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", 33*4882a593Smuzhiyun+ HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", 34*4882a593Smuzhiyun+ HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [HAVE_LIBNCURSESW], "pkg-config ncurses5", 35*4882a593Smuzhiyun HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], 36*4882a593Smuzhiyun HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], 37*4882a593Smuzhiyun HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], 38*4882a593Smuzhiyun@@ -342,8 +342,8 @@ if test "x$enable_unicode" = xyes; then 39*4882a593Smuzhiyun # (at this point we already link against a working ncurses library with wide character support) 40*4882a593Smuzhiyun AC_SEARCH_LIBS([keypad], [tinfow tinfo]) 41*4882a593Smuzhiyun else 42*4882a593Smuzhiyun- HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses6-config], 43*4882a593Smuzhiyun- HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses5-config], 44*4882a593Smuzhiyun+ HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [pkg-config ncurses6], 45*4882a593Smuzhiyun+ HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [pkg-config ncurses5], 46*4882a593Smuzhiyun HTOP_CHECK_LIB([ncurses6], [doupdate], [HAVE_LIBNCURSES], 47*4882a593Smuzhiyun HTOP_CHECK_LIB([ncurses], [doupdate], [HAVE_LIBNCURSES], 48*4882a593Smuzhiyun HTOP_CHECK_LIB([curses], [doupdate], [HAVE_LIBNCURSES], 49