From: Ezra Peisach <epeisach@mit.edu>
Date: Mon, 10 Jun 1996 02:13:14 +0000 (+0000)
Subject: 	* util.c (strstr): Replace crusty OS specific ifdef with configure
X-Git-Tag: krb5-1.0-beta7~408
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2203686d607885fd100c13fffa9f4bf2ca82c9da;p=krb5.git

	* util.c (strstr): Replace crusty OS specific ifdef with configure
		generated one.

	* configure.in: Change AC_HAVE_FUNCS to AC_CHECK_FUNCS (newer
		naming convention). Check for strstr.

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

diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog
index 717817b8d..22967bf1a 100644
--- a/src/admin/edit/ChangeLog
+++ b/src/admin/edit/ChangeLog
@@ -1,3 +1,11 @@
+Sun Jun  9 22:04:50 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* util.c (strstr): Replace crusty OS specific ifdef with configure
+		generated one. 
+
+	* configure.in: Change AC_HAVE_FUNCS to AC_CHECK_FUNCS (newer
+		naming convention). Check for strstr.
+
 Sat Jun  8 09:54:38 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* configure.in: Remove kdb4 library usage.
diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in
index be4c128fd..8cb6d044a 100644
--- a/src/admin/edit/configure.in
+++ b/src/admin/edit/configure.in
@@ -4,7 +4,7 @@ AC_PROG_INSTALL
 AC_PROG_YACC
 AC_CONST
 AC_HEADER_STDC
-AC_HAVE_FUNCS(getcwd)
+AC_CHECK_FUNCS(getcwd strstr)
 SS_RULES
 USE_KADM_LIBRARY
 USE_KDB5_LIBRARY
diff --git a/src/admin/edit/util.c b/src/admin/edit/util.c
index 78de2cd6f..859689454 100644
--- a/src/admin/edit/util.c
+++ b/src/admin/edit/util.c
@@ -33,7 +33,7 @@
 #include "k5-int.h"
 #include "./kdb5_edit.h"
 
-#if defined(sysvimp) || ( defined(mips) && defined(SYSTYPE_BSD43)) || (defined(vax) && !defined(ultrix))
+#if !defined(HAVE_STRSTR)
 char *
 strstr(s1, s2)
 char *s1;