svn rev #3284: trunk/ bsd/

[ghudson@MIT.EDU]

Commit By: ghudson
Log Message:
Use built-in autoconf macro for file existence tests.  The krb5 one
doesn't register symbols for use with AC_CONFIG_HEADERS.



Changed Files:
U   trunk/aclocal.m4
U   trunk/bsd/login.c
U   trunk/configure.ac
Modified: trunk/aclocal.m4
===================================================================
--- trunk/aclocal.m4	2009-11-20 15:29:22 UTC (rev 3283)
+++ trunk/aclocal.m4	2009-11-21 17:29:32 UTC (rev 3284)
@@ -225,50 +225,6 @@
 fi
 ])dnl
 dnl
-dnl Generic File existence tests
-dnl 
-dnl K5_AC_CHECK_FILE(FILE, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-AC_DEFUN(K5_AC_CHECK_FILE,
-[AC_REQUIRE([AC_PROG_CC])dnl
-dnl Do the transliteration at runtime so arg 1 can be a shell variable.
-ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(ac_cv_file_$ac_safe,
-[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 $1; then
-    eval "ac_cv_file_$ac_safe=yes"
-  else
-    eval "ac_cv_file_$ac_safe=no"
-  fi
-fi])dnl
-if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then
-  AC_MSG_RESULT(yes)
-  ifelse([$2], , :, [$2])
-else
-  AC_MSG_RESULT(no)
-ifelse([$3], , , [$3
-np])dnl
-fi
-])dnl
-dnl
-dnl K5_AC_CHECK_FILES(FILE... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-AC_DEFUN(K5_AC_CHECK_FILES,
-[AC_REQUIRE([AC_PROG_CC])dnl
-for ac_file in $1
-do
-K5_AC_CHECK_FILE($ac_file,
-[changequote(, )dnl
-  ac_tr_file=HAVE`echo $ac_file | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-changequote([, ])dnl
-  AC_DEFINE_UNQUOTED($ac_tr_file) $2], $3)dnl
-done
-])dnl
 AC_DEFUN(KRB5_AC_CHECK_FOR_CFLAGS,[
 AC_BEFORE([$0],[AC_PROG_CC])
 krb5_ac_cflags_set=${CFLAGS+set}

Modified: trunk/bsd/login.c
===================================================================
--- trunk/bsd/login.c	2009-11-20 15:29:22 UTC (rev 3283)
+++ trunk/bsd/login.c	2009-11-21 17:29:32 UTC (rev 3284)
@@ -654,7 +654,7 @@
     exit(1); \
 }
 
-#if defined(HAVE_ETC_ENVIRONMENT) || defined(HAVE_ETC_TIMEZONE)
+#if defined(HAVE__ETC_ENVIRONMENT) || defined(HAVE__ETC_TIMEZONE)
 static void
 read_env_vars_from_file (filename)
     char *filename;
@@ -1308,12 +1308,12 @@
     setenv ("LOGIN", pwd->pw_name, 1);
 
     /* read the /etc/environment file on AIX */
-#ifdef HAVE_ETC_ENVIRONMENT
+#ifdef HAVE__ETC_ENVIRONMENT
     read_env_vars_from_file ("/etc/environment");
 #endif
 
     /* Set login timezone for date information (sgi PDG) */
-#ifdef HAVE_ETC_TIMEZONE
+#ifdef HAVE__ETC_TIMEZONE
     read_env_vars_from_file ("/etc/TIMEZONE");
 #else
     if (tz)

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-11-20 15:29:22 UTC (rev 3283)
+++ trunk/configure.ac	2009-11-21 17:29:32 UTC (rev 3284)
@@ -361,7 +361,7 @@
 if test $krb5_cv_shadow_pwd = yes; then
 AC_DEFINE(HAVE_SHADOW,1,[Define if shadow password interface is available])
 fi
-K5_AC_CHECK_FILES(/etc/environment /etc/TIMEZONE)
+AC_CHECK_FILES(/etc/environment /etc/TIMEZONE)
 
 # bsd and libpty check POSIX_TERMIOS; telnet checks USE_TERMIO.
 AC_CHECK_HEADER(termios.h,