(jm_PREREQ_READUTMP): Include utmp.h (if available), even

on systems with utmpx.h.  It's necessary for the declaration of utmp's
ut_user member.  Reported by Andreas Jaeger.

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index 533b618f0a0657935956a14a846b0c61a40458af..bd18e376b442d3cd94166770b8a083357daf389e 100644 (file)
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,4 +1,4 @@
-#serial 13
+#serial 14
 
 dnl These are the prerequisite macros for files in the lib/
 dnl directories of the fileutils, sh-utils, and textutils packages.
@@ -91,7 +91,8 @@ AC_DEFUN(jm_PREREQ_READUTMP,
 $ac_includes_default
 #ifdef HAVE_UTMPX_H
 # include <utmpx.h>
-#else
+#endif
+#ifdef HAVE_UTMP_H
 # include <utmp.h>
 #endif
 "