X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fprereq.m4;h=533b618f0a0657935956a14a846b0c61a40458af;hb=118c7c3af6b537e01580f3ddd29262cdc7ee17b9;hp=3be1d583a70c1552f8e9fb64fc997123e680a4c8;hpb=01f51ef2220b307bf827b5e55779b59806ea8655;p=gnulib.git

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index 3be1d583a..533b618f0 100644
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,4 +1,4 @@
-#serial 8
+#serial 13
 
 dnl These are the prerequisite macros for files in the lib/
 dnl directories of the fileutils, sh-utils, and textutils packages.
@@ -7,9 +7,12 @@ AC_DEFUN(jm_PREREQ,
 [
   jm_PREREQ_ADDEXT
   jm_PREREQ_CANON_HOST
+  jm_PREREQ_DIRNAME
   jm_PREREQ_ERROR
   jm_PREREQ_GETPAGESIZE
   jm_PREREQ_HUMAN
+  jm_PREREQ_MBSWIDTH
+  jm_PREREQ_MEMCHR
   jm_PREREQ_QUOTEARG
   jm_PREREQ_READUTMP
   jm_PREREQ_REGEX
@@ -38,40 +41,53 @@ AC_DEFUN(jm_PREREQ_CANON_HOST,
                    netinet/in.h arpa/inet.h)
 ])
 
+AC_DEFUN(jm_PREREQ_DIRNAME,
+[
+  AC_HEADER_STDC
+  AC_CHECK_HEADERS(string.h)
+])
+
+AC_DEFUN(jm_PREREQ_GETPAGESIZE,
+[
+  AC_CHECK_FUNCS(getpagesize)
+  AC_CHECK_HEADERS(OS.h unistd.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_CHECK_DECLS([getenv])
   AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
   AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
 ])
 
-AC_DEFUN(jm_PREREQ_GETPAGESIZE,
+AC_DEFUN(jm_PREREQ_MEMCHR,
 [
-  AC_CHECK_FUNCS(getpagesize)
-  AC_CHECK_HEADERS(OS.h unistd.h)
+  AC_CHECK_HEADERS(limits.h stdlib.h bp-sym.h)
 ])
 
 AC_DEFUN(jm_PREREQ_QUOTEARG,
 [
-  AC_CHECK_FUNCS(isascii mbrtowc)
+  AC_CHECK_FUNCS(isascii iswprint mbrtowc)
   AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
   AC_HEADER_STDC
   AC_C_BACKSLASH_A
+  AC_MBSTATE_T
   AM_C_PROTOTYPES
 ])
 
 AC_DEFUN(jm_PREREQ_READUTMP,
 [
   AC_HEADER_STDC
-  AC_CHECK_HEADERS(string.h utmpx.h sys/param.h)
+  AC_CHECK_HEADERS(string.h utmp.h utmpx.h sys/param.h)
   AC_CHECK_FUNCS(utmpname)
   AC_CHECK_FUNCS(utmpxname)
   AM_C_PROTOTYPES
 
-  utmp_includes="\
+  if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then
+    utmp_includes="\
 $ac_includes_default
 #ifdef HAVE_UTMPX_H
 # include <utmpx.h>
@@ -79,10 +95,12 @@ $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_LIBOBJ(readutmp)
+  fi
 ])
 
 AC_DEFUN(jm_PREREQ_REGEX,