From: Theodore Tso <tytso@mit.edu>
Date: Wed, 6 May 1998 20:40:44 +0000 (+0000)
Subject: Add a check for the header file krb4-proto.h.  Replace file existence
X-Git-Tag: krb5-1.1-beta1~733
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ab73e4c3979ad4b52dbc3e2230d911c626de7d7e;p=krb5.git

Add a check for the header file krb4-proto.h.  Replace file existence
tests for /etc/environment and /etc/TIMEZONE with K5_AC_CHECK_FILES.

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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 616a207ed..be08d2bb9 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,5 +1,9 @@
 1998-05-06  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
+	* configure.in: Add a check for the header file krb4-proto.h.
+		Replace file existence tests for /etc/environment and
+		/etc/TIMEZONE with K5_AC_CHECK_FILES.
+
 	* login.c (main): 
 	* krshd.c (main): 
 	* krlogind.c (main): POSIX states that getopt returns -1 when it
diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index b91887b56..25c3d1703 100644
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -64,7 +64,7 @@ dnl
 AC_VFORK
 AC_TYPE_MODE_T
 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_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 krb4-proto.h)
 AC_HEADER_STDARG
 AC_REPLACE_FUNCS(getdtablesize)
 KRB5_SIGTYPE
@@ -156,42 +156,7 @@ AC_DEFINE(HAVE_SHADOW)
 fi
 dnl
 dnl
-AC_MSG_CHECKING([/etc/environment])
-AC_CACHE_VAL(krb5_cv_etc_environment,
-[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)
-else
-if test -r /etc/environment; then
-krb5_cv_etc_environment=yes
-else
-krb5_cv_etc_environment=no
-fi
-fi])
-AC_MSG_RESULT($krb5_cv_etc_environment)
-if test $krb5_cv_etc_environment = yes; then
-AC_DEFINE(HAVE_ETC_ENVIRONMENT)
-fi
-dnl
-dnl
-AC_MSG_CHECKING([/etc/TIMEZONE])
-AC_CACHE_VAL(krb5_cv_etc_timezone,
-[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)
-else
-if test -r /etc/TIMEZONE; then
-krb5_cv_etc_timezone=yes
-else
-krb5_cv_etc_timezone=no
-fi
-fi])
-AC_MSG_RESULT($krb5_cv_etc_timezone)
-if test $krb5_cv_etc_timezone = yes; then
-AC_DEFINE(HAVE_ETC_TIMEZONE)
-fi
+K5_AC_CHECK_FILES(/etc/environment /etc/TIMEZONE)
 dnl
 dnl
 KRB5_CHECK_PROTOS