From 3150d8ff380b161d4178f4415610bbe3fd8d4c84 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Thu, 4 Mar 2004 10:25:12 +0000 Subject: [PATCH] Configure telnet using one script instead of four git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16144 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/telnet/ChangeLog | 7 + src/appl/telnet/Makefile.in | 1 + src/appl/telnet/configure.in | 174 ++++++++++++++++++++++++- src/appl/telnet/libtelnet/ChangeLog | 5 + src/appl/telnet/libtelnet/Makefile.in | 4 +- src/appl/telnet/libtelnet/configure.in | 25 ---- src/appl/telnet/telnet/ChangeLog | 6 + src/appl/telnet/telnet/Makefile.in | 6 +- src/appl/telnet/telnet/configure.in | 61 --------- src/appl/telnet/telnetd/ChangeLog | 6 + src/appl/telnet/telnetd/Makefile.in | 6 +- src/appl/telnet/telnetd/configure.in | 90 ------------- 12 files changed, 207 insertions(+), 184 deletions(-) delete mode 100644 src/appl/telnet/libtelnet/configure.in delete mode 100644 src/appl/telnet/telnet/configure.in delete mode 100644 src/appl/telnet/telnetd/configure.in diff --git a/src/appl/telnet/ChangeLog b/src/appl/telnet/ChangeLog index c6dd9911d..a733c9999 100644 --- a/src/appl/telnet/ChangeLog +++ b/src/appl/telnet/ChangeLog @@ -1,3 +1,10 @@ +2004-03-04 Ken Raeburn + + * configure.in: Merged in code from subdir configure.in files. + Create the subdir Makefiles here. Substitute TELNET_LIBS and + TELNETD_LIBS with the appropriate sets of libraries. + * Makefile.in (LOCAL_SUBDIRS): Set to list the subdirs. + 2003-01-07 Ken Raeburn * Makefile.orig: Deleted. diff --git a/src/appl/telnet/Makefile.in b/src/appl/telnet/Makefile.in index 2b9bd59ae..32e41551f 100644 --- a/src/appl/telnet/Makefile.in +++ b/src/appl/telnet/Makefile.in @@ -2,3 +2,4 @@ thisconfigdir=. myfulldir=appl/telnet mydir=. BUILDTOP=$(REL)..$(S).. +LOCAL_SUBDIRS=libtelnet telnet telnetd diff --git a/src/appl/telnet/configure.in b/src/appl/telnet/configure.in index 9dccb58ca..04e4499cb 100644 --- a/src/appl/telnet/configure.in +++ b/src/appl/telnet/configure.in @@ -1,4 +1,174 @@ AC_INIT(configure.in) CONFIG_RULES -AC_CONFIG_SUBDIRS(libtelnet telnet telnetd) -V5_AC_OUTPUT_MAKEFILE +dnl AC_CONFIG_SUBDIRS(libtelnet telnet telnetd) +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_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 + SETENVSRC=setenv.c + SETENVOBJ=setenv.o + AC_SUBST([SETENVSRC]) + AC_SUBST([SETENVOBJ]) + AC_DEFINE([NEED_SETENV]) +fi +dnl +KRB5_NEED_PROTO([#include ],setenv) +AC_C_CONST +if test "$KRB4_LIB" = ''; then + AC_MSG_RESULT(No Kerberos 4 authentication) +else + AC_MSG_RESULT(Kerberos 4 authentication enabled) + AC_DEFINE(KRB4) +fi +KRB5_BUILD_LIBRARY_STATIC +KRB5_BUILD_LIBOBJS +dnl +old_LIBS="$LIBS" +dnl +dnl from old telnet/configure.in +dnl +AC_PROG_INSTALL +AC_FUNC_VFORK +AC_HEADER_STDARG +case $krb5_cv_host in +*-*-solaris*) + if test "$krb5_cv_prog_gcc" = yes; then + # Solaris 8 at least has curses.h that is noisy under gcc + ac_cv_header_curses_h=yes + fi + ;; +esac +dnl +dnl On some systems, term.h requires curses.h inclusion +AC_CHECK_HEADERS(term.h,,,dnl +[#ifdef HAVE_CURSES_H +#include +#endif +]) +dnl +AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP) +LIBS="$LIBS -ltermcap", + AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses", + AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses") +)) +KRB5_AC_INET6 +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) +if test -z "$ac_sysv_termio"; then + AC_MSG_CHECKING([for cc_t in termio.h]) + AC_CACHE_VAL(krb_cv_type_cc_t, + [AC_TRY_LINK([cc_t],[#include ], + [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 +KRB5_NEED_PROTO([#include +#include ],parsetos,1) +dnl +KRB5_NEED_PROTO([#include +#include +#include +#include ],herror,1) +dnl +CHECK_SIGNALS +if test "$KRB4_LIB" = ''; then + AC_MSG_RESULT(No Kerberos 4 authentication) +else + AC_MSG_RESULT(Kerberos 4 authentication enabled) + AC_DEFINE(KRB4) +fi +dnl +KRB5_BUILD_PROGRAM +dnl +TELNET_LIBS="$LIBS" +AC_SUBST(TELNET_LIBS) +LIBS="$old_LIBS" +dnl +dnl from old telnetd/configure.in +dnl +dnl AC_PROG_INSTALL +AC_CHECK_LIB(util,main) +AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP) +LIBS="$LIBS -ltermcap", + AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses", + AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses") +)) +dnl ... whole termios.h/termio.h/NO_CC_T thing again ... +AC_HEADER_TIME +dnl KRB5_AC_INET6 +dnl +dnl Test if speed_t needs to be defined +AC_CACHE_CHECK([if speed_t is defined], krb5_cv_type_speed_t, +[AC_TRY_COMPILE(dnl +[#include +#if STDC_HEADERS +#include +#include +#endif +#ifndef USE_TERMIO +#include +#else +# ifdef SYSV_TERMIO +# include +# else +# include +# endif +#endif +],[speed_t termspeed],krb5_cv_type_speed_t=yes, krb5_cv_type_speed_t=no)]) +if test $krb5_cv_type_speed_t = no; then + AC_DEFINE(speed_t, int) +fi; +dnl +dnl +dnl Make our operating system-specific security checks and definitions for +dnl login. +dnl +case $krb5_cv_host in +*-*-hpux*) + broken_streams=yes + ;; +*-*-linux*) + # Someday Linux may have a Streams user-level interface, so checking + # for sys/stream.h may not always work. But I'm reasonably + # sure Linux will never require pushing magic streams modules onto + # pty's! :-) --- TYT + broken_streams=yes + ;; +*-*-irix*) + # Irix doesn't have a working granpt, and more over + # you can't push anything onto a pty, so telnetd really + # Really wants to treat it as if it doesn't have streams + broken_streams=yes + ;; +esac +if test -z "$broken_streams" -a "$ac_cv_header_sys_stream_h" = yes; then + AC_CHECK_FUNC(grantpt,AC_DEFINE(STREAMSPTY)) +fi +AC_MSG_CHECKING([if setpgrp takes two arguments]) +dnl +AC_CACHE_VAL(krb5_cv_sys_setpgrp_two, +[AC_TRY_LINK( +[#include ],[setpgrp(0,0)], +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 +dnl +KRB5_NEED_PROTO([#include ],unsetenv,1) +dnl KRB5_NEED_PROTO([#include ],setenv,1) +dnl KRB5_BUILD_PROGRAM +dnl +TELNETD_LIBS="$LIBS" +AC_SUBST(TELNETD_LIBS) +LIBS="$old_LIBS" +dnl +V5_AC_OUTPUT_MAKEFILE(. libtelnet telnet telnetd) diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog index 4f9de7ade..ee96ebf12 100644 --- a/src/appl/telnet/libtelnet/ChangeLog +++ b/src/appl/telnet/libtelnet/ChangeLog @@ -1,3 +1,8 @@ +2004-03-04 Ken Raeburn + + * configure.in: Deleted; configure this dir from parent now. + * Makefile.in (thisconfigdir, mydir): Updated. + 2003-05-09 Tom Yu * kerberos5.c (kerberos5_send): Rename getlocalsubkey -> diff --git a/src/appl/telnet/libtelnet/Makefile.in b/src/appl/telnet/libtelnet/Makefile.in index 783415b31..80fcabf8c 100644 --- a/src/appl/telnet/libtelnet/Makefile.in +++ b/src/appl/telnet/libtelnet/Makefile.in @@ -1,6 +1,6 @@ -thisconfigdir=. +thisconfigdir=.. myfulldir=appl/telnet/libtelnet -mydir=. +mydir=libtelnet BUILDTOP=$(REL)..$(S)..$(S).. # derived from the original Makefile.generic # diff --git a/src/appl/telnet/libtelnet/configure.in b/src/appl/telnet/libtelnet/configure.in deleted file mode 100644 index 8767cd7d0..000000000 --- a/src/appl/telnet/libtelnet/configure.in +++ /dev/null @@ -1,25 +0,0 @@ -AC_INIT(auth.c) -CONFIG_RULES -AC_REPLACE_FUNCS([strcasecmp strdup setsid strerror strftime getopt herror parsetos]) -AC_CHECK_FUNCS(setenv unsetenv getenv gettosbyname cgetent) -AC_CHECK_HEADERS(stdlib.h string.h unistd.h) -if test $ac_cv_func_setenv = no || test $ac_cv_func_unsetenv = no \ - || test $ac_cv_func_getenv = no; then - SETENVSRC=setenv.c - SETENVOBJ=setenv.o - AC_SUBST([SETENVSRC]) - AC_SUBST([SETENVOBJ]) - AC_DEFINE([NEED_SETENV]) -fi -dnl -KRB5_NEED_PROTO([#include ],setenv) -AC_C_CONST -if test "$KRB4_LIB" = ''; then - AC_MSG_RESULT(No Kerberos 4 authentication) -else - AC_MSG_RESULT(Kerberos 4 authentication enabled) - AC_DEFINE(KRB4) -fi -KRB5_BUILD_LIBRARY_STATIC -KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog index 60f9bf1f0..91d52591a 100644 --- a/src/appl/telnet/telnet/ChangeLog +++ b/src/appl/telnet/telnet/ChangeLog @@ -1,3 +1,9 @@ +2004-03-04 Ken Raeburn + + * configure.in: Deleted; configure this dir from parent now. + * Makefile.in (thisconfigdir, mydir): Updated. + (LIBS): Define from @TELNET_LIBS@. + 2003-04-23 Ken Raeburn * externs.h: Don't declare errno. diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in index 20a9ae755..59ea1e0ca 100644 --- a/src/appl/telnet/telnet/Makefile.in +++ b/src/appl/telnet/telnet/Makefile.in @@ -1,6 +1,6 @@ -thisconfigdir=. +thisconfigdir=.. myfulldir=appl/telnet/telnet -mydir=. +mydir=telnet BUILDTOP=$(REL)..$(S)..$(S).. # derived from the original Makefile.generic # @@ -33,6 +33,8 @@ ARPA_TELNET= $(srcdir)/../arpa/telnet.h PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) +LIBS= @TELNET_LIBS@ + SRCS= $(srcdir)/authenc.c $(srcdir)/commands.c $(srcdir)/main.c $(srcdir)/network.c $(srcdir)/ring.c \ $(srcdir)/sys_bsd.c $(srcdir)/telnet.c $(srcdir)/terminal.c \ $(srcdir)/utilities.c $(GETOPT_SRC) diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in deleted file mode 100644 index c2fbd6342..000000000 --- a/src/appl/telnet/telnet/configure.in +++ /dev/null @@ -1,61 +0,0 @@ -AC_INIT(telnet.c) -CONFIG_RULES -AC_PROG_INSTALL -AC_FUNC_VFORK -AC_HEADER_STDARG -case $krb5_cv_host in -*-*-solaris*) - if test "$krb5_cv_prog_gcc" = yes; then - # Solaris 8 at least has curses.h that is noisy under gcc - ac_cv_header_curses_h=yes - fi - ;; -esac -AC_CHECK_HEADERS(string.h arpa/nameser.h unistd.h sys/select.h stdlib.h arpa/inet.h sys/filio.h curses.h) -dnl -dnl On some systems, term.h requires curses.h inclusion -AC_CHECK_HEADERS(term.h,,,dnl -[#ifdef HAVE_CURSES_H -#include -#endif -]) -dnl -AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP) -LIBS="$LIBS -ltermcap", - AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses", - AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses") -)) -KRB5_AC_INET6 -AC_CHECK_FUNCS(gettosbyname 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) -if test -z "$ac_sysv_termio"; then - AC_MSG_CHECKING([for cc_t in termio.h]) - AC_CACHE_VAL(krb_cv_type_cc_t, - [AC_TRY_LINK([cc_t],[#include ], - [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 -KRB5_NEED_PROTO([#include -#include ],parsetos,1) -dnl -KRB5_NEED_PROTO([#include -#include -#include -#include ],herror,1) -dnl -CHECK_SIGNALS -if test "$KRB4_LIB" = ''; then - AC_MSG_RESULT(No Kerberos 4 authentication) -else - AC_MSG_RESULT(Kerberos 4 authentication enabled) - AC_DEFINE(KRB4) -fi -dnl -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog index b343e9cc0..d1b44c702 100644 --- a/src/appl/telnet/telnetd/ChangeLog +++ b/src/appl/telnet/telnetd/ChangeLog @@ -1,3 +1,9 @@ +2004-03-04 Ken Raeburn + + * configure.in: Deleted; configure this dir from parent now. + * Makefile.in (thisconfigdir, mydir): Updated. + (LIBS): Define from @TELNETD_LIBS@. + 2003-04-23 Ken Raeburn * telnetd.h: Don't declare errno. diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in index 4fa637b74..40fdbefc6 100644 --- a/src/appl/telnet/telnetd/Makefile.in +++ b/src/appl/telnet/telnetd/Makefile.in @@ -1,6 +1,6 @@ -thisconfigdir=. +thisconfigdir=.. myfulldir=appl/telnet/telnetd -mydir=. +mydir=telnetd BUILDTOP=$(REL)..$(S)..$(S).. # derived from the original Makefile.generic # @@ -33,6 +33,8 @@ ARPA_TELNET= $(srcdir)/../arpa/telnet.h PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH) PROG_RPATH=$(KRB5_LIBDIR) +LIBS= @TELNETD_LIBS@ + SRCS= $(srcdir)/telnetd.c \ $(srcdir)/termio-tn.c \ $(srcdir)/termios-tn.c \ diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in deleted file mode 100644 index 7e5780d3a..000000000 --- a/src/appl/telnet/telnetd/configure.in +++ /dev/null @@ -1,90 +0,0 @@ -AC_INIT(telnetd.c) -CONFIG_RULES -AC_PROG_INSTALL -AC_CHECK_LIB(util,main) -AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP) -LIBS="$LIBS -ltermcap", - AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses", - AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses") -)) -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) -if test -z "$ac_sysv_termio"; then - AC_MSG_CHECKING([for cc_t in termio.h]) - AC_CACHE_VAL(krb_cv_type_cc_t, - [AC_TRY_LINK([cc_t],[#include ], - [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 -AC_CHECK_HEADERS(string.h arpa/nameser.h utmp.h sys/time.h sys/tty.h sac.h sys/ptyvar.h sys/filio.h sys/stream.h sys/utsname.h memory.h) -AC_CHECK_FUNCS(gettosbyname vsnprintf) -KRB5_AC_INET6 -dnl -dnl Test if speed_t needs to be defined -AC_CACHE_CHECK([if speed_t is defined], krb5_cv_type_speed_t, -[AC_TRY_COMPILE(dnl -[#include -#if STDC_HEADERS -#include -#include -#endif -#ifndef USE_TERMIO -#include -#else -# ifdef SYSV_TERMIO -# include -# else -# include -# endif -#endif -],[speed_t termspeed],krb5_cv_type_speed_t=yes, krb5_cv_type_speed_t=no)]) -if test $krb5_cv_type_speed_t = no; then - AC_DEFINE(speed_t, int) -fi; -dnl -dnl -dnl Make our operating system-specific security checks and definitions for -dnl login. -dnl -case $krb5_cv_host in -*-*-hpux*) - broken_streams=yes - ;; -*-*-linux*) - # Someday Linux may have a Streams user-level interface, so checking - # for sys/stream.h may not always work. But I'm reasonably - # sure Linux will never require pushing magic streams modules onto - # pty's! :-) --- TYT - broken_streams=yes - ;; -*-*-irix*) - # Irix doesn't have a working granpt, and more over - # you can't push anything onto a pty, so telnetd really - # Really wants to treat it as if it doesn't have streams - broken_streams=yes - ;; -esac -if test -z "$broken_streams" -a "$ac_cv_header_sys_stream_h" = yes; then - AC_CHECK_FUNC(grantpt,AC_DEFINE(STREAMSPTY)) -fi -AC_MSG_CHECKING([if setpgrp takes two arguments]) -dnl -AC_CACHE_VAL(krb5_cv_sys_setpgrp_two, -[AC_TRY_LINK( -[#include ],[setpgrp(0,0)], -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 -dnl -KRB5_NEED_PROTO([#include ],unsetenv,1) -KRB5_NEED_PROTO([#include ],setenv,1) -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE -- 2.26.2