Merge of cuix back in trunk

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4309 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
nattfodd 2006-08-08 21:11:20 +00:00
commit 8b75299729
12 changed files with 758 additions and 0 deletions

View file

@ -96,6 +96,21 @@ AC_ARG_WITH(terminfo,
fi,
want_terminfo=yes)
AC_ARG_WITH(ncurses,
[ --with-ncurses Use curses],
if test x$withval = xyes; then
want_terminfo=no
fi, want_curses=yes)
AC_ARG_WITH(cuix,
[ --with-cuix Use curses ui extended],
if test x$withval = xyes; then
want_terminfo=no
want_cuix=yes
want_curses=yes
fi, want_cuix=no)
AC_ARG_WITH(modules,
[ --with-modules Specify what modules to build in binary],
if test x$withval != xyes -a x$withval != xno; then
@ -339,6 +354,10 @@ if test "x$want_socks" = "xyes"; then
])
fi
if test "x$want_cuix" = "xyes"; then
AC_DEFINE([HAVE_CUIX], [1] ,[Enable cuix support])
fi
dnl **
dnl ** fe-text checks
dnl **
@ -808,6 +827,7 @@ AM_CONDITIONAL(HAVE_PERL, test "$want_perl" != "no")
AM_CONDITIONAL(HAVE_STATIC_PERL, test "$want_perl" = "static")
AM_CONDITIONAL(NEED_TPARM, test "$need_tparm" = "yes")
AM_CONDITIONAL(USE_CURSES, test "$want_terminfo" != "yes" -a "$want_termcap" != "yes")
AM_CONDITIONAL(USE_CUIX, test "$want_cuix" = "yes")
# move LIBS to PROG_LIBS so they're not tried to be used when linking eg. perl libraries
PROG_LIBS=$LIBS