From a037c858f1030e82d8e6ece7f4e1b0162cfd24bb Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Sat, 23 Jul 1994 12:27:40 +0000 Subject: [PATCH] autoconf'ing telnet git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4008 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/ChangeLog | 4 + src/appl/configure.in | 2 +- src/appl/telnet/ChangeLog | 5 ++ src/appl/telnet/Makefile.in | 22 +---- src/appl/telnet/configure.in | 3 + src/appl/telnet/libtelnet/Makefile.in | 116 +++++++++++++++++-------- src/appl/telnet/libtelnet/configure.in | 10 ++- src/appl/telnet/telnet/Makefile.in | 63 ++++++++++++++ src/appl/telnet/telnet/configure.in | 24 +++++ src/appl/telnet/telnetd/Makefile.in | 66 ++++++++++++++ src/appl/telnet/telnetd/configure.in | 24 +++++ 11 files changed, 278 insertions(+), 61 deletions(-) create mode 100644 src/appl/telnet/ChangeLog create mode 100644 src/appl/telnet/telnet/Makefile.in create mode 100644 src/appl/telnet/telnet/configure.in create mode 100644 src/appl/telnet/telnetd/Makefile.in create mode 100644 src/appl/telnet/telnetd/configure.in diff --git a/src/appl/ChangeLog b/src/appl/ChangeLog index d9771ca5c..f2a1d25fa 100644 --- a/src/appl/ChangeLog +++ b/src/appl/ChangeLog @@ -1,3 +1,7 @@ +Sat Jul 23 08:25:48 1994 Tom Yu (tlyu@dragons-lair) + + * configure.in: autoconf'ing telnet + Wed Jul 20 00:10:30 1994 Tom Yu (tlyu at dragons-lair) * configure.in: autoconf'ing gss-sample diff --git a/src/appl/configure.in b/src/appl/configure.in index 8346ea3d1..6a161be54 100644 --- a/src/appl/configure.in +++ b/src/appl/configure.in @@ -1,7 +1,7 @@ AC_INIT(configure.in) WITH_CCOPTS AC_SET_BUILDTOP -CONFIG_DIRS(sample simple user_user bsd gss-sample) +CONFIG_DIRS(sample simple user_user bsd gss-sample telnet) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) MAKE_SUBDIRS("installing",install) diff --git a/src/appl/telnet/ChangeLog b/src/appl/telnet/ChangeLog new file mode 100644 index 000000000..c4d525310 --- /dev/null +++ b/src/appl/telnet/ChangeLog @@ -0,0 +1,5 @@ +Sat Jul 23 08:18:18 1994 Tom Yu (tlyu@dragons-lair) + + * Makefile.in: + * configure.in: first cut at making telnet completely autoconf + diff --git a/src/appl/telnet/Makefile.in b/src/appl/telnet/Makefile.in index efe7e891e..d560e3b91 100644 --- a/src/appl/telnet/Makefile.in +++ b/src/appl/telnet/Makefile.in @@ -1,21 +1 @@ -TELNET_OPSYS= @TELNET@ - -all:: - cd libtelnet; make CC="${CC}" TELNET_OPSYS=$(TELNET_OPSYS) - cd telnet; make CC="${CC}" TELNET_OPSYS=$(TELNET_OPSYS) - cd telnetd; make CC="${CC}" TELNET_OPSYS=$(TELNET_OPSYS) - -clean:: - cd libtelnet; make CC="${CC}" TELNET_OPSYS=$(TELNET_OPSYS) clean - cd telnet; make CC="${CC}" TELNET_OPSYS=$(TELNET_OPSYS) clean - cd telnetd; make CC="${CC}" TELNET_OPSYS=$(TELNET_OPSYS) clean - -install:: - cd libtelnet; make CC="${CC}" DESTDIR=$(DESTDIR) \ - TELNET_OPSYS=$(TELNET_OPSYS) install - cd telnet; make CC="${CC}" DESTDIR=$(DESTDIR) \ - TELNET_OPSYS=$(TELNET_OPSYS) install - cd telnetd; make CC="${CC}" DESTDIR=$(DESTDIR) \ - TELNET_OPSYS=$(TELNET_OPSYS) install - - +CFLAGS=@CCOPTS@ diff --git a/src/appl/telnet/configure.in b/src/appl/telnet/configure.in index 7fb5a3feb..1d5e36a66 100644 --- a/src/appl/telnet/configure.in +++ b/src/appl/telnet/configure.in @@ -1,5 +1,8 @@ AC_INIT(configure.in) AC_SET_BUILDTOP CONFIG_DIRS(libtelnet telnet telnetd) +MAKE_SUBDIRS("making",all) +MAKE_SUBDIRS("cleaning",clean) +MAKE_SUBDIRS("installing",install) CONFIG_RULES AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/appl/telnet/libtelnet/Makefile.in b/src/appl/telnet/libtelnet/Makefile.in index 49a806108..3ccd4f069 100644 --- a/src/appl/telnet/libtelnet/Makefile.in +++ b/src/appl/telnet/libtelnet/Makefile.in @@ -1,44 +1,84 @@ -CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -LDFLAGS = -g - -ISODELIB=@ISODELIB@ -COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= - -all:: +# derived from the original Makefile.generic +# +# Copyright (c) 1991 The Regents of the University of California. +# All rights reserved. +# +# Redistribution and use in source and binary forms are permitted provided +# that: (1) source distributions retain this entire copyright notice and +# comment, and (2) distributions including binaries display the following +# acknowledgement: ``This product includes software developed by the +# University of California, Berkeley and its contributors'' in the +# documentation or other materials provided with the distribution and in +# all advertising materials mentioning features or use of this software. +# Neither the name of the University nor the names of its contributors may +# be used to endorse or promote products derived from this software without +# specific prior written permission. +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +# +# @(#)Makefile.generic 5.5 (Berkeley) 3/1/91 +# +AUTH_DEF=-DAUTHENTICATION -DKRB5 -DFORWARD -UNO_LOGIN_F -DLOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN +LOCALINCLUDES=-I.. +CFLAGS = $(CCOPTS) $(AUTH_DEF) $(DEFS) $(LOCALINCLUDES) +LIBOBJS=@LIBOBJS@ -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB) $(DBMLIB) +LIB= libtelnet.a +SRCS= $(srcdir)/auth.c \ + $(srcdir)/encrypt.c \ + $(srcdir)/genget.c \ + $(srcdir)/misc.c \ + $(srcdir)/kerberos.c \ + $(srcdir)/kerberos5.c \ + $(srcdir)/forward.c \ + $(srcdir)/spx.c \ + $(srcdir)/enc_des.c \ + $(srcdir)/rsaencpwd.c \ + $(srcdir)/krb4encpwd.c \ + $(srcdir)/read_password.c \ + $(srcdir)/setenv.c \ + $(srcdir)/getent.c \ + $(srcdir)/strdup.c \ + $(srcdir)/strcasecmp.c \ + $(srcdir)/strchr.c \ + $(srcdir)/strrchr.c \ + $(srcdir)/strftime.c \ + $(srcdir)/strerror.c +OBJS= auth.o encrypt.o genget.o \ + misc.o kerberos.o kerberos5.o forward.o spx.o enc_des.o \ + rsaencpwd.o krb4encpwd.o read_password.o \ + $(LIBOBJS) -# -# Everything happens in ../Makefile.config and Makefile.generic -# +TELNET_H= ../arpa/telnet.h -all: - @-if [ -f ../Config.local ]; \ - then \ - echo make -f ../Config.local WHAT="" CC="${CC}" \ - KLIB="$(KLIB)" DEPKLIB="$(DEPKLIB)"; \ - make -f ../Config.local WHAT="" CC="${CC}" \ - KLIB="$(KLIB)" DEPKLIB="$(DEPKLIB)"; \ - else \ - echo make -f ../Config.generic WHAT="" CC="${CC}" \ - KLIB="$(KLIB)" DEPKLIB="$(DEPKLIB)" $(TELNET_OPSYS); \ - make -f ../Config.generic WHAT="" CC="${CC}" \ - KLIB="$(KLIB)" DEPKLIB="$(DEPKLIB)" $(TELNET_OPSYS); \ - fi +all:: $(LIB) +$(LIB): $(OBJS) + $(RM) $(LIB) + $(ARADD) $@ `lorder ${OBJS} | tsort` + $(RANLIB) $@ -.DEFAULT: - @-if [ -f ../Config.local ]; \ - then \ - echo make -f ../Config.local WHAT=$@ CC="${CC}" \ - DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \ - make -f ../Config.local WHAT=$@ CC="${CC}" \ - DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \ - else \ - echo make -f ../Config.generic WHAT=$@ CC="${CC}" \ - DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \ - make -f ../Config.generic WHAT=$@ CC="${CC}" \ - DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \ - fi +clean:: + $(RM) $(LIB) +auth.o: $(TELNET_H) +auth.o: encrypt.h +auth.o: auth.h +auth.o: misc-proto.h +encrypt.o: $(TELNET_H) +encrypt.o: encrypt.h +encrypt.o: misc.h +kerberos.o: $(TELNET_H) +kerberos.o: encrypt.h +kerberos.o: auth.h +kerberos.o: misc.h +kerberos5.o: $(TELNET_H) +kerberos5.o: encrypt.h +kerberos5.o: auth.h +kerberos5.o: misc.h +misc.o: misc.h +enc_des.o: $(TELNET_H) +enc_des.o: encrypt.h +enc_des.o: key-proto.h +enc_des.o: misc-proto.h diff --git a/src/appl/telnet/libtelnet/configure.in b/src/appl/telnet/libtelnet/configure.in index ab9292c04..141723e8d 100644 --- a/src/appl/telnet/libtelnet/configure.in +++ b/src/appl/telnet/libtelnet/configure.in @@ -1,7 +1,15 @@ AC_INIT(auth.c) WITH_CCOPTS -AC_SET_BUILDTOP +ISODE_DEFS +ISODE_INCLUDE CONFIG_RULES +AC_SET_BUILDTOP +AC_PROG_ARCHIVE +AC_PROG_ARCHIVE_ADD +AC_PROG_RANLIB +AC_REPLACE_FUNCS([strcasecmp strdup setenv setsid strerror strftime getopt herror]) +AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT)) +LIBOBJS="$LIBOBJS getent.o" KRB_INCLUDE ISODE_INCLUDE AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in new file mode 100644 index 000000000..bc151ad2a --- /dev/null +++ b/src/appl/telnet/telnet/Makefile.in @@ -0,0 +1,63 @@ +# derived from the original Makefile.generic +# +# Copyright (c) 1991 The Regents of the University of California. +# All rights reserved. +# +# Redistribution and use in source and binary forms are permitted provided +# that: (1) source distributions retain this entire copyright notice and +# comment, and (2) distributions including binaries display the following +# acknowledgement: ``This product includes software developed by the +# University of California, Berkeley and its contributors'' in the +# documentation or other materials provided with the distribution and in +# all advertising materials mentioning features or use of this software. +# Neither the name of the University nor the names of its contributors may +# be used to endorse or promote products derived from this software without +# specific prior written permission. +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +# +# @(#)Makefile.generic 5.5 (Berkeley) 3/1/91 +# + +AUTH_DEF=-DAUTHENTICATION -DKRB5 -DFORWARD -UNO_LOGIN_F -DLOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN +OTHERDEFS=-DLINEMODE -DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON +LOCALINCLUDES=-I.. +CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES) +ARPA_TELNET= ../arpa/telnet.h +COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a +K4LIB = $(KRB4)/lib/libkrb.a +KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB) + +SRCS= commands.c main.c network.c ring.c \ + sys_bsd.c telnet.c terminal.c \ + utilities.c $(GETOPT_SRC) +ALLHC= $(SRCS) \ + defines.h externs.h fdset.h general.h \ + ring.h types.h + +OBJS= authenc.o commands.o main.o network.o ring.o sys_bsd.o \ + telnet.o terminal.o utilities.o $(GETOPT_OBJ) + +all:: telnet + +telnet: $(OBJS) + $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS) + +clean:: + $(RM) telnet + +install: $(MAN) FRC + install -s -o bin -g bin -m 755 telnet $(DEST) + install -c -o bin -g bin -m 444 telnet.0 $(DESTDIR)/usr/man/cat1 + +authenc.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET) +commands.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET) +main.o: defines.h externs.h ring.h +network.o: defines.h externs.h fdset.h ring.h $(ARPA_TELNET) +ring.o: general.h ring.h +sys_bsd.o: defines.h externs.h fdset.h ring.h types.h $(ARPA_TELNET) +telnet.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET) +terminal.o: externs.h ring.h types.h $(ARPA_TELNET) +tn3270.o: defines.h externs.h fdset.h general.h ring.h $(ARPA_TELNET) +utilities.o: defines.h externs.h fdset.h general.h ring.h $(ARPA_TELNET) diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in new file mode 100644 index 000000000..61301d6de --- /dev/null +++ b/src/appl/telnet/telnet/configure.in @@ -0,0 +1,24 @@ +AC_INIT(telnet.c) +WITH_CCOPTS +ISODE_DEFS +ISODE_INCLUDE +CONFIG_RULES +AC_SET_BUILDTOP +AC_PROG_INSTALL +KRB_INCLUDE +ISODE_INCLUDE +AC_HAVE_LIBRARY(termcap,AC_DEFINE(TERMCAP) +LIBS="$LIBS -ltermcap") +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 ], +[cc_t foo;],,AC_DEFINE(NO_CC_T)) +fi +fi +AC_FUNC_CHECK(gettosbyname,AC_DEFINE(HAS_GETTOS)) +AC_HEADER_CHECK(sys/filio.h,AC_DEFINE(FILIO_H)) +AC_HEADER_CHECK(sys/stream.h,AC_DEFINE(STREAMS)) +AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT)) +AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in new file mode 100644 index 000000000..9934da1d7 --- /dev/null +++ b/src/appl/telnet/telnetd/Makefile.in @@ -0,0 +1,66 @@ +# derived from the original Makefile.generic +# +# Copyright (c) 1991 The Regents of the University of California. +# All rights reserved. +# +# Redistribution and use in source and binary forms are permitted provided +# that: (1) source distributions retain this entire copyright notice and +# comment, and (2) distributions including binaries display the following +# acknowledgement: ``This product includes software developed by the +# University of California, Berkeley and its contributors'' in the +# documentation or other materials provided with the distribution and in +# all advertising materials mentioning features or use of this software. +# Neither the name of the University nor the names of its contributors may +# be used to endorse or promote products derived from this software without +# specific prior written permission. +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +# +# @(#)Makefile.generic 5.5 (Berkeley) 3/1/91 +# + +AUTH_DEF=-DAUTHENTICATION -DKRB5 -DFORWARD -UNO_LOGIN_F -DLOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN +OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON +LOCALINCLUDES=-I.. +CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES) +ARPA_TELNET= ../arpa/telnet.h +COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a +K4LIB = $(KRB4)/lib/libkrb.a +KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB) + +SRCS= $(srcdir)/telnetd.c \ + $(srcdir)/state.c \ + $(srcdir)/termstat.c \ + $(srcdir)/slc.c \ + $(srcdir)/sys_term.c \ + $(srcdir)/utility.c \ + $(srcdir)/global.c \ + $(srcdir)/authenc.c \ + $(GETTYSRC) +OBJS= telnetd.o \ + state.o \ + termstat.o \ + slc.o \ + sys_term.o \ + utility.o \ + global.o \ + authenc.o \ + $(GETTYOBJ) + +all:: telnetd + +telnetd: $(OBJS) + $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS) + +clean:: + $(RM) telnetd + +authenc.o: telnetd.h +global.o: defs.h ext.h $(ARPA_TELNET) +slc.o: telnetd.h defs.h ext.h $(ARPA_TELNET) +state.o: telnetd.h defs.h ext.h $(ARPA_TELNET) +sys_term.o: telnetd.h pathnames.h defs.h ext.h $(ARPA_TELNET) +telnetd.o: telnetd.h defs.h ext.h $(ARPA_TELNET) +termstat.o: telnetd.h defs.h ext.h $(ARPA_TELNET) +utility.o: telnetd.h defs.h ext.h $(ARPA_TELNET) diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in new file mode 100644 index 000000000..832f7d7b8 --- /dev/null +++ b/src/appl/telnet/telnetd/configure.in @@ -0,0 +1,24 @@ +AC_INIT(telnetd.c) +WITH_CCOPTS +ISODE_DEFS +ISODE_INCLUDE +CONFIG_RULES +AC_SET_BUILDTOP +AC_PROG_INSTALL +KRB_INCLUDE +ISODE_INCLUDE +AC_HAVE_LIBRARY(termcap,AC_DEFINE(TERMCAP) +LIBS="$LIBS -ltermcap") +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 ], +[cc_t foo;],,AC_DEFINE(NO_CC_T)) +fi +fi +AC_FUNC_CHECK(gettosbyname,AC_DEFINE(HAS_GETTOS)) +AC_HEADER_CHECK(sys/filio.h,AC_DEFINE(FILIO_H)) +AC_HEADER_CHECK(sys/stream.h,AC_DEFINE(STREAMS)) +AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT)) +AC_OUTPUT(Makefile,[EXTRA_RULES]) -- 2.26.2