aboutsummaryrefslogtreecommitdiff
path: root/src/appl/telnet
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>1998-05-26 19:32:02 +0000
committerTom Yu <tlyu@mit.edu>1998-05-26 19:32:02 +0000
commit30086a17f118c47befa0900eaf3b6ebc36e7b195 (patch)
tree70d8c22a7ccae75f84309024c9853dc4cdcc51b8 /src/appl/telnet
parentb952897e90719ca55e2fa9c921ce4afe05f578c7 (diff)
downloadkrb5-30086a17f118c47befa0900eaf3b6ebc36e7b195.zip
krb5-30086a17f118c47befa0900eaf3b6ebc36e7b195.tar.gz
krb5-30086a17f118c47befa0900eaf3b6ebc36e7b195.tar.bz2
* configure.in: Re-order check for setupterm to avoid lossage if
setupterm is defined in libtermcap or libcurses. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10584 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl/telnet')
-rw-r--r--src/appl/telnet/telnet/ChangeLog5
-rw-r--r--src/appl/telnet/telnet/configure.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index 8bb990c..3e58285 100644
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 26 15:27:55 1998 Tom Yu <tlyu@mit.edu>
+
+ * configure.in: Re-order check for setupterm to avoid lossage if
+ setupterm is defined in libtermcap or libcurses.
+
1998-05-06 Theodore Ts'o <tytso@rsts-11.mit.edu>
* main.c (main): POSIX states that getopt returns -1 when it
diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in
index 38e06cd..2edefa2 100644
--- a/src/appl/telnet/telnet/configure.in
+++ b/src/appl/telnet/telnet/configure.in
@@ -3,11 +3,11 @@ CONFIG_RULES
AC_PROG_INSTALL
AC_VFORK
AC_CHECK_HEADERS(string.h arpa/nameser.h unistd.h sys/select.h stdlib.h arpa/inet.h sys/filio.h)
-AC_CHECK_FUNCS(gettosbyname setupterm)
AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP)
LIBS="$LIBS -ltermcap",
AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses")
)
+AC_CHECK_FUNCS(gettosbyname setupterm)
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)