configure.in: Clean up configure script. Check $cross_compiling

	instead of (no longer correct) cache variable; remove obsolete
	AC_C_CROSS.  Use AC_CHECK_FUNCS instead of individual AC_FUNC_CHECK
	calls for speed.  Change checks for strsave and utimes to use
	AC_CHECK_FUNCS

krcp.c, v4rcp.c: Change usages of HAS_STRSAVE and HAS_UTIMES to HAVE_*.

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

4 files changed, 18 insertions, 26 deletions

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index f89257019..3f9dbfdfc 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,14 @@
+Sat Feb 28 10:44:46 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* configure.in: Clean up configure script.  Check $cross_compiling
+		instead of (no longer correct) cache variable; remove
+		obsolete AC_C_CROSS.  Use AC_CHECK_FUNCS instead of
+		individual AC_FUNC_CHECK calls for speed.  Change checks
+		for strsave and utimes to use AC_CHECK_FUNCS
+
+	* krcp.c, v4rcp.c: Change usages of HAS_STRSAVE and HAS_UTIMES to
+	 	HAVE_*.
+
 Tue Feb 24 14:52:33 1998  Tom Yu  <tlyu@mit.edu>
 
 	* kcmd.c: Integrate ghudson's changes for client-side krb4
diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index d65486099..b91887b56 100644
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -63,25 +63,8 @@ AC_SUBST(V4RCPO)
 dnl
 AC_VFORK
 AC_TYPE_MODE_T
-AC_FUNC_CHECK(strsave,AC_DEFINE(HAS_STRSAVE))
-AC_FUNC_CHECK(utimes,AC_DEFINE(HAS_UTIMES))
-AC_CHECK_FUNCS(isatty inet_aton) 
-AC_FUNC_CHECK(gettosbyname,AC_DEFINE(HAVE_GETTOSBYNAME))
-AC_FUNC_CHECK(killpg,AC_DEFINE(HAVE_KILLPG))
-AC_FUNC_CHECK(initgroups,AC_DEFINE(HAVE_INITGROUPS))
-AC_FUNC_CHECK(setpriority,AC_DEFINE(HAVE_SETPRIORITY))
-AC_FUNC_CHECK(setreuid,AC_DEFINE(HAVE_SETREUID))
-AC_FUNC_CHECK(setresuid,AC_DEFINE(HAVE_SETRESUID))
-AC_FUNC_CHECK(waitpid,AC_DEFINE(HAVE_WAITPID))
-AC_FUNC_CHECK(setsid,AC_DEFINE(HAVE_SETSID))
-AC_FUNC_CHECK(ptsname,AC_DEFINE(HAVE_PTSNAME))
-AC_FUNC_CHECK(setlogin,AC_DEFINE(HAVE_SETLOGIN))
-AC_FUNC_CHECK(tcgetpgrp,AC_DEFINE(HAVE_TCGETPGRP))
-AC_FUNC_CHECK(tcsetpgrp,AC_DEFINE(HAVE_TCSETPGRP))
-AC_FUNC_CHECK(setpgid,AC_DEFINE(HAVE_SETPGID))
-AC_CHECK_HEADERS(unistd.h stdlib.h string.h sys/filio.h sys/sockio.h )
-AC_CHECK_HEADERS(sys/label.h sys/tty.h ttyent.h lastlog.h sys/select.h )
-AC_CHECK_HEADERS(sys/ptyvar.h utmp.h sys/time.h)
+AC_CHECK_FUNCS(isatty inet_aton gettosbyname killpg initgroups setpriority setreuid setresuid waitpid setsid ptsname setlogin tcgetpgrp tcsetpgrp setpgid strsave utimes)
+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 utmp.h sys/time.h)
 AC_HEADER_STDARG
 AC_REPLACE_FUNCS(getdtablesize)
 KRB5_SIGTYPE
@@ -175,8 +158,7 @@ dnl
 dnl
 AC_MSG_CHECKING([/etc/environment])
 AC_CACHE_VAL(krb5_cv_etc_environment,
-[AC_C_CROSS
-if test "$ac_cv_c_cross" = yes; then
+[if test "$cross_compiling" = yes; then
 errprint(__file__:__line__: warning: Cannot check for file existence when cross compiling
 )dnl
 AC_MSG_ERROR(Cannot check for file existence when cross compiling)
@@ -195,8 +177,7 @@ dnl
 dnl
 AC_MSG_CHECKING([/etc/TIMEZONE])
 AC_CACHE_VAL(krb5_cv_etc_timezone,
-[AC_C_CROSS
-if test "$ac_cv_c_cross" = yes; then
+[if test "$cross_compiling" = yes; then
 errprint(__file__:__line__: warning: Cannot check for file existence when cross compiling
 )dnl
 AC_MSG_ERROR(Cannot check for file existence when cross compiling)
diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c
index add74daff..1a1a862dd 100644
--- a/src/appl/bsd/krcp.c
+++ b/src/appl/bsd/krcp.c
@@ -883,7 +883,7 @@ krb5_sigtype
 }
 
 
-#if !defined(HAS_UTIMES)
+#if !defined(HAVE_UTIMES)
 #include <utime.h>
 #include <sys/time.h>
 
diff --git a/src/appl/bsd/v4rcp.c b/src/appl/bsd/v4rcp.c
index 7461b25ff..4ddef36da 100644
--- a/src/appl/bsd/v4rcp.c
+++ b/src/appl/bsd/v4rcp.c
@@ -82,7 +82,7 @@ void sink(), source(), rsource(), usage();
 /*VARARGS*/
 void	error();
 int	response();
-#if !defined(HAS_UTIMES)
+#if !defined(HAVE_UTIMES)
 int	utimes();
 #endif
 
@@ -654,7 +654,7 @@ krb5_sigtype lostconn()
 	exit(1);
 }
 
-#if !defined(HAS_UTIMES)
+#if !defined(HAVE_UTIMES)
 #include <utime.h>
 #include <sys/time.h>