X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fprereq.m4;h=c6210894d645ec41fc7ad71c6ffab5195b56752f;hb=047aa6648c1a2931496d6530a93d8a665fc2be2e;hp=f58d7387b3c45de31ad57a1b72689119ed56f179;hpb=eae97f9612f03822538da20f42fa473d0a7b7b9a;p=gnulib.git

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index f58d7387b..c6210894d 100644
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,4 +1,4 @@
-#serial 6
+#serial 9
 
 dnl These are the prerequisite macros for files in the lib/
 dnl directories of the fileutils, sh-utils, and textutils packages.
@@ -9,6 +9,7 @@ AC_DEFUN(jm_PREREQ,
   jm_PREREQ_CANON_HOST
   jm_PREREQ_ERROR
   jm_PREREQ_GETPAGESIZE
+  jm_PREREQ_HUMAN
   jm_PREREQ_QUOTEARG
   jm_PREREQ_READUTMP
   jm_PREREQ_REGEX
@@ -37,6 +38,16 @@ 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)
@@ -68,10 +79,10 @@ $ac_includes_default
 # 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_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,