X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fprereq.m4;h=6b26058b0ad93f762d6260ded0cd50a2a5f091ea;hb=2238bc8f821ef84c53dc823a67b4326b0b211da1;hp=eeaf32d878c7d1e8908d55e40a065434dbd43072;hpb=6291635890a444ddcf06ce126e60e9aed01ca689;p=gnulib.git

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index eeaf32d87..6b26058b0 100644
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,4 +1,4 @@
-#serial 21
+#serial 26
 
 dnl These are the prerequisite macros for files in the lib/
 dnl directories of the fileutils, sh-utils, and textutils packages.
@@ -6,18 +6,24 @@ dnl directories of the fileutils, sh-utils, and textutils packages.
 AC_DEFUN([jm_PREREQ],
 [
   jm_PREREQ_ADDEXT
+  jm_PREREQ_C_STACK
   jm_PREREQ_CANON_HOST
   jm_PREREQ_DIRNAME
   jm_PREREQ_ERROR
   jm_PREREQ_EXCLUDE
   jm_PREREQ_GETPAGESIZE
+  jm_PREREQ_HARD_LOCALE
   jm_PREREQ_HASH
   jm_PREREQ_HUMAN
   jm_PREREQ_MBSWIDTH
   jm_PREREQ_MEMCHR
+  jm_PREREQ_PHYSMEM
+  jm_PREREQ_POSIXVER
   jm_PREREQ_QUOTEARG
   jm_PREREQ_READUTMP
   jm_PREREQ_REGEX
+  jm_PREREQ_STAT
+  jm_PREREQ_STRNLEN
   jm_PREREQ_TEMPNAME # called by mkstemp
   jm_PREREQ_XGETCWD
   jm_PREREQ_XREADLINK
@@ -54,8 +60,8 @@ AC_DEFUN([jm_PREREQ_DIRNAME],
 
 AC_DEFUN([jm_PREREQ_EXCLUDE],
 [
-  jm_FUNC_FNMATCH
-  AC_CHECK_HEADERS(stdbool.h)
+  AC_FUNC_FNMATCH_GNU
+  AC_HEADER_STDBOOL
 ])
 
 AC_DEFUN([jm_PREREQ_GETPAGESIZE],
@@ -64,9 +70,17 @@ AC_DEFUN([jm_PREREQ_GETPAGESIZE],
   AC_CHECK_HEADERS(OS.h unistd.h)
 ])
 
+AC_DEFUN([jm_PREREQ_HARD_LOCALE],
+[
+  AC_CHECK_HEADERS(locale.h stdlib.h string.h)
+  AC_CHECK_FUNCS(setlocale)
+  AM_C_PROTOTYPES
+])
+
 AC_DEFUN([jm_PREREQ_HASH],
 [
-  AC_CHECK_HEADERS(stdlib.h stdbool.h)
+  AC_CHECK_HEADERS(stdlib.h)
+  AC_HEADER_STDBOOL
   AC_REQUIRE([jm_CHECK_DECLS])
 ])
 
@@ -84,6 +98,18 @@ AC_DEFUN([jm_PREREQ_MEMCHR],
   AC_CHECK_HEADERS(limits.h stdlib.h bp-sym.h)
 ])
 
+AC_DEFUN([jm_PREREQ_PHYSMEM],
+[
+  AC_CHECK_HEADERS(sys/pstat.h unistd.h)
+  AC_CHECK_FUNCS(pstat_getstatic pstat_getdynamic)
+])
+
+AC_DEFUN([jm_PREREQ_POSIXVER],
+[
+  AC_CHECK_HEADERS(unistd.h)
+  AC_CHECK_DECLS([getenv])
+])
+
 AC_DEFUN([jm_PREREQ_QUOTEARG],
 [
   AC_CHECK_FUNCS(isascii iswprint)
@@ -91,7 +117,7 @@ AC_DEFUN([jm_PREREQ_QUOTEARG],
   AC_CHECK_HEADERS(limits.h stddef.h stdlib.h string.h wchar.h wctype.h)
   AC_HEADER_STDC
   AC_C_BACKSLASH_A
-  AC_MBSTATE_T
+  AC_TYPE_MBSTATE_T
   AM_C_PROTOTYPES
 ])
 
@@ -119,6 +145,12 @@ $ac_includes_default
     AC_CHECK_MEMBERS([struct utmp.ut_name],,,[$utmp_includes])
     AC_CHECK_MEMBERS([struct utmpx.ut_type],,,[$utmp_includes])
     AC_CHECK_MEMBERS([struct utmp.ut_type],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmpx.ut_pid],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_pid],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmpx.ut_id],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_id],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmpx.ut_exit],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_exit],,,[$utmp_includes])
     AC_LIBOBJ(readutmp)
   fi
 ])
@@ -134,12 +166,61 @@ AC_DEFUN([jm_PREREQ_REGEX],
   AC_FUNC_ALLOCA
 ])
 
+AC_DEFUN([jm_PREREQ_STAT],
+[
+  AC_CHECK_HEADERS(sys/sysmacros.h sys/statvfs.h sys/vfs.h inttypes.h)
+  AC_CHECK_HEADERS(sys/param.h sys/mount.h)
+  AC_CHECK_FUNCS(statvfs)
+  jm_AC_TYPE_LONG_LONG
+
+  statxfs_includes="\
+$ac_includes_default
+#if HAVE_SYS_STATVFS_H
+# include <sys/statvfs.h>
+#endif
+#if HAVE_SYS_VFS_H
+# include <sys/vfs.h>
+#endif
+#if ( ! HAVE_SYS_STATVFS_H && ! HAVE_SYS_VFS_H && HAVE_SYS_MOUNT_H && HAVE_SYS_PARAM_H )
+/* NetBSD 1.5.2 needs these, for the declaration of struct statfs. */
+# include <sys/param.h>
+# include <sys/mount.h>
+#endif
+"
+  AC_CHECK_MEMBERS([struct statfs.f_basetype],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statvfs.f_basetype],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statfs.f_type],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statvfs.f_type],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statfs.f_fsid.__val],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statvfs.f_fsid.__val],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statfs.f_namemax],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statvfs.f_namemax],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statfs.f_namelen],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statvfs.f_namelen],,,[$statxfs_includes])
+])
+
+AC_DEFUN([jm_PREREQ_STRNLEN],
+[
+  AC_FUNC_STRNLEN
+  AC_HEADER_STDC
+  AC_CHECK_HEADERS(memory.h)
+  AC_CHECK_DECLS([memchr])
+
+  # This is necessary because automake-1.6.1 doens't understand
+  # that the above use of AC_FUNC_STRNLEN means we may have to use
+  # lib/strnlen.c.
+  test $ac_cv_func_strnlen_working = yes \
+    && AC_LIBOBJ(strnlen)
+])
+
 AC_DEFUN([jm_PREREQ_TEMPNAME],
 [
   AC_HEADER_STDC
   AC_HEADER_STAT
   AC_CHECK_HEADERS(fcntl.h sys/time.h stdint.h unistd.h)
   AC_CHECK_FUNCS(__secure_getenv gettimeofday)
+  AC_CHECK_DECLS([getenv])
 ])
 
 AC_DEFUN([jm_PREREQ_XGETCWD],