X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fprereq.m4;h=3c5d16ae46e99d868f3100fc883ee80b6d5b09c1;hb=6ae064ff870571ee82f7d0cca2bb5d522e8e5dfa;hp=122d69e0572677577d559e3730b9299fc5373708;hpb=06beba337eda16b125c79240de86b99ef4bf64d0;p=gnulib.git

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index 122d69e05..3c5d16ae4 100644
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,56 +1,63 @@
-#serial 4
+#serial 27
 
 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,
+AC_DEFUN([jm_PREREQ],
 [
-  jm_PREREQ_CANON_HOST
+  gl_BACKUPFILE
+  jm_PREREQ_C_STACK
+  gl_CANON_HOST
+  gl_DIRNAME
   jm_PREREQ_ERROR
-  jm_PREREQ_QUOTEARG
-  jm_PREREQ_READUTMP
-  jm_PREREQ_REGEX
+  gl_EXCLUDE
+  gl_GETPAGESIZE
+  gl_HARD_LOCALE
+  gl_HASH
+  gl_HUMAN
+  gl_MBSWIDTH
+  gl_FUNC_MEMCHR
+  gl_PHYSMEM
+  gl_POSIXVER
+  gl_QUOTEARG
+  gl_READUTMP
+  gl_REGEX
+  jm_PREREQ_STAT
+  gl_FUNC_STRNLEN
+  gl_XGETCWD
+  gl_XREADLINK
 ])
 
-AC_DEFUN(jm_PREREQ_CANON_HOST,
+AC_DEFUN([jm_PREREQ_STAT],
 [
-  dnl Add any libraries as early as possible.
-  dnl In particular, inet_ntoa needs -lnsl at least on Solaris5.5.1,
-  dnl so we have to add -lnsl to LIBS before checking for that function.
-  AC_SEARCH_LIBS(gethostbyname, [inet nsl])
-
-  dnl These come from -lnsl on Solaris5.5.1.
-  AC_CHECK_FUNCS(gethostbyname gethostbyaddr inet_ntoa)
-
-  AC_CHECK_FUNCS(gethostbyname gethostbyaddr inet_ntoa)
-  AC_CHECK_HEADERS(unistd.h string.h netdb.h sys/socket.h \
-                   netinet/in.h arpa/inet.h)
-])
-
-AC_DEFUN(jm_PREREQ_QUOTEARG,
-[
-  AC_CHECK_FUNCS(isascii mbrtowc)
-  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h)
-  AC_HEADER_STDC
-  AC_C_BACKSLASH_A
-  AM_C_PROTOTYPES
-])
-
-AC_DEFUN(jm_PREREQ_READUTMP,
-[
-  AC_HEADER_STDC
-  AC_CHECK_HEADERS(string.h utmpx.h sys/param.h)
-  AC_CHECK_FUNCS(utmpname)
-  AM_C_PROTOTYPES
-])
-
-AC_DEFUN(jm_PREREQ_REGEX,
-[
-  dnl FIXME: Maybe provide a btowc replacement someday: solaris-2.5.1 lacks it.
-  dnl FIXME: Check for wctype and iswctype, and and add -lw if necessary
-  dnl to get them.
-  AC_CHECK_FUNCS(bzero bcopy isascii btowc)
-  AC_CHECK_HEADERS(alloca.h libintl.h wctype.h wchar.h)
-  AC_HEADER_STDC
-  AC_FUNC_ALLOCA
+  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])
 ])