(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
index f478a14d9f444f3e7b654d6b3065b7ddc255736b..2f97d39380f971d52f49604e4988bcd49e06aadd 100644 (file)
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -51,6 +51,19 @@ AC_DEFUN(jm_PREREQ_READUTMP,
   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,