* 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

diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index 8bb990c7b1f31027339b59c31cb7afc9e60e4669..3e582855f08ad6155937fae616ec1df70228f34b 100644 (file)
--- 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 38e06cd30576c10aba4c8630decf010dcf10a624..2edefa2c766e418ee5fff68554b287a32388e63f 100644 (file)
--- 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)