.

diff --git a/aclocal.m4 b/aclocal.m4
index dae863d8fdf3c7e6021482cc99b86bdd3f64c9e1..95043784f3fb10e7a4e937270ad2392309065ad7 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1792,7 +1792,7 @@ AC_DEFUN([_jm_DECL_HEADERS],
                    unistd.h sys/time.h utmp.h utmpx.h)
 ])
 
-#serial 31
+#serial 32
 
 dnl We use jm_ for non Autoconf macros.
 m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
@@ -1994,6 +1994,10 @@ 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_REQUIRE([jm_AC_TYPE_LONG_LONG])
 
   statxfs_includes="\
@@ -2004,10 +2008,17 @@ $ac_includes_default
 #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 )
+#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>
+#  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])

diff --git a/config.hin b/config.hin
index 2bdf7827406bb11988e676ae016dd9554c2114c6..699fbe8d2b868ec015f130eddc180f55101f7f58 100644 (file)
--- a/config.hin
+++ b/config.hin
@@ -611,6 +611,12 @@
 /* Define to 1 if you have the `next_dev' function. */
 #undef HAVE_NEXT_DEV
 
+/* Define to 1 if you have the <nfs/nfs_clnt.h> header file. */
+#undef HAVE_NFS_NFS_CLNT_H
+
+/* Define to 1 if you have the <nfs/vfs.h> header file. */
+#undef HAVE_NFS_VFS_H
+
 /* Define to 1 if you have the <nlist.h> header file. */
 #undef HAVE_NLIST_H