From: Jim Meyering <jim@meyering.net>
Date: Sat, 27 Jul 2002 21:39:00 +0000 (+0000)
Subject: (jm_PREREQ_READUTMP): Don't check just
X-Git-Tag: SH-UTILS-2_0_13~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37a7d1433c518577fed23ecc81efe1a57950fc70;p=thirdparty%2Fcoreutils.git

(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 37960793ca..25931b94c7 100644
--- 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
 ])