* aclocal.m4 (CHECK_UTMP): Call AC_CHECK_FUNCS once instead of AC_CHECK_FUNC

for each function.
(CHECK_SIGPROCMASK, CHECK_SETJMP, CHECK_UTMP, AC_KRB5_TCL_TRYOLD,
KRB5_AC_LIBUTIL): Supply all three arguments in AC_DEFINE calls.

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

2 files changed, 17 insertions, 13 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f4075ec10a..759c54f9b5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-28  Ken Raeburn  <raeburn@mit.edu>
+
+	* aclocal.m4 (CHECK_UTMP): Call AC_CHECK_FUNCS once instead of
+	AC_CHECK_FUNC for each function.
+	(CHECK_SIGPROCMASK, CHECK_SETJMP, CHECK_UTMP, AC_KRB5_TCL_TRYOLD,
+	KRB5_AC_LIBUTIL): Supply all three arguments in AC_DEFINE calls.
+
 2006-03-27  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (all-windows): Don't go into include\krb5.
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 05452d19a0..940f0579c1 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -278,7 +278,7 @@ AC_TRY_LINK([#include <signal.h>], [sigmask(1);],
  krb5_cv_func_sigprocmask_use=no, krb5_cv_func_sigprocmask_use=yes))])
 AC_MSG_RESULT($krb5_cv_func_sigprocmask_use)
 if test $krb5_cv_func_sigprocmask_use = yes; then
- AC_DEFINE(USE_SIGPROCMASK)
+ AC_DEFINE(USE_SIGPROCMASK,1,[Define if sigprocmask should be used])
 fi
 ])dnl
 dnl
@@ -369,7 +369,7 @@ AC_CACHE_VAL(krb5_cv_struct_sigjmp_buf,
 krb5_cv_struct_sigjmp_buf=yes,krb5_cv_struct_sigjmp_buf=no)])
 AC_MSG_RESULT($krb5_cv_struct_sigjmp_buf)
 if test $krb5_cv_struct_sigjmp_buf = yes; then
-  AC_DEFINE(POSIX_SETJMP)
+  AC_DEFINE(POSIX_SETJMP,1,[Define if setjmp indicates POSIX interface])
 fi
 )])dnl
 dnl
@@ -754,7 +754,7 @@ AC_CACHE_VAL(krb5_cv_struct_ut_pid,
 krb5_cv_struct_ut_pid=yes, krb5_cv_struct_ut_pid=no)])
 AC_MSG_RESULT($krb5_cv_struct_ut_pid)
 if test $krb5_cv_struct_ut_pid = no; then
-  AC_DEFINE(NO_UT_PID)
+  AC_DEFINE(NO_UT_PID,1,[Define if ut_pid field not found])
 fi
 AC_MSG_CHECKING([ut_type in struct utmp])
 AC_CACHE_VAL(krb5_cv_struct_ut_type,
@@ -765,7 +765,7 @@ AC_CACHE_VAL(krb5_cv_struct_ut_type,
 krb5_cv_struct_ut_type=yes, krb5_cv_struct_ut_type=no)])
 AC_MSG_RESULT($krb5_cv_struct_ut_type)
 if test $krb5_cv_struct_ut_type = no; then
-  AC_DEFINE(NO_UT_TYPE)
+  AC_DEFINE(NO_UT_TYPE,1,[Define if ut_type field not found])
 fi
 AC_MSG_CHECKING([ut_host in struct utmp])
 AC_CACHE_VAL(krb5_cv_struct_ut_host,
@@ -776,7 +776,7 @@ AC_CACHE_VAL(krb5_cv_struct_ut_host,
 krb5_cv_struct_ut_host=yes, krb5_cv_struct_ut_host=no)])
 AC_MSG_RESULT($krb5_cv_struct_ut_host)
 if test $krb5_cv_struct_ut_host = no; then
-  AC_DEFINE(NO_UT_HOST)
+  AC_DEFINE(NO_UT_HOST,1,[Define if ut_host field not found])
 fi
 AC_MSG_CHECKING([ut_exit in struct utmp])
 AC_CACHE_VAL(krb5_cv_struct_ut_exit,
@@ -787,12 +787,9 @@ AC_CACHE_VAL(krb5_cv_struct_ut_exit,
 krb5_cv_struct_ut_exit=yes, krb5_cv_struct_ut_exit=no)])
 AC_MSG_RESULT($krb5_cv_struct_ut_exit)
 if test $krb5_cv_struct_ut_exit = no; then
-  AC_DEFINE(NO_UT_EXIT)
+  AC_DEFINE(NO_UT_EXIT,1,[Define if ut_exit field not found])
 fi
-AC_CHECK_FUNC(setutent,AC_DEFINE(HAVE_SETUTENT))
-AC_CHECK_FUNC(setutxent,AC_DEFINE(HAVE_SETUTXENT))
-AC_CHECK_FUNC(updwtmp,AC_DEFINE(HAVE_UPDWTMP))
-AC_CHECK_FUNC(updwtmpx,AC_DEFINE(HAVE_UPDWTMPX))
+AC_CHECK_FUNCS(setutent setutxent updwtmp updwtmpx)
 ])dnl
 dnl
 dnl WITH_NETLIB
@@ -1027,9 +1024,9 @@ if test "$with_tcl" != no ; then
 	CPPFLAGS="$CPPFLAGS $TCL_INCLUDES"
 	LDFLAGS="$LDFLAGS $TCL_LIBPATH"
 	tcl_header=no
-	AC_CHECK_HEADER(tcl.h,AC_DEFINE(HAVE_TCL_H) tcl_header=yes)
+	AC_CHECK_HEADER(tcl.h,AC_DEFINE(HAVE_TCL_H,1,[Define if tcl.h found]) tcl_header=yes)
 	if test $tcl_header=no; then
-	   AC_CHECK_HEADER(tcl/tcl.h,AC_DEFINE(HAVE_TCL_TCL_H) tcl_header=yes)
+	   AC_CHECK_HEADER(tcl/tcl.h,AC_DEFINE(HAVE_TCL_TCL_H,1,[Define if tcl/tcl.h found]) tcl_header=yes)
 	fi
 
 	if test $tcl_header = yes ; then
@@ -1790,7 +1787,7 @@ m4_include(config/ac-archive/acx_pthread.m4)
 #
 AC_DEFUN([KRB5_AC_LIBUTIL],
 	[AC_CHECK_LIB(util, main,
-		[AC_DEFINE(HAVE_LIBUTIL)
+		[AC_DEFINE(HAVE_LIBUTIL,1,[Define if util library is available with openpty, logwtmp, etc])
   UTIL_LIB=-lutil])dnl
 AC_SUBST(UTIL_LIB)
 ])