blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added auto-detection of ncursesw/ncurses lib in configure.in, fall back to ncurses if ncursesw is not found (auto-detect ncurses.h location too)

Browse Source
This commit is contained in:
Sebastien Helleu 2005-10-25 09:23:10 +00:00
parent c2f4bdd0fc
commit 0e531f5e6a
6 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.in
View File

@ -34,7 +34,8 @@ ALL_LINGUAS="fr es cs"
AM_GNU_GETTEXT
# Checks for libraries
AC_CHECK_LIB(ncursesw, initscr, LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0)
AC_CHECK_LIB(ncurses, initscr, LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0)
AC_CHECK_LIB(ncursesw, initscr, LIBNCURSESW_FOUND=1, LIBNCURSESW_FOUND=0)
# Checks for header files
AC_HEADER_STDC
@ -103,12 +104,20 @@ AM_CONDITIONAL(HAVE_GNUTLS, test "$enable_gnutls" = "yes")
# ------------------------------------------------------------------------------
if test "x$enable_ncurses" = "xyes" ; then
if test "$LIBNCURSES_FOUND" = "0" ; then
AC_MSG_ERROR([
*** ncursesw library not found!
if test "$LIBNCURSESW_FOUND" = "0" ; then
if test "$LIBNCURSES_FOUND" = "0" ; then
AC_MSG_ERROR([
*** ncurses library not found!
*** Please install ncurses library or run ./configure with --disable-ncurses parameter.])
fi
AC_MSG_WARN([
*** ncursesw library not found! Falling back to "ncurses"
*** Be careful, UTF-8 display will not work properly.])
NCURSES_LIBS="-lncurses"
else
NCURSES_LIBS="-lncursesw"
AC_CHECK_HEADERS(ncursesw/curses.h)
fi
NCURSES_LIBS="-lncursesw"
AC_SUBST(NCURSES_LIBS)
fi

5
src/gui/curses/gui-display.c
View File

@ -31,7 +31,12 @@
#include <signal.h>
#include <time.h>
#include <ctype.h>
#ifdef HAVE_NCURSESW_CURSES_H
#include <ncursesw/ncurses.h>
#else
#include <ncurses.h>
#endif
#include "../../common/weechat.h"
#include "../gui.h"

5
src/gui/curses/gui-input.c
View File

@ -31,7 +31,12 @@
#include <signal.h>
#include <time.h>
#include <sys/socket.h>
#ifdef HAVE_NCURSESW_CURSES_H
#include <ncursesw/ncurses.h>
#else
#include <ncurses.h>
#endif
#include "../../common/weechat.h"
#include "../gui.h"

19
weechat/configure.in
View File

@ -34,7 +34,8 @@ ALL_LINGUAS="fr es cs"
AM_GNU_GETTEXT
# Checks for libraries
AC_CHECK_LIB(ncursesw, initscr, LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0)
AC_CHECK_LIB(ncurses, initscr, LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0)
AC_CHECK_LIB(ncursesw, initscr, LIBNCURSESW_FOUND=1, LIBNCURSESW_FOUND=0)
# Checks for header files
AC_HEADER_STDC
@ -103,12 +104,20 @@ AM_CONDITIONAL(HAVE_GNUTLS, test "$enable_gnutls" = "yes")
# ------------------------------------------------------------------------------
if test "x$enable_ncurses" = "xyes" ; then
if test "$LIBNCURSES_FOUND" = "0" ; then
AC_MSG_ERROR([
*** ncursesw library not found!
if test "$LIBNCURSESW_FOUND" = "0" ; then
if test "$LIBNCURSES_FOUND" = "0" ; then
AC_MSG_ERROR([
*** ncurses library not found!
*** Please install ncurses library or run ./configure with --disable-ncurses parameter.])
fi
AC_MSG_WARN([
*** ncursesw library not found! Falling back to "ncurses"
*** Be careful, UTF-8 display will not work properly.])
NCURSES_LIBS="-lncurses"
else
NCURSES_LIBS="-lncursesw"
AC_CHECK_HEADERS(ncursesw/curses.h)
fi
NCURSES_LIBS="-lncursesw"
AC_SUBST(NCURSES_LIBS)
fi

5
weechat/src/gui/curses/gui-display.c
View File

@ -31,7 +31,12 @@
#include <signal.h>
#include <time.h>
#include <ctype.h>
#ifdef HAVE_NCURSESW_CURSES_H
#include <ncursesw/ncurses.h>
#else
#include <ncurses.h>
#endif
#include "../../common/weechat.h"
#include "../gui.h"

5
weechat/src/gui/curses/gui-input.c
View File

@ -31,7 +31,12 @@
#include <signal.h>
#include <time.h>
#include <sys/socket.h>
#ifdef HAVE_NCURSESW_CURSES_H
#include <ncursesw/ncurses.h>
#else
#include <ncurses.h>
#endif
#include "../../common/weechat.h"
#include "../gui.h"