X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fprereq.m4;h=f822efc715b3762ea90665cc6f6c121b78d153ee;hb=5cd34d5993366f3da19cfb620caad4532411389f;hp=4c8ac938448b980627dab08b929eea2755693415;hpb=77001f1cec22bbacb77add43e72b2de326238897;p=gnulib.git

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index 4c8ac9384..f822efc71 100644
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -17,7 +17,7 @@ AC_DEFUN(jm_PREREQ_ADDEXT,
 [
   dnl For addext.c.
   AC_SYS_LONG_FILE_NAMES
-  AC_CHECK_FUNC(pathconf)
+  AC_CHECK_FUNCS(pathconf)
   AC_CHECK_HEADERS(limits.h string.h unistd.h)
 ])
 
@@ -39,7 +39,7 @@ AC_DEFUN(jm_PREREQ_CANON_HOST,
 AC_DEFUN(jm_PREREQ_QUOTEARG,
 [
   AC_CHECK_FUNCS(isascii mbrtowc)
-  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h)
+  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
   AC_HEADER_STDC
   AC_C_BACKSLASH_A
   AM_C_PROTOTYPES
@@ -50,7 +50,21 @@ AC_DEFUN(jm_PREREQ_READUTMP,
   AC_HEADER_STDC
   AC_CHECK_HEADERS(string.h utmpx.h sys/param.h)
   AC_CHECK_FUNCS(utmpname)
+  AC_CHECK_FUNCS(utmpxname)
   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,