texinfo update (Sun Apr 18 09:44:02 EDT 2004)

[Karl Berry]

Index: m4/prereq.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/prereq.m4,v
retrieving revision 1.6
retrieving revision 1.5
diff -c -r1.6 -r1.5
*** m4/prereq.m4        18 Apr 2004 13:33:14 -0000      1.6
--- m4/prereq.m4        11 Apr 2004 17:56:46 -0000      1.5
***************
*** 1,4 ****
! #serial 38
  
  dnl We use jm_ for non Autoconf macros.
  m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
--- 1,4 ----
! #serial 37
  
  dnl We use jm_ for non Autoconf macros.
  m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
***************
*** 120,126 ****
--- 120,173 ----
    AC_REQUIRE([AC_FUNC_REALLOC])
    AC_REQUIRE([jm_FUNC_STAT])
    AC_REQUIRE([jm_FUNC_UTIME])
+   AC_REQUIRE([jm_PREREQ_STAT])
    AC_REQUIRE([jm_XSTRTOIMAX])
    AC_REQUIRE([jm_XSTRTOUMAX])
    AC_REQUIRE([vb_FUNC_RENAME])
+ ])
+ 
+ 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)
+ 
+   # For `struct statfs' on Ultrix 4.4.
+   AC_CHECK_HEADERS([netinet/in.h nfs/nfs_clnt.h nfs/vfs.h],,,
+     [AC_INCLUDES_DEFAULT])
+ 
+   AC_REQUIRE([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
+ # if 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>
+ # elif HAVE_NETINET_IN_H && HAVE_NFS_NFS_CLNT_H && HAVE_NFS_VFS_H
+ /* Ultrix 4.4 needs these for the declaration of struct statfs.  */
+ #  include <netinet/in.h>
+ #  include <nfs/nfs_clnt.h>
+ #  include <nfs/vfs.h>
+ # endif
+ #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])
  ])
P m4/prereq.m4