Re: Fix for stat on Ultrix

[Jim Meyering]

Bert Deknuydt <address@hidden> wrote:
> Hereby the fix for stat.c on Ultrix.  This is on Ultrix 4.4, but I expect
> the same fix will do for 4.3a and 4.5.
>
> Insert the following in stat.c, after the hack for NetBSD

Thank you.
I've installed the following changes and removed the note
about the Ultrix compilation failure from README.

        * src/stat.c: Add #include directives for Ultrix 4.4.
        Based on a suggested change from Bert Deknuydt.

Index: src/stat.c
===================================================================
RCS file: /fetish/cu/src/stat.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -u -r1.45 -r1.46
--- src/stat.c  22 Mar 2003 22:32:12 -0000      1.45
+++ src/stat.c  7 Apr 2003 18:11:39 -0000       1.46
@@ -32,11 +32,16 @@
 # include <sys/vfs.h>
 #endif
 
-/* NetBSD 1.5.2 needs these, for the declaration of struct statfs. */
 #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
 


        * prereq.m4 (jm_PREREQ_STAT): Add prerequisites and #includes
        for Ultrix 4.4.

Index: m4/prereq.m4
===================================================================
RCS file: /fetish/cu/m4/prereq.m4,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -u -r1.70 -r1.71
--- m4/prereq.m4        14 Mar 2003 20:45:03 -0000      1.70
+++ m4/prereq.m4        7 Apr 2003 18:12:31 -0000       1.71
@@ -1,4 +1,4 @@
-#serial 31
+#serial 32
 
 dnl We use jm_ for non Autoconf macros.
 m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
@@ -200,6 +200,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="\
@@ -210,10 +214,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])