# HG changeset patch
# User Jim Meyering <jim@meyering.net>
# Date 949250851 0
# Node ID d7cbccae7e0bef3298d8c052a6db3757e5db565f
# Parent  b3a94d16a5328f8a4b57a6456df528d775890397
(utmp_includes): Define.
Check for ut_user and ut_name members in both struct utmpx
and struct utmp.

diff --git a/m4/prereq.m4 b/m4/prereq.m4
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -51,6 +51,19 @@
   AC_CHECK_HEADERS(string.h utmpx.h sys/param.h)
   AC_CHECK_FUNCS(utmpname)
   AM_C_PROTOTYPES
+
+  utmp_includes="\
+$ac_includes_default
+#ifdef HAVE_UTMPX_H
+# include <utmpx.h>
+#else
+# include <utmp.h>
+#endif
+"
+  AC_CHECK_MEMBERS((struct utmpx.ut_user),,,[$utmp_includes])
+  AC_CHECK_MEMBERS((struct utmp.ut_user),,,[$utmp_includes])
+  AC_CHECK_MEMBERS((struct utmpx.ut_name),,,[$utmp_includes])
+  AC_CHECK_MEMBERS((struct utmp.ut_name),,,[$utmp_includes])
 ])
 
 AC_DEFUN(jm_PREREQ_REGEX,