telnet needs USE_ANAME because libtelnet/kerberos.c isn't split

if setupterm is in curses, grab it

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7630 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in
index 8492375eeafd91ce7a4ce298bf5d79db67fbc977..74f9a83ca1cfc2340b2666d6aff750aa44c5d990 100644 (file)
--- a/src/appl/telnet/telnet/configure.in
+++ b/src/appl/telnet/telnet/configure.in
@@ -5,7 +5,9 @@ AC_VFORK
 AC_CHECK_HEADERS(string.h arpa/nameser.h)
 AC_HAVE_HEADERS(unistd.h sys/select.h stdlib.h)
 AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP)
-LIBS="$LIBS -ltermcap")
+LIBS="$LIBS -ltermcap",
+  AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses")
+)
 AC_HEADER_CHECK(termios.h,AC_DEFINE(USE_TERMIO) ac_termio=1)
 if test -z "$ac_termio"; then
 AC_HEADER_CHECK(termio.h,AC_DEFINE(SYSV_TERMIO),ac_sysv_termio=1)
@@ -33,6 +35,7 @@ else
        AC_DEFINE(KRB4)
 fi
 USE_KRB4_LIBRARY
+USE_ANAME
 KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in
index b579207ea7c01d10071a1f2a422cd3574999667f..d301f547eebd8fb1b20dc36a09295b5cef7d5ec4 100644 (file)
--- a/src/appl/telnet/telnetd/configure.in
+++ b/src/appl/telnet/telnetd/configure.in
@@ -4,7 +4,9 @@ AC_PROG_INSTALL
 AC_CHECK_LIB(util,main)
 USE_ANAME
 AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP)
-LIBS="$LIBS -ltermcap")
+LIBS="$LIBS -ltermcap",
+  AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses")
+)
 AC_HEADER_CHECK(termios.h,AC_DEFINE(USE_TERMIO) ac_termio=1)
 if test -z "$ac_termio"; then
 AC_HEADER_CHECK(termio.h,AC_DEFINE(SYSV_TERMIO),ac_sysv_termio=1)