parsing options, not EOF.
configure.in: Use standard autoconf test names. Change tests to define
standard autoconf CPP macro names, not the non-standard HAS_GETTOS,
etc.
main.c, commands.c: Use HAVE_GETTOSBYNAME instead of HAS_GETTOS
ring.c, externs.h: Use HAVE_SYS_FILIO_H instead of FILIO_H
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10570
dc483132-0cff-0310-8789-
dd5450dbe970
+1998-05-06 Theodore Ts'o <tytso@rsts-11.mit.edu>
+
+ * main.c (main): POSIX states that getopt returns -1 when it
+ is done parsing options, not EOF.
+
+ * configure.in: Use standard autoconf test names. Change tests
+ to define standard autoconf CPP macro names, not the
+ non-standard HAS_GETTOS, etc.
+
+ * main.c, commands.c: Use HAVE_GETTOSBYNAME instead of HAS_GETTOS
+
+ * ring.c, externs.h: Use HAVE_SYS_FILIO_H instead of FILIO_H
+
Wed Feb 18 15:38:05 1998 Tom Yu <tlyu@mit.edu>
* Makefile.in: Remove trailing slash from thisconfigdir. Fix up
#endif
#if defined(IPPROTO_IP) && defined(IP_TOS)
{
-# if defined(HAS_GETTOS)
+# if defined(HAVE_GETTOSBYNAME)
struct tosent *tp;
if (tos < 0 && (tp = gettosbyname("telnet", "tcp")))
tos = tp->t_tos;
CONFIG_RULES
AC_PROG_INSTALL
AC_VFORK
-AC_CHECK_HEADERS(string.h arpa/nameser.h)
-AC_HAVE_HEADERS(unistd.h sys/select.h stdlib.h arpa/inet.h)
+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(setupterm) dnl If we have it, use it so we don't get
-dnl endless loop with tcgetent
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)
fi
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_FUNC_CHECK(setupterm,AC_DEFINE(HAS_SETUPTERM))
CHECK_SIGNALS
if test "$KRB4_LIB" = ''; then
AC_MSG_RESULT(No Kerberos 4 authentication)
#if defined(CRAY) && !defined(NO_BSD_SETJMP)
#include <bsdsetjmp.h>
#endif
-#ifndef FILIO_H
+#ifndef HAVE_SYS_FILIO_H
#include <sys/ioctl.h>
#else
#include <sys/filio.h>
rlogin = (strncmp(prompt, "rlog", 4) == 0) ? '~' : _POSIX_VDISABLE;
autologin = -1;
- while ((ch = getopt(argc, argv, "8EKLS:X:acde:fFk:l:n:rt:x")) != EOF) {
+ while ((ch = getopt(argc, argv, "8EKLS:X:acde:fFk:l:n:rt:x")) != -1) {
switch(ch) {
case '8':
eight = 3; /* binary output and input */
break;
case 'S':
{
-#if defined(HAS_GETTOS) || (defined(IPPROTO_IP) && defined(IP_TOS))
+#if defined(HAVE_GETTOSBYNAME) || (defined(IPPROTO_IP) && defined(IP_TOS))
extern int tos;
if ((tos = parsetos(optarg, "tcp")) < 0)
#endif
#include <sys/types.h>
-#ifndef FILIO_H
+#ifndef HAVE_SYS_FILIO_H
#include <sys/ioctl.h>
#endif
#include <sys/socket.h>