diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2015-11-30 16:36:22 -0200 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-11-30 16:36:22 -0200 |
| commit | 96c929f82b811f054726f1ba3e5fd065976a1204 (patch) | |
| tree | de2b61ea744fd7388010d0e6ff039f34c2380895 /configure.ac | |
| parent | d34645f8f1b958454f182fcc061a05fefe48f4df (diff) | |
Use ncurses*-config scripts bundled with ncurses.
Ensure that all necessary libs and flags are passed along,
such as adding -ltinfo when needed.
Closes #198.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 1fd6bd61..80180486 100644 --- a/configure.ac +++ b/configure.ac @@ -144,14 +144,25 @@ if test "x$enable_taskstats" = xyes; then AC_DEFINE(HAVE_TASKSTATS, 1, [Define if taskstats support enabled.]) fi +# HTOP_CHECK_NCURSES_LIBRARY(LIBNAME, FUNCTION, DEFINE, CONFIG_SCRIPT, ELSE_PART) +m4_define([HTOP_CHECK_NCURSES_LIBRARY], +[ + AC_CHECK_LIB([$1], [$2], [ + AC_DEFINE([$3], 1, [The library is present.]) + config_script=$([$4] --libs 2> /dev/null) + if test ! "x$config_script" = x; then + LIBS="$config_script $LIBS " + else + LIBS="-l[$1] $LIBS " + fi + ], [$5]) +]) + AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes") if test "x$enable_unicode" = xyes; then - AC_CHECK_LIB([ncursesw6], [addnwstr], [ - AC_DEFINE(HAVE_LIBNCURSESW, 1, []) - LIBS="-lncursesw6 $LIBS " - ], [ - AC_CHECK_LIB([ncursesw], [addnwstr], [], [ - AC_CHECK_LIB([ncurses], [addnwstr], [], [ + HTOP_CHECK_NCURSES_LIBRARY([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", [ + HTOP_CHECK_NCURSES_LIBRARY([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", [ + HTOP_CHECK_NCURSES_LIBRARY([ncurses], [addnwstr], [HAVE_LIBNCURSES], "ncurses5-config", [ missing_libraries="$missing_libraries libncursesw" AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.]) ]) @@ -162,7 +173,11 @@ 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 - AC_CHECK_LIB([ncurses], [refresh], [], [missing_libraries="$missing_libraries libncurses"]) + HTOP_CHECK_NCURSES_LIBRARY([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", [ + HTOP_CHECK_NCURSES_LIBRARY([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", [ + missing_libraries="$missing_libraries libncurses" + ]) + ]) AC_CHECK_HEADERS([curses.h],[:], [AC_CHECK_HEADERS([ncurses/curses.h],[:], [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], |