summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSam Hartman <hartmans@mit.edu>1996-08-05 18:12:30 +0000
committerSam Hartman <hartmans@mit.edu>1996-08-05 18:12:30 +0000
commit4a68f2fc0d279fff703a61f7d733b75526caafcd (patch)
tree4b625c95288b72a533e301d8c33e27ec7bd1fbfb /src
parentc3364bbed3a1fb2dd152a75adb916ae9841fd6ba (diff)
downloadkrb5-4a68f2fc0d279fff703a61f7d733b75526caafcd.tar.gz
krb5-4a68f2fc0d279fff703a61f7d733b75526caafcd.tar.xz
krb5-4a68f2fc0d279fff703a61f7d733b75526caafcd.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/appl/telnet/telnet/ChangeLog9
-rw-r--r--src/appl/telnet/telnet/configure.in2
-rw-r--r--src/appl/telnet/telnet/telnet.c2
3 files changed, 12 insertions, 1 deletions
diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index ddce36589..704f9c750 100644
--- 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 bf1df5f8a..619153f03 100644
--- 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 9368f3652..bb26be604 100644
--- 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*/