From: Ken Raeburn <raeburn@mit.edu>
Date: Sun, 7 Mar 2004 09:26:48 +0000 (+0000)
Subject: * configure.in: Move test for setupterm back down below addition of
X-Git-Tag: krb5-1.4-beta1~557
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dd4746e55810bfec66a0dd48b4bf4b9b3dd537e6;p=krb5.git

* configure.in: Move test for setupterm back down below addition of
termcap/curses libraries.

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

diff --git a/src/appl/telnet/ChangeLog b/src/appl/telnet/ChangeLog
index a733c9999..8a847a286 100644
--- a/src/appl/telnet/ChangeLog
+++ b/src/appl/telnet/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-07  Ken Raeburn  <raeburn@mit.edu>
+
+	* configure.in: Move test for setupterm back down below addition
+	of termcap/curses libraries.
+
 2004-03-04  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Merged in code from subdir configure.in files.
diff --git a/src/appl/telnet/configure.in b/src/appl/telnet/configure.in
index 04e4499cb..30a4cbfbe 100644
--- a/src/appl/telnet/configure.in
+++ b/src/appl/telnet/configure.in
@@ -5,7 +5,7 @@ dnl
 dnl from old libtelnet/configure.in, plus additional header & func checks
 dnl
 AC_REPLACE_FUNCS([strcasecmp strdup setsid strerror strftime getopt herror parsetos])
-AC_CHECK_FUNCS(setenv unsetenv getenv gettosbyname cgetent gettosbyname setupterm vsnprintf)
+AC_CHECK_FUNCS(setenv unsetenv getenv gettosbyname cgetent gettosbyname vsnprintf)
 AC_CHECK_HEADERS(stdlib.h string.h unistd.h arpa/nameser.h sys/select.h arpa/inet.h sys/filio.h curses.h utmp.h sys/time.h sys/tty.h sac.h sys/ptyvar.h sys/stream.h sys/utsname.h memory.h)
 if test $ac_cv_func_setenv = no || test $ac_cv_func_unsetenv = no \
   || test $ac_cv_func_getenv = no; then
@@ -56,6 +56,7 @@ LIBS="$LIBS -ltermcap",
   AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses")
 ))
 KRB5_AC_INET6
+AC_CHECK_FUNCS(setupterm)
 AC_CHECK_HEADER(termios.h,AC_DEFINE(USE_TERMIO) ac_termio=1)
 if test -z "$ac_termio"; then
 AC_CHECK_HEADER(termio.h,AC_DEFINE(SYSV_TERMIO),ac_sysv_termio=1)