aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-09-29 04:45:57 -04:00
Code

moved ncurses/terminfo/etc. libs away from PROG_LIBS which should be list of

Browse Source 
common libraries for all ui frontends..


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2899 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-08-26 23:58:59 +00:00 committed by cras
parent 8790f97869
commit fce48d905b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.in
View File

@ -510,7 +510,7 @@ dnl **
if test "x$want_textui" = "xyes"; then if test "x$want_textui" = "xyes"; then
AC_CHECK_CURSES AC_CHECK_CURSES
LIBS="$LIBS $CURSES_LIBS" TEXTUI_LIBS="$CURSES_LIBS"
if test "x$has_curses" = "xtrue"; then if test "x$has_curses" = "xtrue"; then
AC_CHECK_FUNC(use_default_colors, AC_DEFINE(HAVE_NCURSES_USE_DEFAULT_COLORS)) AC_CHECK_FUNC(use_default_colors, AC_DEFINE(HAVE_NCURSES_USE_DEFAULT_COLORS))
AC_CHECK_FUNC(idcok, AC_DEFINE(HAVE_CURSES_IDCOK)) AC_CHECK_FUNC(idcok, AC_DEFINE(HAVE_CURSES_IDCOK))
@ -521,19 +521,21 @@ if test "x$want_textui" = "xyes"; then
]) ])
else else
AC_CHECK_LIB(tinfo, setupterm, [ AC_CHECK_LIB(tinfo, setupterm, [
LIBS="$LIBS -ltinfo" TEXTUI_LIBS="-ltinfo"
want_terminfo=yes want_terminfo=yes
], AC_CHECK_LIB(termlib, tgetent, [ ], AC_CHECK_LIB(termlib, tgetent, [
LIBS="$LIBS -ltermlib" TEXTUI_LIBS="-ltermlib"
want_termcap=yes want_termcap=yes
], AC_CHECK_LIB(termcap, tgetent, [ ], AC_CHECK_LIB(termcap, tgetent, [
LIBS="$LIBS -ltermcap" TEXTUI_LIBS="-ltermcap"
want_termcap=yes want_termcap=yes
], [ ], [
AC_ERROR(Terminfo/termcap not found - install ncurses-devel package) AC_ERROR(Terminfo/termcap not found - install ncurses-devel package)
want_textui=no want_textui=no
]))) ])))
fi fi
AC_SUBST(TEXTUI_LIBS)
if test "x$want_termcap" = "xyes"; then if test "x$want_termcap" = "xyes"; then
AC_CHECK_FUNC(tparm,, need_tparm=yes) AC_CHECK_FUNC(tparm,, need_tparm=yes)
else else

3
src/fe-text/Makefile.am
View File

@ -20,7 +20,8 @@ irssi_LDADD = \
@PERL_LINK_LIBS@ \ @PERL_LINK_LIBS@ \
@PERL_FE_LINK_LIBS@ \ @PERL_FE_LINK_LIBS@ \
@PERL_LINK_FLAGS@ \ @PERL_LINK_FLAGS@ \
@PROG_LIBS@ @PROG_LIBS@ \
@TEXTUI_LIBS@
tparm_sources = \ tparm_sources = \
tparm.c tparm.c