diff --git a/compat.h b/compat.h index 736a14fc..df8aa562 100644 --- a/compat.h +++ b/compat.h @@ -27,6 +27,12 @@ #include #include +#if defined(HAVE_CURSES_H) +#include +#elif defined(HAVE_NCURSES_H) +#include +#endif + #ifndef __GNUC__ #define __attribute__(a) #endif diff --git a/proc.c b/proc.c index f3d6063d..68de33c6 100644 --- a/proc.c +++ b/proc.c @@ -183,8 +183,19 @@ proc_start(const char *name) log_debug("%s started (%ld): version %s, socket %s, protocol %d", name, (long)getpid(), getversion(), socket_path, PROTOCOL_VERSION); - log_debug("on %s %s %s; libevent %s (%s)", u.sysname, u.release, - u.version, event_get_version(), event_get_method()); + log_debug("on %s %s %s; libevent %s (%s)" +#ifdef HAVE_UTF8PROC + "; utf8proc %s/%s" +#endif +#ifdef NCURSES_VERSION + "; ncurses " NCURSES_VERSION +#endif + , u.sysname, u.release, u.version + , event_get_version(), event_get_method() +#ifdef HAVE_UTF8PROC + , utf8proc_version (), utf8proc_unicode_version () +#endif + ); tp = xcalloc(1, sizeof *tp); tp->name = xstrdup(name); diff --git a/tty-term.c b/tty-term.c index 36d8a2e6..6b1cde16 100644 --- a/tty-term.c +++ b/tty-term.c @@ -18,11 +18,6 @@ #include -#if defined(HAVE_CURSES_H) -#include -#elif defined(HAVE_NCURSES_H) -#include -#endif #include #include #include