Commit a7bcf1d2 authored by Hisham Muhammad's avatar Hisham Muhammad
Browse files

Try harder to find the ncurses header, fixes detection in SuSE SLES9.

(thanks to Moritz Barsnick)
parent 25a2aada
...@@ -8,6 +8,8 @@ What's new in version 0.9.1 ...@@ -8,6 +8,8 @@ What's new in version 0.9.1
(thanks to Sebastian Pipping) (thanks to Sebastian Pipping)
* Incremental filtering * Incremental filtering
(thanks to Seth Heeren for the idea and initial implementation) (thanks to Seth Heeren for the idea and initial implementation)
* Try harder to find the ncurses header
(thanks to Moritz Barsnick)
* BUGFIX: Support larger numbers for process times. * BUGFIX: Support larger numbers for process times.
(thanks to Tristan Nakagawa for the report.) (thanks to Tristan Nakagawa for the report.)
* BUGFIX: Segfault in BarMeterMode_draw() for small terminal widths * BUGFIX: Segfault in BarMeterMode_draw() for small terminal widths
......
...@@ -12,10 +12,14 @@ ...@@ -12,10 +12,14 @@
#include "debug.h" #include "debug.h"
#include <assert.h> #include <assert.h>
#ifdef HAVE_LIBNCURSESW #ifdef HAVE_CURSES_H
#include <ncursesw/curses.h>
#else
#include <curses.h> #include <curses.h>
#elif HAVE_NCURSES_H
#include <ncurses.h>
#elif HAVE_NCURSESW_CURSES_H
#include <ncursesw/curses.h>
#elif HAVE_NCURSES_NCURSES_H
#include <ncurses/ncurses.h>
#endif #endif
#define RICHSTRING_MAXLEN 300 #define RICHSTRING_MAXLEN 300
......
...@@ -15,10 +15,14 @@ ...@@ -15,10 +15,14 @@
#include "debug.h" #include "debug.h"
#include <assert.h> #include <assert.h>
#ifdef HAVE_LIBNCURSESW #ifdef HAVE_CURSES_H
#include <ncursesw/curses.h>
#else
#include <curses.h> #include <curses.h>
#elif HAVE_NCURSES_H
#include <ncurses.h>
#elif HAVE_NCURSESW_CURSES_H
#include <ncursesw/curses.h>
#elif HAVE_NCURSES_NCURSES_H
#include <ncurses/ncurses.h>
#endif #endif
#define RICHSTRING_MAXLEN 300 #define RICHSTRING_MAXLEN 300
......
...@@ -87,7 +87,9 @@ fi ...@@ -87,7 +87,9 @@ fi
AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="no") AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="no")
if test "x$enable_unicode" = xyes; then if test "x$enable_unicode" = xyes; then
AC_CHECK_LIB([ncursesw], [refresh], [], [missing_libraries="$missing_libraries libncursesw"]) AC_CHECK_LIB([ncursesw], [refresh], [], [missing_libraries="$missing_libraries libncursesw"])
AC_CHECK_HEADERS([ncursesw/curses.h],[:],[missing_headers="$missing_headers $ac_header"]) AC_CHECK_HEADERS([ncursesw/curses.h],[:],
[AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
[AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])
else else
AC_CHECK_LIB([ncurses], [refresh], [], [missing_libraries="$missing_libraries libncurses"]) AC_CHECK_LIB([ncurses], [refresh], [], [missing_libraries="$missing_libraries libncurses"])
AC_CHECK_HEADERS([curses.h],[:],[missing_headers="$missing_headers $ac_header"]) AC_CHECK_HEADERS([curses.h],[:],[missing_headers="$missing_headers $ac_header"])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment