From 87f5cb6e233c4d16dc4eed9b9a070088daf02c09 Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Tue, 18 Jan 2005 17:33:56 +0000 Subject: [PATCH] * configure.in: When looking for setupterm() - look in libcurses/libncurses even if termcap library found. This is a GCC 4.0 fix.. Otherwise we get conflicting declarations of setupterm in a header file and in the telnet client. ticket: 2876 status: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17053 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/telnet/ChangeLog | 5 +++++ src/appl/telnet/configure.in | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/appl/telnet/ChangeLog b/src/appl/telnet/ChangeLog index 5457af948..5ffe64539 100644 --- a/src/appl/telnet/ChangeLog +++ b/src/appl/telnet/ChangeLog @@ -1,3 +1,8 @@ +2005-01-13 Ezra Peisach + + * configure.in: When looking for setupterm() - look in + libcurses/libncurses even if termcap library found. + 2004-09-22 Tom Yu * configure.in: Use KRB5_AC_LIBUTIL. diff --git a/src/appl/telnet/configure.in b/src/appl/telnet/configure.in index 818c2e45f..92d69316b 100644 --- a/src/appl/telnet/configure.in +++ b/src/appl/telnet/configure.in @@ -51,10 +51,10 @@ AC_CHECK_HEADERS(term.h,,,dnl ]) dnl AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP) -LIBS="$LIBS -ltermcap", - AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses", +LIBS="$LIBS -ltermcap") +AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses", AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses") -)) +) KRB5_AC_INET6 AC_CHECK_FUNCS(setupterm) AC_CHECK_HEADER(termios.h,AC_DEFINE(USE_TERMIO) ac_termio=1) -- 2.26.2