From d84d59a45a9203ba179a213f5d2281be4da07b00 Mon Sep 17 00:00:00 2001
From: Theodore Tso <tytso@mit.edu>
Date: Thu, 22 Jun 1995 18:51:04 +0000
Subject: [PATCH] configure.in: Change AC_HAVE_HEADERS with AC_CHECK_HEADERS,
 and check for 	string.h as well.

krsh.c: Don't include ext-proto.h; move the #include of the header files
	which we actually needed into krsh.c, using the autoconf
	standard define's.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6125 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/appl/bsd/ChangeLog    |  9 +++++++++
 src/appl/bsd/configure.in |  2 +-
 src/appl/bsd/krsh.c       | 10 ++++++++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 2e69e25b8..6b2e2a24b 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jun 22 14:36:46 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* configure.in: Change AC_HAVE_HEADERS with AC_CHECK_HEADERS, and
+		check for string.h as well.
+
+	* krsh.c: Don't include ext-proto.h; move the #include of the
+		header files which we actually needed into krsh.c, using
+		the autoconf standard define's.
+
 Wed Jun 21 17:29:27 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* login.c: Change RETSIGTYPE to krb5_sigtype to be consistant.
diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index 57fa83107..616f7fe3a 100644
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -48,7 +48,7 @@ AC_FUNC_CHECK(grantpt,AC_DEFINE(HAVE_GRANTPT))
 AC_FUNC_CHECK(openpty,AC_DEFINE(HAVE_OPENPTY))
 AC_FUNC_CHECK(setlogin,AC_DEFINE(HAVE_SETLOGIN))
 AC_FUNC_CHECK(logwtmp,AC_DEFINE(HAVE_LOGWTMP))
-AC_HAVE_HEADERS(sys/filio.h sys/sockio.h unistd.h stdlib.h sys/label.h sys/tty.h ttyent.h lastlog.h sys/select.h sys/ptyvar.h)
+AC_CHECK_HEADERS(unistd.h stdlib.h string.h sys/filio.h sys/sockio.h sys/label.h sys/tty.h ttyent.h lastlog.h sys/select.h sys/ptyvar.h)
 AC_REPLACE_FUNCS(getdtablesize)
 DECLARE_SYS_ERRLIST
 KRB5_SIGTYPE
diff --git a/src/appl/bsd/krsh.c b/src/appl/bsd/krsh.c
index 74e4f0dc3..04eb36988 100644
--- a/src/appl/bsd/krsh.c
+++ b/src/appl/bsd/krsh.c
@@ -35,11 +35,18 @@ char copyright[] =
 
 #include <netinet/in.h>
 
-#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#include <strings.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#include <stdio.h>
 #include <errno.h>
 #include <signal.h>
 #include <pwd.h>
@@ -58,7 +65,6 @@ char copyright[] =
 #include "krb5.h"
 #include "com_err.h"
 #include "defines.h"
-#include "ext-proto.h"
 #endif /* KERBEROS */
      
 /*
-- 
2.26.2