| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | We need to use pkg-config to find the ncurses library instead of the |
| 2 | ncurses*-config applications. |
| 3 | |
| 4 | Signed-off-by: Paul Barker <pbarker@toganlabs.com> |
| 5 | Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> |
| 6 | |
| 7 | Upstream-status: Inappropriate |
| 8 | (`ncurses*-config` can be used outside of OpenEmbedded) |
| 9 | |
| 10 | diff --git a/configure.ac b/configure.ac |
| 11 | index 559dc4d..77aea22 100644 |
| 12 | --- a/configure.ac |
| 13 | +++ b/configure.ac |
| 14 | @@ -185,10 +185,10 @@ m4_define([HTOP_CHECK_LIB], |
| 15 | |
| 16 | AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes") |
| 17 | if test "x$enable_unicode" = xyes; then |
| 18 | - HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", |
| 19 | - HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", |
| 20 | - HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", |
| 21 | - HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", |
| 22 | + HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", |
| 23 | + HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", |
| 24 | + HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", |
| 25 | + HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncurses5", |
| 26 | HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], |
| 27 | HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], |
| 28 | HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], |
| 29 | @@ -201,8 +201,8 @@ if test "x$enable_unicode" = xyes; then |
| 30 | [AC_CHECK_HEADERS([ncurses/curses.h],[:], |
| 31 | [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) |
| 32 | else |
| 33 | - HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", |
| 34 | - HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", |
| 35 | + HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses6", |
| 36 | + HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses5", |
| 37 | HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES], |
| 38 | HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES], |
| 39 | missing_libraries="$missing_libraries libncurses" |