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