blob: 2760162acf59ee025478ed25b8621afc5bfc07c3 [file] [log] [blame]
Andrew Geissler595f6302022-01-24 19:11:47 +00001From 98ed72177c49a8015a443b3ec272fee3fb5a4eb3 Mon Sep 17 00:00:00 2001
Andrew Geisslereef63862021-01-29 15:58:13 -06002From: Paul Barker <pbarker@toganlabs.com>
3Date: Sun, 5 Nov 2017 22:07:30 +0000
4Subject: [PATCH] htop: Update to v2.0.2
5
Brad Bishop316dfdd2018-06-25 12:45:53 -04006We 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
13 (`ncurses*-config` can be used outside of OpenEmbedded)
14
Andrew Geisslereef63862021-01-29 15:58:13 -060015---
16 configure.ac | 12 ++++++------
17 1 file changed, 6 insertions(+), 6 deletions(-)
18
Brad Bishop316dfdd2018-06-25 12:45:53 -040019diff --git a/configure.ac b/configure.ac
Andrew Geissler595f6302022-01-24 19:11:47 +000020index 0e69096..d20014f 100644
Brad Bishop316dfdd2018-06-25 12:45:53 -040021--- a/configure.ac
22+++ b/configure.ac
Andrew Geissler595f6302022-01-24 19:11:47 +000023@@ -322,10 +322,10 @@ AC_ARG_ENABLE([unicode],
24 [],
25 [enable_unicode=yes])
Brad Bishop316dfdd2018-06-25 12:45:53 -040026 if test "x$enable_unicode" = xyes; then
Andrew Geissler595f6302022-01-24 19:11:47 +000027- HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
28- HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
29- HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "ncursesw5-config",
30- HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [HAVE_LIBNCURSESW], "ncurses5-config",
31+ HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6",
32+ HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6",
33+ HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "pkg-config ncursesw5",
34+ HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [HAVE_LIBNCURSESW], "pkg-config ncurses5",
Brad Bishop316dfdd2018-06-25 12:45:53 -040035 HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
36 HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
37 HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
Andrew Geissler595f6302022-01-24 19:11:47 +000038@@ -342,8 +342,8 @@ if test "x$enable_unicode" = xyes; then
Andrew Geisslereef63862021-01-29 15:58:13 -060039 # (at this point we already link against a working ncurses library with wide character support)
40 AC_SEARCH_LIBS([keypad], [tinfow tinfo])
Brad Bishop316dfdd2018-06-25 12:45:53 -040041 else
Andrew Geissler595f6302022-01-24 19:11:47 +000042- HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses6-config],
43- HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses5-config],
44+ HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [pkg-config ncurses6],
45+ HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [pkg-config ncurses5],
46 HTOP_CHECK_LIB([ncurses6], [doupdate], [HAVE_LIBNCURSES],
47 HTOP_CHECK_LIB([ncurses], [doupdate], [HAVE_LIBNCURSES],
48 HTOP_CHECK_LIB([curses], [doupdate], [HAVE_LIBNCURSES],