summaryrefslogtreecommitdiff
path: root/m4/fsusage.m4
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-11-13 10:56:26 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2018-11-13 10:59:31 -0800
commit7e2a1543985a770c93c9825c661bbb9b51b5e36f (patch)
treeeeeef6824307166014c2536d1e5b71e658e2180b /m4/fsusage.m4
parent5c0d8bb95bbd5354e6b2cd2e56a91afe4e780759 (diff)
downloademacs-7e2a1543985a770c93c9825c661bbb9b51b5e36f.tar.gz
emacs-7e2a1543985a770c93c9825c661bbb9b51b5e36f.tar.bz2
emacs-7e2a1543985a770c93c9825c661bbb9b51b5e36f.zip
Update from Gnulib
This incorporates: 2018-11-03 nstrftime: simplify test for mktime failure 2018-11-02 gnulib-common.m4: port _Noreturn to C++ 2018-10-22 std-gnu11: Support Autoconf versions < 2.64 2018-10-22 Assume Autoconf >= 2.63 2018-10-16 Remove support for Ultrix 2018-10-16 getloadavg: Remove support for ConvexOS 2018-10-16 getloadavg: Remove support for Sony NEWS 2018-10-16 Remove support for Dynix/ptx 2018-10-16 fsusage: Remove support for AIX 3 2018-10-16 fsusage, stat-size, getloadavg: Remove support for AIX PS/2 2018-10-16 getloadavg: Remove support for HP-UX on m68k 2018-10-16 fsusage, mountlist: Remove support for DolphinOS 2018-10-16 getloadavg: Remove support for Alliant FX/2800 2018-10-16 getloadavg: Remove support for tek4300 2018-10-16 getloadavg: Remove support for Ardent * build-aux/config.guess, build-aux/config.sub, lib/_Noreturn.h: * lib/fsusage.c, lib/getgroups.c, lib/getloadavg.c: * lib/nstrftime.c, lib/time.in.h, m4/errno_h.m4: * m4/fsusage.m4, m4/getgroups.m4, m4/gnulib-common.m4, m4/longlong.m4: * m4/std-gnu11.m4, m4/stdint.m4: Copy from Gnulib. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate:
Diffstat (limited to 'm4/fsusage.m4')
-rw-r--r--m4/fsusage.m445
1 files changed, 5 insertions, 40 deletions
diff --git a/m4/fsusage.m4 b/m4/fsusage.m4
index aab4024a975..c3ba4391ae2 100644
--- a/m4/fsusage.m4
+++ b/m4/fsusage.m4
@@ -1,4 +1,4 @@
-# serial 33
+# serial 34
# Obtaining file system usage information.
# Copyright (C) 1997-1998, 2000-2001, 2003-2018 Free Software Foundation, Inc.
@@ -199,14 +199,14 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1];
ac_fsusage_space=yes
AC_DEFINE([STAT_STATFS2_BSIZE], [1],
[Define if statfs takes 2 args and struct statfs has a field named f_bsize.
- (4.3BSD, SunOS 4, HP-UX, AIX PS/2)])
+ (4.3BSD, SunOS 4, HP-UX)])
fi
fi
if test $ac_fsusage_space = no; then
# SVR3
# (Solaris already handled above.)
- AC_CACHE_CHECK([for four-argument statfs (AIX-3.2.5, SVR3)],
+ AC_CACHE_CHECK([for four-argument statfs (SVR3)],
[fu_cv_sys_stat_statfs4],
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <sys/types.h>
@@ -224,7 +224,7 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1];
if test $fu_cv_sys_stat_statfs4 = yes; then
ac_fsusage_space=yes
AC_DEFINE([STAT_STATFS4], [1],
- [Define if statfs takes 4 args. (SVR3, Dynix, old Irix, old AIX, Dolphin)])
+ [Define if statfs takes 4 args. (SVR3, old Irix)])
fi
fi
@@ -263,41 +263,6 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1];
fi
fi
- if test $ac_fsusage_space = no; then
- # Ultrix
- AC_CACHE_CHECK([for two-argument statfs with struct fs_data (Ultrix)],
- [fu_cv_sys_stat_fs_data],
- [AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_FS_TYPES_H
-#include <sys/fs_types.h>
-#endif
- int
- main ()
- {
- struct fs_data fsd;
- /* Ultrix's statfs returns 1 for success,
- 0 for not mounted, -1 for failure. */
- return statfs (".", &fsd) != 1;
- }]])],
- [fu_cv_sys_stat_fs_data=yes],
- [fu_cv_sys_stat_fs_data=no],
- [fu_cv_sys_stat_fs_data=no])
- ])
- if test $fu_cv_sys_stat_fs_data = yes; then
- ac_fsusage_space=yes
- AC_DEFINE([STAT_STATFS2_FS_DATA], [1],
- [Define if statfs takes 2 args and the second argument has
- type struct fs_data. (Ultrix)])
- fi
- fi
-
AS_IF([test $ac_fsusage_space = yes], [$1], [$2])
])
@@ -337,6 +302,6 @@ choke -- this is a workaround for a Sun-specific problem
# Prerequisites of lib/fsusage.c not done by gl_FILE_SYSTEM_USAGE.
AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA],
[
- AC_CHECK_HEADERS([dustat.h sys/fs/s5param.h sys/statfs.h])
+ AC_CHECK_HEADERS([sys/fs/s5param.h sys/statfs.h])
gl_STATFS_TRUNCATES
])