(jm_PREREQ_READUTMP): Don't check just

`struct utmpx.ut_exit' and `struct utmp.ut_exit'.  Instead, check
all combinations of utmp/utmpx and ut_termination/e_termination
and ut_exit/e_exit.

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index 37960793ca6aae934d1bb579e8de60c3103f2a6f..25931b94c79d1e628b63e23609a1c74ca7056501 100644 (file)
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -149,8 +149,16 @@ $ac_includes_default
     AC_CHECK_MEMBERS([struct utmp.ut_pid],,,[$utmp_includes])
     AC_CHECK_MEMBERS([struct utmpx.ut_id],,,[$utmp_includes])
     AC_CHECK_MEMBERS([struct utmp.ut_id],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmpx.ut_exit],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmp.ut_exit],,,[$utmp_includes])
+
+    AC_CHECK_MEMBERS([struct utmpx.ut_exit.ut_exit],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_exit.ut_exit],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmpx.ut_exit.e_exit],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_exit.e_exit],,,[$utmp_includes])
+
+    AC_CHECK_MEMBERS([struct utmpx.ut_exit.ut_termination],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_exit.ut_termination],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmpx.ut_exit.e_termination],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_exit.e_termination],,,[$utmp_includes])
     AC_LIBOBJ(readutmp)
   fi
 ])