On systems with setup_term, don't define it in telnet.c or me

might get into nasty loops if tcgetent is defined in terms of
setup_term.

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

diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index ddce36589d70b33e8a83a66622f4fa0ed5a474f4..704f9c7508f9e356f3a4d74d98b80233c4d81516 100644 (file)
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,12 @@
+Sat Jul 27 21:34:22 1996  Sam Hartman  <hartmans@tertius.mit.edu>
+
+       * telnet.c(setupterm): Only compile if setupterm not present in
+        library; for Debian Linux and others, you get an endless loop
+        because tcgetent is defined in terms of setupterm, and setupterm
+        in telnet calls tcgetent.
+
+       * configure.in : Check for setupterm
+
 Mon Jun  3 21:31:37 1996  Tom Yu  <tlyu@mit.edu>
 
        * configure.in: Ezra's patches to allow compilation w/o krb4

diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in
index bf1df5f8ab61df069fbc13b40e469b3021404e4f..619153f0379963345e34f4f8312adf7b23f26d5d 100644 (file)
--- a/src/appl/telnet/telnet/configure.in
+++ b/src/appl/telnet/telnet/configure.in
@@ -8,6 +8,8 @@ AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP)
 LIBS="$LIBS -ltermcap",
   AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses")
 )
+AC_CHECK_FUNCS(setupterm) dnl If we have it, use it so we don't get 
+dnl endless loop with tcgetent
 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)

diff --git a/src/appl/telnet/telnet/telnet.c b/src/appl/telnet/telnet/telnet.c
index 9368f3652f3abfc1294abed0f7ba35c50f9a89b8..bb26be6045bb035edddc630c44bbcc3c1704ffae 100644 (file)
--- a/src/appl/telnet/telnet/telnet.c
+++ b/src/appl/telnet/telnet/telnet.c
@@ -741,7 +741,7 @@ is_unique(name, as, ae)
        return (1);
 }
 
-#ifndef        HAS_SETUPTERM
+#ifndef        HAVE_SETUPTERM
 char termbuf[1024];
 
        /*ARGSUSED*/