Mercurial > hg > octave-nkf > gnulib-hg
changeset 3539:e737d87d749a
(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.
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Sun, 30 Sep 2001 21:39:51 +0000 |
parents | 93e49f83e891 |
children | 202333c7e30b |
files | m4/ls-mntd-fs.m4 |
diffstat | 1 files changed, 24 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/ls-mntd-fs.m4 +++ b/m4/ls-mntd-fs.m4 @@ -11,6 +11,22 @@ [ 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 @@ 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 */ -#endif -#if HAVE_SYS_UCRED_H -#include <sys/ucred.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_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)