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

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index 4c8ac9384..3be1d583a 100644
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,4 +1,4 @@
-#serial 5
+#serial 8
 
 dnl These are the prerequisite macros for files in the lib/
 dnl directories of the fileutils, sh-utils, and textutils packages.
@@ -8,6 +8,8 @@ AC_DEFUN(jm_PREREQ,
   jm_PREREQ_ADDEXT
   jm_PREREQ_CANON_HOST
   jm_PREREQ_ERROR
+  jm_PREREQ_GETPAGESIZE
+  jm_PREREQ_HUMAN
   jm_PREREQ_QUOTEARG
   jm_PREREQ_READUTMP
   jm_PREREQ_REGEX
@@ -17,7 +19,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)
 ])
 
@@ -36,10 +38,26 @@ AC_DEFUN(jm_PREREQ_CANON_HOST,
                    netinet/in.h arpa/inet.h)
 ])
 
+# If you use human.c, you need the following files:
+# uintmax_t.m4 inttypes_h.m4 ulonglong.m4
+AC_DEFUN(jm_PREREQ_HUMAN,
+[
+  AC_CHECK_HEADERS(limits.h stdlib.h string.h)
+  AC_CHECK_DECLS((getenv))
+  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
+])
+
+AC_DEFUN(jm_PREREQ_GETPAGESIZE,
+[
+  AC_CHECK_FUNCS(getpagesize)
+  AC_CHECK_HEADERS(OS.h unistd.h)
+])
+
 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 +68,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,