Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From 98ed72177c49a8015a443b3ec272fee3fb5a4eb3 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame] | 2 | From: Paul Barker <pbarker@toganlabs.com> |
| 3 | Date: Sun, 5 Nov 2017 22:07:30 +0000 |
| 4 | Subject: [PATCH] htop: Update to v2.0.2 |
| 5 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 6 | We need to use pkg-config to find the ncurses library instead of the |
| 7 | ncurses*-config applications. |
| 8 | |
| 9 | Signed-off-by: Paul Barker <pbarker@toganlabs.com> |
| 10 | Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> |
| 11 | |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame] | 12 | Upstream-Status: Inappropriate [`ncurses*-config` can be used outside of OpenEmbedded] |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 13 | |
Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame] | 14 | --- |
| 15 | configure.ac | 12 ++++++------ |
| 16 | 1 file changed, 6 insertions(+), 6 deletions(-) |
| 17 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 18 | diff --git a/configure.ac b/configure.ac |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 19 | index 0e69096..d20014f 100644 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 20 | --- a/configure.ac |
| 21 | +++ b/configure.ac |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 22 | @@ -322,10 +322,10 @@ AC_ARG_ENABLE([unicode], |
| 23 | [], |
| 24 | [enable_unicode=yes]) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 25 | if test "x$enable_unicode" = xyes; then |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 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", |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 34 | HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], |
| 35 | HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], |
| 36 | HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 37 | @@ -342,8 +342,8 @@ if test "x$enable_unicode" = xyes; then |
Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame] | 38 | # (at this point we already link against a working ncurses library with wide character support) |
| 39 | AC_SEARCH_LIBS([keypad], [tinfow tinfo]) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 40 | else |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 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], |