| Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame] | 1 | From 14100c6fc2cce7260ca5ace81094aee0ae40dd07 Mon Sep 17 00:00:00 2001 |
| 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 | |
| 12 | Upstream-status: Inappropriate |
| 13 | (`ncurses*-config` can be used outside of OpenEmbedded) |
| 14 | |
| Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame] | 15 | --- |
| 16 | configure.ac | 12 ++++++------ |
| 17 | 1 file changed, 6 insertions(+), 6 deletions(-) |
| 18 | |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 19 | diff --git a/configure.ac b/configure.ac |
| Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame] | 20 | index 115d894..0e0a1eb 100644 |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 21 | --- a/configure.ac |
| 22 | +++ b/configure.ac |
| Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame] | 23 | @@ -205,10 +205,10 @@ AS_VAR_POPDEF([CACHEVAR])dnl |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 24 | |
| 25 | AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes") |
| 26 | if test "x$enable_unicode" = xyes; then |
| 27 | - HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", |
| 28 | - HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", |
| 29 | - HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", |
| 30 | - HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", |
| 31 | + HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", |
| 32 | + HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", |
| 33 | + HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", |
| 34 | + HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncurses5", |
| 35 | HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], |
| 36 | HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], |
| 37 | HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], |
| Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame] | 38 | @@ -225,8 +225,8 @@ if test "x$enable_unicode" = xyes; then |
| 39 | # (at this point we already link against a working ncurses library with wide character support) |
| 40 | AC_SEARCH_LIBS([keypad], [tinfow tinfo]) |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 41 | else |
| 42 | - HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", |
| 43 | - HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", |
| 44 | + HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses6", |
| 45 | + HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses5", |
| 46 | HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES], |
| 47 | HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES], |
| 48 | missing_libraries="$missing_libraries libncurses" |