X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffsusage.m4;h=08bf06c9abde8ac449cfe1a4d05c3ee4b776ac08;hb=69d25acfd85067031a54285fb933d2e3ccfb0055;hp=a0ab1e15f31265636b2dd8eed802619e7d9d4543;hpb=eda39b870b7a8492713ff9ed649c9d4b7fb42968;p=gnulib.git diff --git a/m4/fsusage.m4 b/m4/fsusage.m4 index a0ab1e15f..08bf06c9a 100644 --- a/m4/fsusage.m4 +++ b/m4/fsusage.m4 @@ -1,28 +1,41 @@ -#serial 11 +#serial 22 +# Obtaining file system usage information. -# From fileutils/configure.in +# Copyright (C) 1997, 1998, 2000, 2001, 2003, 2004, 2005, 2006 Free Software +# Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# Written by Jim Meyering. AC_DEFUN([gl_FSUSAGE], [ AC_CHECK_HEADERS_ONCE(sys/param.h) - AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs_types.h) - jm_FILE_SYSTEM_USAGE([gl_cv_fs_space=yes], [gl_cv_fs_space=no]) + AC_CHECK_HEADERS_ONCE(sys/vfs.h sys/fs_types.h) + AC_CHECK_HEADERS(sys/mount.h, [], [], + [AC_INCLUDES_DEFAULT + [#if HAVE_SYS_PARAM_H + #include + #endif]]) + gl_FILE_SYSTEM_USAGE([gl_cv_fs_space=yes], [gl_cv_fs_space=no]) if test $gl_cv_fs_space = yes; then AC_LIBOBJ(fsusage) gl_PREREQ_FSUSAGE_EXTRA fi ]) -# Try to determine how a program can obtain filesystem usage information. +# Try to determine how a program can obtain file system usage information. # If successful, define the appropriate symbol (see fsusage.c) and # execute ACTION-IF-FOUND. Otherwise, execute ACTION-IF-NOT-FOUND. # -# jm_FILE_SYSTEM_USAGE([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +# gl_FILE_SYSTEM_USAGE([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -AC_DEFUN([jm_FILE_SYSTEM_USAGE], +AC_DEFUN([gl_FILE_SYSTEM_USAGE], [ -echo "checking how to get filesystem space usage..." +AC_MSG_NOTICE([checking how to get file system space usage]) ac_fsusage_space=no # Perform only the link test since it seems there are no variants of the @@ -35,10 +48,12 @@ if test $ac_fsusage_space = no; then # SVR4 AC_CACHE_CHECK([for statvfs function (SVR4)], fu_cv_sys_stat_statvfs, [AC_TRY_LINK([#include -#ifdef __GLIBC__ +#if defined __GLIBC__ && !defined __BEOS__ Do not use statvfs on systems with GNU libc, because that function stats all preceding entries in /proc/mounts, and that makes df hang if even one of the corresponding file systems is hard-mounted, but not available. +statvfs in GNU libc on BeOS operates differently: it only makes a system +call. #endif #include ], [struct statvfs fsd; statvfs (0, &fsd);], @@ -59,11 +74,12 @@ if test $ac_fsusage_space = no; then #include #include #include + int main () { struct statfs fsd; fsd.f_fsize = 0; - exit (statfs (".", &fsd, sizeof (struct statfs))); + return statfs (".", &fsd, sizeof (struct statfs)) != 0; }], fu_cv_sys_stat_statfs3_osf1=yes, fu_cv_sys_stat_statfs3_osf1=no, @@ -91,11 +107,12 @@ member (AIX, 4.3BSD)]) #ifdef HAVE_SYS_VFS_H #include #endif + int main () { struct statfs fsd; fsd.f_bsize = 0; - exit (statfs (".", &fsd)); + return statfs (".", &fsd) != 0; }], fu_cv_sys_stat_statfs2_bsize=yes, fu_cv_sys_stat_statfs2_bsize=no, @@ -115,10 +132,11 @@ if test $ac_fsusage_space = no; then AC_CACHE_VAL(fu_cv_sys_stat_statfs4, [AC_TRY_RUN([#include #include + int main () { struct statfs fsd; - exit (statfs (".", &fsd, sizeof fsd, 0)); + return statfs (".", &fsd, sizeof fsd, 0) != 0; }], fu_cv_sys_stat_statfs4=yes, fu_cv_sys_stat_statfs4=no, @@ -143,11 +161,12 @@ member (4.4BSD and NetBSD)]) #ifdef HAVE_SYS_MOUNT_H #include #endif + int main () { struct statfs fsd; fsd.f_fsize = 0; - exit (statfs (".", &fsd)); + return statfs (".", &fsd) != 0; }], fu_cv_sys_stat_statfs2_fsize=yes, fu_cv_sys_stat_statfs2_fsize=no, @@ -175,12 +194,13 @@ if test $ac_fsusage_space = no; then #ifdef HAVE_SYS_FS_TYPES_H #include #endif + int main () { struct fs_data fsd; /* Ultrix's statfs returns 1 for success, 0 for not mounted, -1 for failure. */ - exit (statfs (".", &fsd) != 1); + return statfs (".", &fsd) != 1; }], fu_cv_sys_stat_fs_data=yes, fu_cv_sys_stat_fs_data=no, @@ -199,7 +219,7 @@ if test $ac_fsusage_space = no; then AC_TRY_CPP([#include ], AC_DEFINE(STAT_READ_FILSYS, 1, - [Define if there is no specific function for reading filesystems usage + [Define if there is no specific function for reading file systems usage information and you have the header file. (SVR2)]) ac_fsusage_space=yes) fi @@ -212,7 +232,7 @@ AS_IF([test $ac_fsusage_space = yes], [$1], [$2]) # Check for SunOS statfs brokenness wrt partitions 2GB and larger. # If exists and struct statfs has a member named f_spare, # enable the work-around code in fsusage.c. -AC_DEFUN([jm_STATFS_TRUNCATES], +AC_DEFUN([gl_STATFS_TRUNCATES], [ AC_MSG_CHECKING([for statfs that truncates block counts]) AC_CACHE_VAL(fu_cv_sys_truncating_statfs, @@ -222,7 +242,8 @@ choke -- this is a workaround for a Sun-specific problem #endif #include #include ]], - [[struct statfs t; long c = *(t.f_spare);]])], + [[struct statfs t; long c = *(t.f_spare); + if (c) return 0;]])], [fu_cv_sys_truncating_statfs=yes], [fu_cv_sys_truncating_statfs=no])]) if test $fu_cv_sys_truncating_statfs = yes; then @@ -236,11 +257,9 @@ choke -- this is a workaround for a Sun-specific problem ]) -# Prerequisites of lib/fsusage.c not done by jm_FILE_SYSTEM_USAGE. +# Prerequisites of lib/fsusage.c not done by gl_FILE_SYSTEM_USAGE. AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA], [ - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) - AC_CHECK_HEADERS_ONCE(fcntl.h) - AC_CHECK_HEADERS(dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h sys/statvfs.h) - jm_STATFS_TRUNCATES + AC_CHECK_HEADERS(dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h) + gl_STATFS_TRUNCATES ])