mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
htop: build fix
This commit is contained in:
parent
95eb836354
commit
7111556a55
@ -2,12 +2,7 @@ From: awiouy <awiouy@gmail.com>
|
|||||||
Date: Thu, 6 Jul 2017 18:51:24 +0200
|
Date: Thu, 6 Jul 2017 18:51:24 +0200
|
||||||
Subject: [PATCH] htop: netbsd-curses support
|
Subject: [PATCH] htop: netbsd-curses support
|
||||||
|
|
||||||
---
|
|
||||||
RichString.c | 59 -----------------------------------------------------------
|
|
||||||
1 file changed, 59 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/RichString.c b/RichString.c
|
diff --git a/RichString.c b/RichString.c
|
||||||
index e7dd4e83..0ff1bb02 100644
|
|
||||||
--- a/RichString.c
|
--- a/RichString.c
|
||||||
+++ b/RichString.c
|
+++ b/RichString.c
|
||||||
@@ -18,21 +18,7 @@ in the source distribution for its full text.
|
@@ -18,21 +18,7 @@ in the source distribution for its full text.
|
||||||
@ -103,3 +98,45 @@ index e7dd4e83..0ff1bb02 100644
|
|||||||
void RichString_prune(RichString* this) {
|
void RichString_prune(RichString* this) {
|
||||||
if (this->chlen > RICHSTRING_MAXLEN)
|
if (this->chlen > RICHSTRING_MAXLEN)
|
||||||
free(this->chptr);
|
free(this->chptr);
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -183,36 +183,6 @@
|
||||||
|
], [$4])
|
||||||
|
])
|
||||||
|
|
||||||
|
-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], "ncursesw5-config",
|
||||||
|
- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
|
||||||
|
- HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
|
||||||
|
- HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
|
||||||
|
- HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
|
||||||
|
- missing_libraries="$missing_libraries libncursesw"
|
||||||
|
- AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
|
||||||
|
- ))))))
|
||||||
|
-
|
||||||
|
- AC_CHECK_HEADERS([ncursesw/curses.h],[:],
|
||||||
|
- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
|
||||||
|
- [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_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
|
||||||
|
- HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
|
||||||
|
- missing_libraries="$missing_libraries libncurses"
|
||||||
|
- ))))
|
||||||
|
-
|
||||||
|
- AC_CHECK_HEADERS([curses.h],[:],
|
||||||
|
- [AC_CHECK_HEADERS([ncurses/curses.h],[:],
|
||||||
|
- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
|
||||||
|
- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
|
||||||
|
-fi
|
||||||
|
-
|
||||||
|
if test "$my_htop_platform" = "freebsd"; then
|
||||||
|
AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"])
|
||||||
|
fi
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user