* 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

diff --git a/src/appl/telnet/ChangeLog b/src/appl/telnet/ChangeLog
index 5457af94800dc20407889de9369da275196d5898..5ffe64539ccac7f75d2fea43784b1103a23501a8 100644 (file)
--- a/src/appl/telnet/ChangeLog
+++ b/src/appl/telnet/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-13  Ezra Peisach  <epeisach@mit.edu>
+
+       * configure.in: When looking for setupterm() - look in
+       libcurses/libncurses even if termcap library found.
+
 2004-09-22  Tom Yu  <tlyu@mit.edu>
 
        * configure.in: Use KRB5_AC_LIBUTIL.

diff --git a/src/appl/telnet/configure.in b/src/appl/telnet/configure.in
index 818c2e45f11b8d347c8334dea50060888b863990..92d69316bbf3cdf164ff73342628380fdb51c0c7 100644 (file)
--- 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)