projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add copyright notices to long-enough files that lack them, since
[gnulib.git]
/
m4
/
fsusage.m4
diff --git
a/m4/fsusage.m4
b/m4/fsusage.m4
index
306d0ef
..
451bd7d
100644
(file)
--- a/
m4/fsusage.m4
+++ b/
m4/fsusage.m4
@@
-1,7
+1,7
@@
-#
fsusage.m4 serial 14
+#
serial 18
# Obtaining file system usage information.
# Obtaining file system usage information.
-# Copyright (C) 1997, 1998, 2000, 2001, 2003, 2004 Free Software
+# Copyright (C) 1997, 1998, 2000, 2001, 2003, 2004
, 2005, 2006
Free Software
# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@@
-12,6
+12,8
@@
AC_DEFUN([gl_FSUSAGE],
[
AC_DEFUN([gl_FSUSAGE],
[
+ AC_LIBSOURCES([fsusage.c, fsusage.h])
+
AC_CHECK_HEADERS_ONCE(sys/param.h)
AC_CHECK_HEADERS_ONCE(sys/vfs.h sys/fs_types.h)
AC_CHECK_HEADERS(sys/mount.h, [], [],
AC_CHECK_HEADERS_ONCE(sys/param.h)
AC_CHECK_HEADERS_ONCE(sys/vfs.h sys/fs_types.h)
AC_CHECK_HEADERS(sys/mount.h, [], [],
@@
-72,11
+74,12
@@
if test $ac_fsusage_space = no; then
#include <sys/param.h>
#include <sys/types.h>
#include <sys/mount.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/mount.h>
+ int
main ()
{
struct statfs fsd;
fsd.f_fsize = 0;
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,
}],
fu_cv_sys_stat_statfs3_osf1=yes,
fu_cv_sys_stat_statfs3_osf1=no,
@@
-104,11
+107,12
@@
member (AIX, 4.3BSD)])
#ifdef HAVE_SYS_VFS_H
#include <sys/vfs.h>
#endif
#ifdef HAVE_SYS_VFS_H
#include <sys/vfs.h>
#endif
+ int
main ()
{
struct statfs fsd;
fsd.f_bsize = 0;
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,
}],
fu_cv_sys_stat_statfs2_bsize=yes,
fu_cv_sys_stat_statfs2_bsize=no,
@@
-128,10
+132,11
@@
if test $ac_fsusage_space = no; then
AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
[AC_TRY_RUN([#include <sys/types.h>
#include <sys/statfs.h>
AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
[AC_TRY_RUN([#include <sys/types.h>
#include <sys/statfs.h>
+ int
main ()
{
struct statfs fsd;
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,
}],
fu_cv_sys_stat_statfs4=yes,
fu_cv_sys_stat_statfs4=no,
@@
-156,11
+161,12
@@
member (4.4BSD and NetBSD)])
#ifdef HAVE_SYS_MOUNT_H
#include <sys/mount.h>
#endif
#ifdef HAVE_SYS_MOUNT_H
#include <sys/mount.h>
#endif
+ int
main ()
{
struct statfs fsd;
fsd.f_fsize = 0;
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,
}],
fu_cv_sys_stat_statfs2_fsize=yes,
fu_cv_sys_stat_statfs2_fsize=no,
@@
-188,12
+194,13
@@
if test $ac_fsusage_space = no; then
#ifdef HAVE_SYS_FS_TYPES_H
#include <sys/fs_types.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. */
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,
}],
fu_cv_sys_stat_fs_data=yes,
fu_cv_sys_stat_fs_data=no,
@@
-253,7
+260,6
@@
choke -- this is a workaround for a Sun-specific problem
AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA],
[
AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA],
[
AC_REQUIRE([gl_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)
gl_STATFS_TRUNCATES
])
AC_CHECK_HEADERS(dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h sys/statvfs.h)
gl_STATFS_TRUNCATES
])