X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fprereq.m4;h=5ba47e96cc9a66c286581beef2971117418610bc;hb=7d2bfd12c67cee6eeeff51d049945e79ca8ee4bc;hp=edac917d4e7ef66baccb3dd56d10739ae9a14ac7;hpb=d5271a7e509bb410fc656607b6b69e6e49818da0;p=gnulib.git

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index edac917d4..5ba47e96c 100644
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,4 +1,4 @@
-#serial 5
+#serial 7
 
 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
@@ -36,6 +38,22 @@ 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)
@@ -50,6 +68,7 @@ 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="\