* configure.in: use WITH_KRB4, cache cc_t in termio check, cache

	SETPGRP_TWOARG check.
	* Makefile.in (K4LIB): use @K4LIB@.
	(telnetd): use $(K4LIB). (from epeisach)
[from 0955]
	* Makefile.in (install): install telnetd manpage
	(from Ted Lemon <mellon@ipd.wellsfargo.com>).
[from 0937]

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

diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index 45410ff5958c03769079b2c4d352f1bdf4d287cb..7f8ea55c1eb627329f3ab8e84f2adbc1a0ef4514 100644 (file)
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,15 @@
+Fri Nov 18 01:23:13 1994  Mark Eichin  <eichin@cygnus.com>
+
+       * Makefile.in (install): install telnetd manpage
+       (from Ted Lemon <mellon@ipd.wellsfargo.com>).
+
+Fri Nov 18 00:44:05 1994  Mark Eichin  <eichin@cygnus.com>
+
+       * configure.in: use WITH_KRB4, cache cc_t in termio check, cache
+       SETPGRP_TWOARG check.
+       * Makefile.in (K4LIB): use @K4LIB@.
+       (telnetd): use $(K4LIB). (from epeisach)
+
 Mon Nov  7 22:16:51 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * configure.in: 

diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in
index e883d1f8bffa1e698fe1e2609129064deade8a93..5afe93a8e1e8f10852de7457a3cf10bb20c74e88 100644 (file)
--- a/src/appl/telnet/telnetd/Makefile.in
+++ b/src/appl/telnet/telnetd/Makefile.in
@@ -26,7 +26,7 @@ LOCALINCLUDES=-I.. -I$(srcdir)/..
 CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
 ARPA_TELNET= $(srcdir)/../arpa/telnet.h
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-K4LIB = $(KRB4)/lib/libkrb.a
+K4LIB = @K4LIB@
 KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB)
 DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
@@ -52,13 +52,14 @@ OBJS=       telnetd.o \
 all:: telnetd
 
 telnetd: $(OBJS) $(DEPKLIB)
-       $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
+       $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(K4LIB) $(LIBS)
 
 clean::
        $(RM) telnetd
 
 install::
        $(INSTALL_PROGRAM) telnetd $(DESTDIR)$(SERVER_BINDIR)/telnetd
+       $(INSTALL_DATA) telnetd.8 ${DESTDIR}$(SERVER_MANDIR)/telnetd.8
 
 authenc.o: telnetd.h
 global.o: defs.h ext.h $(ARPA_TELNET)

diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in
index b8625bb07002225f86257f9a277a979806cafd62..add21869187e5e321461746a840a9afe9694aa22 100644 (file)
--- a/src/appl/telnet/telnetd/configure.in
+++ b/src/appl/telnet/telnetd/configure.in
@@ -7,6 +7,11 @@ CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
 KRB_INCLUDE
+WITH_KRB4
+AC_ARG_WITH([krb4],,
+K4LIB="$(KRB4)/lib/libkrb.a $(KRB4)/lib/libdes.a",
+K4LIB=)
+AC_SUBST(K4LIB)
 ISODE_INCLUDE
 AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(socket,main)
@@ -19,8 +24,14 @@ 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)
 if test -z "$ac_sysv_termio"; then
-AC_COMPILE_CHECK([cc_t],[#include <termio.h>],
-[cc_t foo;],,AC_DEFINE(NO_CC_T))
+  AC_MSG_CHECKING([for cc_t in termio.h])
+  AC_CACHE_VAL(krb_cv_type_cc_t,
+  [AC_TRY_LINK([cc_t],[#include <termio.h>],
+  [cc_t foo;],krb_cv_type_cc_t=yes,krb_cv_type_cc_t=no)])
+  AC_MSG_RESULT($krb_cv_type_cc_t)
+  if test $krb_cv_type_cc_t = no; then
+    AC_DEFINE(NO_CC_T)
+  fi
 fi
 fi
 AC_HEADER_TIME
@@ -32,7 +43,14 @@ AC_HEADER_CHECK(sys/filio.h,AC_DEFINE(FILIO_H))
 AC_HEADER_CHECK(sys/stream.h,AC_DEFINE(STREAMS))
 AC_HEADER_CHECK(utmpx.h,AC_DEFINE(UTMPX))
 AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT))
-AC_COMPILE_CHECK([number of arguments to setpgrp],
+AC_MSG_CHECKING([if setpgrp takes two arguments])
+dnl
+AC_CACHE_VAL(krb5_cv_sys_setpgrp_two,
+[AC_TRY_LINK( 
 [#include <unistd.h>],[setpgrp(0,0)],
-AC_DEFINE(SETPGRP_TWOARG))
+krb5_cv_sys_setpgrp_two=yes,krb5_cv_sys_setpgrp_two=no)])
+AC_MSG_RESULT($krb5_cv_sys_setpgrp_two)
+if test $krb5_cv_sys_setpgrp_two = yes; then
+  AC_DEFINE(SETPGRP_TWOARG)
+fi
 V5_AC_OUTPUT_MAKEFILE