diff options
| author | Jim Meyering <jim@meyering.net> | 2001-09-30 21:39:51 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2001-09-30 21:39:51 +0000 |
| commit | 034781fc4fa3db6882051b294e1e9d35d9f95f41 (patch) | |
| tree | 3b6c92ed2e37a0d186181798ae2f3bebf9e02786 /m4 | |
| parent | 2fa9e8e2d96d6df82d9c8513dd11f18c365fbc63 (diff) | |
| download | coreutils-034781fc4fa3db6882051b294e1e9d35d9f95f41.tar.xz | |
(jm_LIST_MOUNTED_FILESYSTEMS): See if
`struct fsstat' has the `f_fstypename' member.
Use that to define FS_TYPE, which is now used to make
the getfsstat link test tighter.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ls-mntd-fs.m4 | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4 index 797efe970..7229f78f5 100644 --- a/m4/ls-mntd-fs.m4 +++ b/m4/ls-mntd-fs.m4 @@ -11,6 +11,22 @@ AC_DEFUN([jm_LIST_MOUNTED_FILESYSTEMS], [ AC_CHECK_FUNCS(listmntent getmntinfo) AC_CHECK_HEADERS(mntent.h sys/param.h sys/ucred.h sys/mount.h sys/fs_types.h) + getfsstat_includes="\ +$ac_includes_default +#if HAVE_SYS_PARAM_H +# include <sys/param.h> /* needed by powerpc-apple-darwin1.3.7 */ +#endif +#if HAVE_SYS_UCRED_H +# include <sys/ucred.h> /* needed by powerpc-apple-darwin1.3.7 */ +#endif +#if HAVE_SYS_MOUNT_H +# include <sys/mount.h> +#endif +#if HAVE_SYS_FS_TYPES_H +# include <sys/fs_types.h> /* needed by powerpc-apple-darwin1.3.7 */ +#endif +" +AC_CHECK_MEMBERS([struct fsstat.f_fstypename],,,[$getfsstat_includes]) # Determine how to get the list of mounted filesystems. ac_list_mounted_fs= @@ -116,21 +132,16 @@ if test -z "$ac_list_mounted_fs"; then AC_CACHE_VAL(fu_cv_sys_mounted_getfsstat, [AC_TRY_LINK([ #include <sys/types.h> -#if HAVE_SYS_PARAM_H -# include <sys/param.h> /* needed by powerpc-apple-darwin1.3.7 */ +#if HAVE_STRUCT_FSSTAT_F_FSTYPENAME +# define FS_TYPE(Ent) ((Ent).f_fstypename) +#else +# define FS_TYPE(Ent) mnt_names[(Ent).f_type] #endif -#if HAVE_SYS_UCRED_H -#include <sys/ucred.h> /* needed by powerpc-apple-darwin1.3.7 */ -#endif -#if HAVE_SYS_MOUNT_H -#include <sys/mount.h> -#endif -#if HAVE_SYS_FS_TYPES_H -#include <sys/fs_types.h> /* needed by powerpc-apple-darwin1.3.7 */ -#endif -], +]$getfsstat_includes +, [struct statfs *stats; - int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ], + int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); + char *t = FS_TYPE (*stats); ], fu_cv_sys_mounted_getfsstat=yes, fu_cv_sys_mounted_getfsstat=no)]) AC_MSG_RESULT($fu_cv_sys_mounted_getfsstat) |