| We need to use pkg-config to find the ncurses library instead of the |
| ncurses*-config applications. |
| |
| Signed-off-by: Paul Barker <pbarker@toganlabs.com> |
| Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> |
| |
| Upstream-status: Inappropriate |
| (`ncurses*-config` can be used outside of OpenEmbedded) |
| |
| diff --git a/configure.ac b/configure.ac |
| index 559dc4d..77aea22 100644 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -185,10 +185,10 @@ m4_define([HTOP_CHECK_LIB], |
| |
| AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes") |
| if test "x$enable_unicode" = xyes; then |
| - HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", |
| - HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", |
| - HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", |
| - HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", |
| + HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", |
| + HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", |
| + HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", |
| + HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncurses5", |
| HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], |
| HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], |
| HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], |
| @@ -201,8 +201,8 @@ if test "x$enable_unicode" = xyes; then |
| [AC_CHECK_HEADERS([ncurses/curses.h],[:], |
| [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) |
| else |
| - HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", |
| - HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", |
| + HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses6", |
| + HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses5", |
| HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES], |
| HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES], |
| missing_libraries="$missing_libraries libncurses" |