X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fprereq.m4;h=f58d7387b3c45de31ad57a1b72689119ed56f179;hb=c0a697412199aa57fe24b7d2a11b58d78c410c2f;hp=d07d57b962256eab20f2d2674edc3a4d39ada364;hpb=b1a34f5a1042c891fa088069cf98275484037447;p=gnulib.git

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index d07d57b96..f58d7387b 100644
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,17 +1,27 @@
-#serial 3
+#serial 6
 
 dnl These are the prerequisite macros for files in the lib/
 dnl directories of the fileutils, sh-utils, and textutils packages.
 
 AC_DEFUN(jm_PREREQ,
 [
+  jm_PREREQ_ADDEXT
   jm_PREREQ_CANON_HOST
   jm_PREREQ_ERROR
+  jm_PREREQ_GETPAGESIZE
   jm_PREREQ_QUOTEARG
   jm_PREREQ_READUTMP
   jm_PREREQ_REGEX
 ])
 
+AC_DEFUN(jm_PREREQ_ADDEXT,
+[
+  dnl For addext.c.
+  AC_SYS_LONG_FILE_NAMES
+  AC_CHECK_FUNCS(pathconf)
+  AC_CHECK_HEADERS(limits.h string.h unistd.h)
+])
+
 AC_DEFUN(jm_PREREQ_CANON_HOST,
 [
   dnl Add any libraries as early as possible.
@@ -27,10 +37,16 @@ AC_DEFUN(jm_PREREQ_CANON_HOST,
                    netinet/in.h arpa/inet.h)
 ])
 
+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
@@ -41,7 +57,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,