mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-18 09:19:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Sync with gnulib fa3e2ad20d10d648cc74a5d320ce531a80ff7b1f.

Browse Source 
Make better use of Autoconf.

* m4.include/gnulib/fsusage.m4: Use AC_CACHE_CHECK where possible.
  Modernize indentation.
* m4.include/gnulib/ls-mntd-fs.m4: Likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2018-10-14 11:52:06 +03:00
parent 849bfb26f8
commit 5cf5a034ae
2 changed files with 428 additions and 419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
m4.include/gnulib/fsusage.m4
View File

@ -1,4 +1,4 @@
# serial 32 # serial 33
# Obtaining file system usage information. # Obtaining file system usage information.
# Copyright (C) 1997-1998, 2000-2001, 2003-2017 Free Software Foundation, Inc. # Copyright (C) 1997-1998, 2000-2001, 2003-2017 Free Software Foundation, Inc.
@ -29,27 +29,30 @@ AC_DEFUN([gl_FSUSAGE],
AC_DEFUN([gl_FILE_SYSTEM_USAGE], AC_DEFUN([gl_FILE_SYSTEM_USAGE],
[ [
dnl Enable large-file support. This has the effect of changing the size dnl Enable large-file support. This has the effect of changing the size
dnl of field f_blocks in 'struct statvfs' from 32 bit to 64 bit on dnl of field f_blocks in 'struct statvfs' from 32 bit to 64 bit on
dnl glibc/Hurd, HP-UX 11, Solaris (32-bit mode). It also changes the size dnl glibc/Hurd, HP-UX 11, Solaris (32-bit mode). It also changes the size
dnl of field f_blocks in 'struct statfs' from 32 bit to 64 bit on dnl of field f_blocks in 'struct statfs' from 32 bit to 64 bit on
dnl Mac OS X >= 10.5 (32-bit mode). dnl Mac OS X >= 10.5 (32-bit mode).
AC_REQUIRE([AC_SYS_LARGEFILE]) AC_REQUIRE([AC_SYS_LARGEFILE])
AC_MSG_CHECKING([how to get file system space usage]) AC_MSG_CHECKING([how to get file system space usage])
ac_fsusage_space=no ac_fsusage_space=no
# Perform only the link test since it seems there are no variants of the # Perform only the link test since it seems there are no variants of the
# statvfs function. This check is more than just AC_CHECK_FUNCS([statvfs]) # statvfs function. This check is more than just AC_CHECK_FUNCS([statvfs])
# because that got a false positive on SCO OSR5. Adding the declaration # because that got a false positive on SCO OSR5. Adding the declaration
# of a 'struct statvfs' causes this test to fail (as it should) on such # of a 'struct statvfs' causes this test to fail (as it should) on such
# systems. That system is reported to work fine with STAT_STATFS4 which # systems. That system is reported to work fine with STAT_STATFS4 which
# is what it gets when this test fails. # is what it gets when this test fails.
if test $ac_fsusage_space = no; then if test $ac_fsusage_space = no; then
# glibc/{Hurd,kFreeBSD}, FreeBSD >= 5.0, NetBSD >= 3.0, # glibc/{Hurd,kFreeBSD}, FreeBSD >= 5.0, NetBSD >= 3.0,
# OpenBSD >= 4.4, AIX, HP-UX, IRIX, Solaris, Cygwin, Interix, BeOS. # OpenBSD >= 4.4, AIX, HP-UX, IRIX, Solaris, Cygwin, Interix, BeOS.
AC_CACHE_CHECK([for statvfs function (SVR4)], [fu_cv_sys_stat_statvfs], AC_CACHE_CHECK([for statvfs function (SVR4)],
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> [fu_cv_sys_stat_statvfs],
[AC_LINK_IFELSE(
[AC_LANG_PROGRAM([[
#include <sys/types.h>
#ifdef __osf__ #ifdef __osf__
"Do not use Tru64's statvfs implementation" "Do not use Tru64's statvfs implementation"
#endif #endif
@ -70,7 +73,8 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1];
]], ]],
[[statvfs (0, &fsd);]])], [[statvfs (0, &fsd);]])],
[fu_cv_sys_stat_statvfs=yes], [fu_cv_sys_stat_statvfs=yes],
[fu_cv_sys_stat_statvfs=no])]) [fu_cv_sys_stat_statvfs=no])
])
if test $fu_cv_sys_stat_statvfs = yes; then if test $fu_cv_sys_stat_statvfs = yes; then
ac_fsusage_space=yes ac_fsusage_space=yes
# AIX >= 5.2 has statvfs64 that has a wider f_blocks field than statvfs. # AIX >= 5.2 has statvfs64 that has a wider f_blocks field than statvfs.
@ -94,19 +98,20 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1];
]) ])
if test $fu_cv_sys_stat_statvfs64 = yes; then if test $fu_cv_sys_stat_statvfs64 = yes; then
AC_DEFINE([STAT_STATVFS64], [1], AC_DEFINE([STAT_STATVFS64], [1],
[ Define if statvfs64 should be preferred over statvfs.]) [Define if statvfs64 should be preferred over statvfs.])
else else
AC_DEFINE([STAT_STATVFS], [1], AC_DEFINE([STAT_STATVFS], [1],
[ Define if there is a function named statvfs. (SVR4)]) [Define if there is a function named statvfs. (SVR4)])
fi
fi fi
fi fi
fi
# Check for this unconditionally so we have a # Check for this unconditionally so we have a
# good fallback on glibc/Linux > 2.6 < 2.6.36 # good fallback on glibc/Linux > 2.6 < 2.6.36
AC_MSG_CHECKING([for two-argument statfs with statfs.f_frsize member]) AC_CACHE_CHECK([for two-argument statfs with statfs.f_frsize member],
AC_CACHE_VAL([fu_cv_sys_stat_statfs2_frsize], [fu_cv_sys_stat_statfs2_frsize],
[AC_RUN_IFELSE([AC_LANG_SOURCE([[ [AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
#include <sys/param.h> #include <sys/param.h>
#endif #endif
@ -125,19 +130,19 @@ AC_CACHE_VAL([fu_cv_sys_stat_statfs2_frsize],
}]])], }]])],
[fu_cv_sys_stat_statfs2_frsize=yes], [fu_cv_sys_stat_statfs2_frsize=yes],
[fu_cv_sys_stat_statfs2_frsize=no], [fu_cv_sys_stat_statfs2_frsize=no],
[fu_cv_sys_stat_statfs2_frsize=no])]) [fu_cv_sys_stat_statfs2_frsize=no])
AC_MSG_RESULT([$fu_cv_sys_stat_statfs2_frsize]) ])
if test $fu_cv_sys_stat_statfs2_frsize = yes; then if test $fu_cv_sys_stat_statfs2_frsize = yes; then
ac_fsusage_space=yes ac_fsusage_space=yes
AC_DEFINE([STAT_STATFS2_FRSIZE], [1], AC_DEFINE([STAT_STATFS2_FRSIZE], [1],
[ Define if statfs takes 2 args and struct statfs has a field named f_frsize. [Define if statfs takes 2 args and struct statfs has a field named f_frsize.
(glibc/Linux > 2.6)]) (glibc/Linux > 2.6)])
fi fi
if test $ac_fsusage_space = no; then if test $ac_fsusage_space = no; then
# DEC Alpha running OSF/1 # DEC Alpha running OSF/1
AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)]) AC_CACHE_CHECK([for 3-argument statfs function (DEC OSF/1)],
AC_CACHE_VAL([fu_cv_sys_stat_statfs3_osf1], [fu_cv_sys_stat_statfs3_osf1],
[AC_RUN_IFELSE([AC_LANG_SOURCE([[ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <sys/param.h> #include <sys/param.h>
#include <sys/types.h> #include <sys/types.h>
@ -151,25 +156,24 @@ if test $ac_fsusage_space = no; then
}]])], }]])],
[fu_cv_sys_stat_statfs3_osf1=yes], [fu_cv_sys_stat_statfs3_osf1=yes],
[fu_cv_sys_stat_statfs3_osf1=no], [fu_cv_sys_stat_statfs3_osf1=no],
[fu_cv_sys_stat_statfs3_osf1=no])]) [fu_cv_sys_stat_statfs3_osf1=no])
AC_MSG_RESULT([$fu_cv_sys_stat_statfs3_osf1]) ])
if test $fu_cv_sys_stat_statfs3_osf1 = yes; then if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
ac_fsusage_space=yes ac_fsusage_space=yes
AC_DEFINE([STAT_STATFS3_OSF1], [1], AC_DEFINE([STAT_STATFS3_OSF1], [1],
[ Define if statfs takes 3 args. (DEC Alpha running OSF/1)]) [Define if statfs takes 3 args. (DEC Alpha running OSF/1)])
fi
fi fi
fi
if test $ac_fsusage_space = no; then if test $ac_fsusage_space = no; then
# glibc/Linux, Mac OS X, FreeBSD < 5.0, NetBSD < 3.0, OpenBSD < 4.4. # glibc/Linux, Mac OS X, FreeBSD < 5.0, NetBSD < 3.0, OpenBSD < 4.4.
# (glibc/{Hurd,kFreeBSD}, FreeBSD >= 5.0, NetBSD >= 3.0, # (glibc/{Hurd,kFreeBSD}, FreeBSD >= 5.0, NetBSD >= 3.0,
# OpenBSD >= 4.4, AIX, HP-UX, OSF/1, Cygwin already handled above.) # OpenBSD >= 4.4, AIX, HP-UX, OSF/1, Cygwin already handled above.)
# (On IRIX you need to include <sys/statfs.h>, not only <sys/mount.h> and # (On IRIX you need to include <sys/statfs.h>, not only <sys/mount.h> and
# <sys/vfs.h>.) # <sys/vfs.h>.)
# (On Solaris, statfs has 4 arguments.) # (On Solaris, statfs has 4 arguments.)
AC_MSG_CHECKING([for two-argument statfs with statfs.f_bsize dnl AC_CACHE_CHECK([for two-argument statfs with statfs.f_bsize member (AIX, 4.3BSD)],
member (AIX, 4.3BSD)]) [fu_cv_sys_stat_statfs2_bsize],
AC_CACHE_VAL([fu_cv_sys_stat_statfs2_bsize],
[AC_RUN_IFELSE([AC_LANG_SOURCE([[ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
#include <sys/param.h> #include <sys/param.h>
@ -189,21 +193,21 @@ member (AIX, 4.3BSD)])
}]])], }]])],
[fu_cv_sys_stat_statfs2_bsize=yes], [fu_cv_sys_stat_statfs2_bsize=yes],
[fu_cv_sys_stat_statfs2_bsize=no], [fu_cv_sys_stat_statfs2_bsize=no],
[fu_cv_sys_stat_statfs2_bsize=no])]) [fu_cv_sys_stat_statfs2_bsize=no])
AC_MSG_RESULT([$fu_cv_sys_stat_statfs2_bsize]) ])
if test $fu_cv_sys_stat_statfs2_bsize = yes; then if test $fu_cv_sys_stat_statfs2_bsize = yes; then
ac_fsusage_space=yes ac_fsusage_space=yes
AC_DEFINE([STAT_STATFS2_BSIZE], [1], AC_DEFINE([STAT_STATFS2_BSIZE], [1],
[ Define if statfs takes 2 args and struct statfs has a field named f_bsize. [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, AIX PS/2)])
fi fi
fi fi
if test $ac_fsusage_space = no; then if test $ac_fsusage_space = no; then
# SVR3 # SVR3
# (Solaris already handled above.) # (Solaris already handled above.)
AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)]) AC_CACHE_CHECK([for four-argument statfs (AIX-3.2.5, SVR3)],
AC_CACHE_VAL([fu_cv_sys_stat_statfs4], [fu_cv_sys_stat_statfs4],
[AC_RUN_IFELSE([AC_LANG_SOURCE([[ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <sys/types.h> #include <sys/types.h>
#include <sys/statfs.h> #include <sys/statfs.h>
@ -215,24 +219,23 @@ if test $ac_fsusage_space = no; then
}]])], }]])],
[fu_cv_sys_stat_statfs4=yes], [fu_cv_sys_stat_statfs4=yes],
[fu_cv_sys_stat_statfs4=no], [fu_cv_sys_stat_statfs4=no],
[fu_cv_sys_stat_statfs4=no])]) [fu_cv_sys_stat_statfs4=no])
AC_MSG_RESULT([$fu_cv_sys_stat_statfs4]) ])
if test $fu_cv_sys_stat_statfs4 = yes; then if test $fu_cv_sys_stat_statfs4 = yes; then
ac_fsusage_space=yes ac_fsusage_space=yes
AC_DEFINE([STAT_STATFS4], [1], 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, Dynix, old Irix, old AIX, Dolphin)])
fi
fi fi
fi
if test $ac_fsusage_space = no; then if test $ac_fsusage_space = no; then
# 4.4BSD and older NetBSD # 4.4BSD and older NetBSD
# (OSF/1 already handled above.) # (OSF/1 already handled above.)
# (On AIX, you need to include <sys/statfs.h>, not only <sys/mount.h>.) # (On AIX, you need to include <sys/statfs.h>, not only <sys/mount.h>.)
# (On Solaris, statfs has 4 arguments and 'struct statfs' is not declared in # (On Solaris, statfs has 4 arguments and 'struct statfs' is not declared in
# <sys/mount.h>.) # <sys/mount.h>.)
AC_MSG_CHECKING([for two-argument statfs with statfs.f_fsize dnl AC_CACHE_CHECK([for two-argument statfs with statfs.f_fsize member (4.4BSD and NetBSD)],
member (4.4BSD and NetBSD)]) [fu_cv_sys_stat_statfs2_fsize],
AC_CACHE_VAL([fu_cv_sys_stat_statfs2_fsize],
[AC_RUN_IFELSE([AC_LANG_SOURCE([[ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
@ -250,20 +253,20 @@ member (4.4BSD and NetBSD)])
}]])], }]])],
[fu_cv_sys_stat_statfs2_fsize=yes], [fu_cv_sys_stat_statfs2_fsize=yes],
[fu_cv_sys_stat_statfs2_fsize=no], [fu_cv_sys_stat_statfs2_fsize=no],
[fu_cv_sys_stat_statfs2_fsize=no])]) [fu_cv_sys_stat_statfs2_fsize=no])
AC_MSG_RESULT([$fu_cv_sys_stat_statfs2_fsize]) ])
if test $fu_cv_sys_stat_statfs2_fsize = yes; then if test $fu_cv_sys_stat_statfs2_fsize = yes; then
ac_fsusage_space=yes ac_fsusage_space=yes
AC_DEFINE([STAT_STATFS2_FSIZE], [1], AC_DEFINE([STAT_STATFS2_FSIZE], [1],
[ Define if statfs takes 2 args and struct statfs has a field named f_fsize. [Define if statfs takes 2 args and struct statfs has a field named f_fsize.
(4.4BSD, NetBSD)]) (4.4BSD, NetBSD)])
fi fi
fi fi
if test $ac_fsusage_space = no; then if test $ac_fsusage_space = no; then
# Ultrix # Ultrix
AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)]) AC_CACHE_CHECK([for two-argument statfs with struct fs_data (Ultrix)],
AC_CACHE_VAL([fu_cv_sys_stat_fs_data], [fu_cv_sys_stat_fs_data],
[AC_RUN_IFELSE([AC_LANG_SOURCE([[ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
@ -285,17 +288,17 @@ if test $ac_fsusage_space = no; then
}]])], }]])],
[fu_cv_sys_stat_fs_data=yes], [fu_cv_sys_stat_fs_data=yes],
[fu_cv_sys_stat_fs_data=no], [fu_cv_sys_stat_fs_data=no],
[fu_cv_sys_stat_fs_data=no])]) [fu_cv_sys_stat_fs_data=no])
AC_MSG_RESULT([$fu_cv_sys_stat_fs_data]) ])
if test $fu_cv_sys_stat_fs_data = yes; then if test $fu_cv_sys_stat_fs_data = yes; then
ac_fsusage_space=yes ac_fsusage_space=yes
AC_DEFINE([STAT_STATFS2_FS_DATA], [1], AC_DEFINE([STAT_STATFS2_FS_DATA], [1],
[ Define if statfs takes 2 args and the second argument has [Define if statfs takes 2 args and the second argument has
type struct fs_data. (Ultrix)]) type struct fs_data. (Ultrix)])
fi fi
fi fi
AS_IF([test $ac_fsusage_space = yes], [$1], [$2]) AS_IF([test $ac_fsusage_space = yes], [$1], [$2])
]) ])
@ -305,18 +308,22 @@ AS_IF([test $ac_fsusage_space = yes], [$1], [$2])
# enable the work-around code in fsusage.c. # enable the work-around code in fsusage.c.
AC_DEFUN([gl_STATFS_TRUNCATES], AC_DEFUN([gl_STATFS_TRUNCATES],
[ [
AC_MSG_CHECKING([for statfs that truncates block counts]) AC_CACHE_CHECK([for statfs that truncates block counts],
AC_CACHE_VAL([fu_cv_sys_truncating_statfs], [fu_cv_sys_truncating_statfs],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ [AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[
#if !defined(sun) && !defined(__sun) #if !defined(sun) && !defined(__sun)
choke -- this is a workaround for a Sun-specific problem choke -- this is a workaround for a Sun-specific problem
#endif #endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/vfs.h>]], #include <sys/vfs.h>
]],
[[struct statfs t; long c = *(t.f_spare); [[struct statfs t; long c = *(t.f_spare);
if (c) return 0;]])], if (c) return 0;
]])],
[fu_cv_sys_truncating_statfs=yes], [fu_cv_sys_truncating_statfs=yes],
[fu_cv_sys_truncating_statfs=no])]) [fu_cv_sys_truncating_statfs=no])
])
if test $fu_cv_sys_truncating_statfs = yes; then if test $fu_cv_sys_truncating_statfs = yes; then
AC_DEFINE([STATFS_TRUNCATES_BLOCK_COUNTS], [1], AC_DEFINE([STATFS_TRUNCATES_BLOCK_COUNTS], [1],
[Define if the block counts reported by statfs may be truncated to 2GB [Define if the block counts reported by statfs may be truncated to 2GB
@ -324,7 +331,6 @@ choke -- this is a workaround for a Sun-specific problem
(SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem. (SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem.
SunOS 4.1.1 seems not to be affected.)]) SunOS 4.1.1 seems not to be affected.)])
fi fi
AC_MSG_RESULT([$fu_cv_sys_truncating_statfs])
]) ])

217
m4.include/gnulib/ls-mntd-fs.m4
View File

@ -1,4 +1,4 @@
# serial 33 # serial 34
# How to list mounted file systems. # How to list mounted file systems.
# Copyright (C) 1998-2004, 2006, 2009-2017 Free Software Foundation, Inc. # Copyright (C) 1998-2004, 2006, 2009-2017 Free Software Foundation, Inc.
@ -17,30 +17,32 @@ dnl
# through Autoconf 2.59. We can remove this once we assume Autoconf 2.60 # through Autoconf 2.59. We can remove this once we assume Autoconf 2.60
# or later. # or later.
AC_DEFUN([AC_FUNC_GETMNTENT], AC_DEFUN([AC_FUNC_GETMNTENT],
[# getmntent is in the standard C library on UNICOS, in -lsun on Irix 4, [
# -lseq on Dynix/PTX, -lgen on Unixware. # getmntent is in the standard C library on UNICOS, in -lsun on Irix 4,
AC_SEARCH_LIBS([getmntent], [sun seq gen]) # -lseq on Dynix/PTX, -lgen on Unixware.
AC_CHECK_FUNCS([getmntent]) AC_SEARCH_LIBS([getmntent], [sun seq gen])
AC_CHECK_FUNCS([getmntent])
]) ])
# gl_LIST_MOUNTED_FILE_SYSTEMS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) # gl_LIST_MOUNTED_FILE_SYSTEMS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
AC_DEFUN([gl_LIST_MOUNTED_FILE_SYSTEMS], AC_DEFUN([gl_LIST_MOUNTED_FILE_SYSTEMS],
[ [
AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_CANONICAL_HOST])
AC_CHECK_FUNCS([listmntent getmntinfo]) AC_CHECK_FUNCS([listmntent getmntinfo])
AC_CHECK_HEADERS_ONCE([sys/param.h sys/statvfs.h]) AC_CHECK_HEADERS_ONCE([sys/param.h sys/statvfs.h])
# We must include grp.h before ucred.h on OSF V4.0, since ucred.h uses # We must include grp.h before ucred.h on OSF V4.0, since ucred.h uses
# NGROUPS (as the array dimension for a struct member) without a definition. # NGROUPS (as the array dimension for a struct member) without a definition.
AC_CHECK_HEADERS([sys/ucred.h], [], [], [#include <grp.h>]) AC_CHECK_HEADERS([sys/ucred.h], [], [], [#include <grp.h>])
AC_CHECK_HEADERS([sys/mount.h], [], [], AC_CHECK_HEADERS([sys/mount.h], [], [],
[AC_INCLUDES_DEFAULT [AC_INCLUDES_DEFAULT
[#if HAVE_SYS_PARAM_H [#if HAVE_SYS_PARAM_H
#include <sys/param.h> #include <sys/param.h>
#endif]]) #endif
]])
AC_CHECK_HEADERS([mntent.h sys/fs_types.h]) AC_CHECK_HEADERS([mntent.h sys/fs_types.h])
getfsstat_includes="\ getfsstat_includes="\
$ac_includes_default $ac_includes_default
#if HAVE_SYS_PARAM_H #if HAVE_SYS_PARAM_H
@ -57,28 +59,28 @@ $ac_includes_default
# include <sys/fs_types.h> /* needed by powerpc-apple-darwin1.3.7 */ # include <sys/fs_types.h> /* needed by powerpc-apple-darwin1.3.7 */
#endif #endif
" "
AC_CHECK_MEMBERS([struct fsstat.f_fstypename],,,[$getfsstat_includes]) AC_CHECK_MEMBERS([struct fsstat.f_fstypename],,,[$getfsstat_includes])
# Determine how to get the list of mounted file systems. # Determine how to get the list of mounted file systems.
ac_list_mounted_fs= ac_list_mounted_fs=
# If the getmntent function is available but not in the standard library, # If the getmntent function is available but not in the standard library,
# make sure LIBS contains the appropriate -l option. # make sure LIBS contains the appropriate -l option.
AC_FUNC_GETMNTENT AC_FUNC_GETMNTENT
# This test must precede the ones for getmntent because Unicos-9 is # This test must precede the ones for getmntent because Unicos-9 is
# reported to have the getmntent function, but its support is incompatible # reported to have the getmntent function, but its support is incompatible
# with other getmntent implementations. # with other getmntent implementations.
# NOTE: Normally, I wouldn't use a check for system type as I've done for # NOTE: Normally, I wouldn't use a check for system type as I've done for
# 'CRAY' below since that goes against the whole autoconf philosophy. But # 'CRAY' below since that goes against the whole autoconf philosophy. But
# I think there is too great a chance that some non-Cray system has a # I think there is too great a chance that some non-Cray system has a
# function named listmntent to risk the false positive. # function named listmntent to risk the false positive.
if test -z "$ac_list_mounted_fs"; then if test -z "$ac_list_mounted_fs"; then
# (obsolete) Cray UNICOS 9 # (obsolete) Cray UNICOS 9
AC_MSG_CHECKING([for listmntent of Cray/Unicos-9]) AC_CACHE_CHECK([for listmntent of Cray/Unicos-9],
AC_CACHE_VAL([fu_cv_sys_mounted_cray_listmntent], [fu_cv_sys_mounted_cray_listmntent],
[fu_cv_sys_mounted_cray_listmntent=no [fu_cv_sys_mounted_cray_listmntent=no
AC_EGREP_CPP([yes], AC_EGREP_CPP([yes],
[#ifdef _CRAY [#ifdef _CRAY
@ -87,25 +89,22 @@ yes
], [test $ac_cv_func_listmntent = yes \ ], [test $ac_cv_func_listmntent = yes \
&& fu_cv_sys_mounted_cray_listmntent=yes] && fu_cv_sys_mounted_cray_listmntent=yes]
) )
] ])
)
AC_MSG_RESULT([$fu_cv_sys_mounted_cray_listmntent])
if test $fu_cv_sys_mounted_cray_listmntent = yes; then if test $fu_cv_sys_mounted_cray_listmntent = yes; then
ac_list_mounted_fs=found ac_list_mounted_fs=found
AC_DEFINE([MOUNTED_LISTMNTENT], [1], AC_DEFINE([MOUNTED_LISTMNTENT], [1],
[Define if there is a function named listmntent that can be used to [Define if there is a function named listmntent that can be used to
list all mounted file systems. (UNICOS)]) list all mounted file systems. (UNICOS)])
fi fi
fi fi
if test -z "$ac_list_mounted_fs"; then if test -z "$ac_list_mounted_fs"; then
# AIX. # AIX.
AC_MSG_CHECKING([for mntctl function and struct vmount]) AC_CACHE_CHECK([for mntctl function and struct vmount],
AC_CACHE_VAL([fu_cv_sys_mounted_vmount], [fu_cv_sys_mounted_vmount],
[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <fshelp.h>]])], [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <fshelp.h>]])],
[fu_cv_sys_mounted_vmount=yes], [fu_cv_sys_mounted_vmount=yes],
[fu_cv_sys_mounted_vmount=no])]) [fu_cv_sys_mounted_vmount=no])])
AC_MSG_RESULT([$fu_cv_sys_mounted_vmount])
if test $fu_cv_sys_mounted_vmount = yes; then if test $fu_cv_sys_mounted_vmount = yes; then
ac_list_mounted_fs=found ac_list_mounted_fs=found
AC_DEFINE([MOUNTED_VMOUNT], [1], AC_DEFINE([MOUNTED_VMOUNT], [1],
@ -113,18 +112,19 @@ if test -z "$ac_list_mounted_fs"; then
the list of mounted file systems, and there is a system header file the list of mounted file systems, and there is a system header file
that declares 'struct vmount'. (AIX)]) that declares 'struct vmount'. (AIX)])
fi fi
fi fi
if test $ac_cv_func_getmntent = yes; then if test $ac_cv_func_getmntent = yes; then
# This system has the getmntent function. # This system has the getmntent function.
# Determine whether it's the one-argument variant or the two-argument one. # Determine whether it's the one-argument variant or the two-argument one.
if test -z "$ac_list_mounted_fs"; then if test -z "$ac_list_mounted_fs"; then
# glibc, HP-UX, IRIX, Cygwin, Android, also (obsolete) 4.3BSD, SunOS, Dynix. # glibc, HP-UX, IRIX, Cygwin, Android, also (obsolete) 4.3BSD, SunOS, Dynix.
AC_MSG_CHECKING([for one-argument getmntent function]) AC_CACHE_CHECK([for one-argument getmntent function],
AC_CACHE_VAL([fu_cv_sys_mounted_getmntent1], [fu_cv_sys_mounted_getmntent1],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ [AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[
/* SunOS 4.1.x /usr/include/mntent.h needs this for FILE */ /* SunOS 4.1.x /usr/include/mntent.h needs this for FILE */
#include <stdio.h> #include <stdio.h>
@ -141,11 +141,12 @@ if test $ac_cv_func_getmntent = yes; then
# endif # endif
#endif #endif
]], ]],
[[ struct mntent *mnt = 0; char *table = MOUNTED; [[struct mntent *mnt = 0; char *table = MOUNTED;
if (sizeof mnt && sizeof table) return 0;]])], if (sizeof mnt && sizeof table) return 0;
]])],
[fu_cv_sys_mounted_getmntent1=yes], [fu_cv_sys_mounted_getmntent1=yes],
[fu_cv_sys_mounted_getmntent1=no])]) [fu_cv_sys_mounted_getmntent1=no])
AC_MSG_RESULT([$fu_cv_sys_mounted_getmntent1]) ])
if test $fu_cv_sys_mounted_getmntent1 = yes; then if test $fu_cv_sys_mounted_getmntent1 = yes; then
ac_list_mounted_fs=found ac_list_mounted_fs=found
AC_DEFINE([MOUNTED_GETMNTENT1], [1], AC_DEFINE([MOUNTED_GETMNTENT1], [1],
@ -158,12 +159,12 @@ if test $ac_cv_func_getmntent = yes; then
if test -z "$ac_list_mounted_fs"; then if test -z "$ac_list_mounted_fs"; then
# Solaris, also (obsolete) SVR4. # Solaris, also (obsolete) SVR4.
AC_MSG_CHECKING([for two-argument getmntent function]) AC_CACHE_CHECK([for two-argument getmntent function],
AC_CACHE_VAL([fu_cv_sys_mounted_getmntent2], [fu_cv_sys_mounted_getmntent2],
[AC_EGREP_HEADER([getmntent], [sys/mnttab.h], [AC_EGREP_HEADER([getmntent], [sys/mnttab.h],
fu_cv_sys_mounted_getmntent2=yes, [fu_cv_sys_mounted_getmntent2=yes],
fu_cv_sys_mounted_getmntent2=no)]) [fu_cv_sys_mounted_getmntent2=no])
AC_MSG_RESULT([$fu_cv_sys_mounted_getmntent2]) ])
if test $fu_cv_sys_mounted_getmntent2 = yes; then if test $fu_cv_sys_mounted_getmntent2 = yes; then
ac_list_mounted_fs=found ac_list_mounted_fs=found
AC_DEFINE([MOUNTED_GETMNTENT2], [1], AC_DEFINE([MOUNTED_GETMNTENT2], [1],
@ -173,48 +174,51 @@ if test $ac_cv_func_getmntent = yes; then
fi fi
fi fi
fi fi
if test -z "$ac_list_mounted_fs"; then if test -z "$ac_list_mounted_fs"; then
# OSF/1, also (obsolete) Apple Darwin 1.3. # OSF/1, also (obsolete) Apple Darwin 1.3.
# powerpc-apple-darwin1.3.7 needs sys/param.h sys/ucred.h sys/fs_types.h # powerpc-apple-darwin1.3.7 needs sys/param.h sys/ucred.h sys/fs_types.h
AC_MSG_CHECKING([for getfsstat function]) AC_CACHE_CHECK([for getfsstat function],
AC_CACHE_VAL([fu_cv_sys_mounted_getfsstat], [fu_cv_sys_mounted_getfsstat],
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[ [AC_LINK_IFELSE(
[AC_LANG_PROGRAM([[
#include <sys/types.h> #include <sys/types.h>
#if HAVE_STRUCT_FSSTAT_F_FSTYPENAME #if HAVE_STRUCT_FSSTAT_F_FSTYPENAME
# define FS_TYPE(Ent) ((Ent).f_fstypename) # define FS_TYPE(Ent) ((Ent).f_fstypename)
#else #else
# define FS_TYPE(Ent) mnt_names[(Ent).f_type] # define FS_TYPE(Ent) mnt_names[(Ent).f_type]
#endif #endif
$getfsstat_includes]] $getfsstat_includes
, ]],
[[struct statfs *stats; [[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); ]])], char *t = FS_TYPE (*stats);
]])],
[fu_cv_sys_mounted_getfsstat=yes], [fu_cv_sys_mounted_getfsstat=yes],
[fu_cv_sys_mounted_getfsstat=no])]) [fu_cv_sys_mounted_getfsstat=no])
AC_MSG_RESULT([$fu_cv_sys_mounted_getfsstat]) ])
if test $fu_cv_sys_mounted_getfsstat = yes; then if test $fu_cv_sys_mounted_getfsstat = yes; then
ac_list_mounted_fs=found ac_list_mounted_fs=found
AC_DEFINE([MOUNTED_GETFSSTAT], [1], AC_DEFINE([MOUNTED_GETFSSTAT], [1],
[Define if there is a function named getfsstat for reading the [Define if there is a function named getfsstat for reading the
list of mounted file systems. (DEC Alpha running OSF/1)]) list of mounted file systems. (DEC Alpha running OSF/1)])
fi fi
fi fi
if test -z "$ac_list_mounted_fs"; then if test -z "$ac_list_mounted_fs"; then
# (obsolete) SVR3 # (obsolete) SVR3
AC_MSG_CHECKING([for FIXME existence of three headers]) AC_CACHE_CHECK([for FIXME existence of three headers],
AC_CACHE_VAL([fu_cv_sys_mounted_fread_fstyp], [fu_cv_sys_mounted_fread_fstyp],
[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
#include <sys/statfs.h> #include <sys/statfs.h>
#include <sys/fstyp.h> #include <sys/fstyp.h>
#include <mnttab.h>]])], #include <mnttab.h>
]])],
[fu_cv_sys_mounted_fread_fstyp=yes], [fu_cv_sys_mounted_fread_fstyp=yes],
[fu_cv_sys_mounted_fread_fstyp=no])]) [fu_cv_sys_mounted_fread_fstyp=no])
AC_MSG_RESULT([$fu_cv_sys_mounted_fread_fstyp]) ])
if test $fu_cv_sys_mounted_fread_fstyp = yes; then if test $fu_cv_sys_mounted_fread_fstyp = yes; then
ac_list_mounted_fs=found ac_list_mounted_fs=found
AC_DEFINE([MOUNTED_FREAD_FSTYP], [1], AC_DEFINE([MOUNTED_FREAD_FSTYP], [1],
@ -222,24 +226,23 @@ if test -z "$ac_list_mounted_fs"; then
list of mounted file systems, and your system has these header files: list of mounted file systems, and your system has these header files:
<sys/fstyp.h> and <sys/statfs.h>. (SVR3)]) <sys/fstyp.h> and <sys/statfs.h>. (SVR3)])
fi fi
fi fi
if test -z "$ac_list_mounted_fs"; then if test -z "$ac_list_mounted_fs"; then
# Mac OS X, FreeBSD, NetBSD, OpenBSD, also (obsolete) 4.4BSD. # Mac OS X, FreeBSD, NetBSD, OpenBSD, also (obsolete) 4.4BSD.
# OSF/1 also has getmntinfo but is already handled above. # OSF/1 also has getmntinfo but is already handled above.
AC_MSG_CHECKING([for getmntinfo function]) AC_CACHE_CHECK([for getmntinfo function],
AC_CACHE_VAL([fu_cv_sys_mounted_getmntinfo], [fu_cv_sys_mounted_getmntinfo],
[ [
test "$ac_cv_func_getmntinfo" = yes \ test "$ac_cv_func_getmntinfo" = yes \
&& fu_cv_sys_mounted_getmntinfo=yes \ && fu_cv_sys_mounted_getmntinfo=yes \
|| fu_cv_sys_mounted_getmntinfo=no || fu_cv_sys_mounted_getmntinfo=no
]) ])
AC_MSG_RESULT([$fu_cv_sys_mounted_getmntinfo])
if test $fu_cv_sys_mounted_getmntinfo = yes; then if test $fu_cv_sys_mounted_getmntinfo = yes; then
AC_MSG_CHECKING([whether getmntinfo returns statvfs structures]) AC_CACHE_CHECK([whether getmntinfo returns statvfs structures],
AC_CACHE_VAL([fu_cv_sys_mounted_getmntinfo2], [fu_cv_sys_mounted_getmntinfo2],
[ [AC_COMPILE_IFELSE(
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ [AC_LANG_PROGRAM([[
#if HAVE_SYS_PARAM_H #if HAVE_SYS_PARAM_H
# include <sys/param.h> # include <sys/param.h>
#endif #endif
@ -259,7 +262,6 @@ int getmntinfo (struct statfs **, int);
[fu_cv_sys_mounted_getmntinfo2=no], [fu_cv_sys_mounted_getmntinfo2=no],
[fu_cv_sys_mounted_getmntinfo2=yes]) [fu_cv_sys_mounted_getmntinfo2=yes])
]) ])
AC_MSG_RESULT([$fu_cv_sys_mounted_getmntinfo2])
if test $fu_cv_sys_mounted_getmntinfo2 = no; then if test $fu_cv_sys_mounted_getmntinfo2 = no; then
# Mac OS X, FreeBSD, OpenBSD, also (obsolete) 4.4BSD. # Mac OS X, FreeBSD, OpenBSD, also (obsolete) 4.4BSD.
ac_list_mounted_fs=found ac_list_mounted_fs=found
@ -276,55 +278,56 @@ int getmntinfo (struct statfs **, int);
'struct statvfs'. (NetBSD 3.0)]) 'struct statvfs'. (NetBSD 3.0)])
fi fi
fi fi
fi fi
if test -z "$ac_list_mounted_fs"; then if test -z "$ac_list_mounted_fs"; then
# (obsolete) Ultrix. # (obsolete) Ultrix.
AC_MSG_CHECKING([for getmnt function]) AC_CACHE_CHECK([for getmnt function],
AC_CACHE_VAL([fu_cv_sys_mounted_getmnt], [fu_cv_sys_mounted_getmnt],
[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
#include <sys/fs_types.h> #include <sys/fs_types.h>
#include <sys/mount.h>]])], #include <sys/mount.h>]])],
[fu_cv_sys_mounted_getmnt=yes], [fu_cv_sys_mounted_getmnt=yes],
[fu_cv_sys_mounted_getmnt=no])]) [fu_cv_sys_mounted_getmnt=no])
AC_MSG_RESULT([$fu_cv_sys_mounted_getmnt]) ])
if test $fu_cv_sys_mounted_getmnt = yes; then if test $fu_cv_sys_mounted_getmnt = yes; then
ac_list_mounted_fs=found ac_list_mounted_fs=found
AC_DEFINE([MOUNTED_GETMNT], [1], AC_DEFINE([MOUNTED_GETMNT], [1],
[Define if there is a function named getmnt for reading the list of [Define if there is a function named getmnt for reading the list of
mounted file systems. (Ultrix)]) mounted file systems. (Ultrix)])
fi fi
fi fi
if test -z "$ac_list_mounted_fs"; then if test -z "$ac_list_mounted_fs"; then
# Haiku, also (obsolete) BeOS. # Haiku, also (obsolete) BeOS.
AC_CHECK_FUNCS([next_dev fs_stat_dev]) AC_CHECK_FUNCS([next_dev fs_stat_dev])
AC_CHECK_HEADERS([fs_info.h]) AC_CHECK_HEADERS([fs_info.h])
AC_MSG_CHECKING([for BEOS mounted file system support functions]) AC_CACHE_CHECK([for BEOS mounted file system support functions],
if test $ac_cv_header_fs_info_h = yes \ [fu_cv_sys_mounted_fs_stat_dev],
[if test $ac_cv_header_fs_info_h = yes \
&& test $ac_cv_func_next_dev = yes \ && test $ac_cv_func_next_dev = yes \
&& test $ac_cv_func_fs_stat_dev = yes; then && test $ac_cv_func_fs_stat_dev = yes; then
fu_result=yes fu_cv_sys_mounted_fs_stat_dev=yes
else else
fu_result=no fu_cv_sys_mounted_fs_stat_dev=no
fi fi
AC_MSG_RESULT([$fu_result]) ])
if test $fu_result = yes; then if test $fu_cv_sys_mounted_fs_stat_dev = yes; then
ac_list_mounted_fs=found ac_list_mounted_fs=found
AC_DEFINE([MOUNTED_FS_STAT_DEV], [1], AC_DEFINE([MOUNTED_FS_STAT_DEV], [1],
[Define if there are functions named next_dev and fs_stat_dev for [Define if there are functions named next_dev and fs_stat_dev for
reading the list of mounted file systems. (BeOS)]) reading the list of mounted file systems. (BeOS)])
fi fi
fi fi
if test -z "$ac_list_mounted_fs"; then if test -z "$ac_list_mounted_fs"; then
# (obsolete) SVR2. # (obsolete) SVR2.
AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab]) AC_CACHE_CHECK([whether it is possible to resort to fread on /etc/mnttab],
AC_CACHE_VAL([fu_cv_sys_mounted_fread], [fu_cv_sys_mounted_fread],
[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <mnttab.h>]])], [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <mnttab.h>]])],
[fu_cv_sys_mounted_fread=yes], [fu_cv_sys_mounted_fread=yes],
[fu_cv_sys_mounted_fread=no])]) [fu_cv_sys_mounted_fread=no])
AC_MSG_RESULT([$fu_cv_sys_mounted_fread]) ])
if test $fu_cv_sys_mounted_fread = yes; then if test $fu_cv_sys_mounted_fread = yes; then
ac_list_mounted_fs=found ac_list_mounted_fs=found
AC_DEFINE([MOUNTED_FREAD], [1], AC_DEFINE([MOUNTED_FREAD], [1],
@ -332,9 +335,9 @@ if test -z "$ac_list_mounted_fs"; then
mounted file systems. fread will be used to read /etc/mnttab. mounted file systems. fread will be used to read /etc/mnttab.
(SVR2) ]) (SVR2) ])
fi fi
fi fi
if test -z "$ac_list_mounted_fs"; then if test -z "$ac_list_mounted_fs"; then
# Interix / BSD alike statvfs # Interix / BSD alike statvfs
# the code is really interix specific, so make sure, we're on it. # the code is really interix specific, so make sure, we're on it.
case "$host" in case "$host" in
@ -349,14 +352,14 @@ if test -z "$ac_list_mounted_fs"; then
fi fi
;; ;;
esac esac
fi fi
if test -z "$ac_list_mounted_fs"; then if test -z "$ac_list_mounted_fs"; then
AC_MSG_ERROR([could not determine how to read list of mounted file systems]) AC_MSG_ERROR([could not determine how to read list of mounted file systems])
# FIXME -- no need to abort building the whole package # FIXME -- no need to abort building the whole package
# Can't build mountlist.c or anything that needs its functions # Can't build mountlist.c or anything that needs its functions
fi fi
AS_IF([test $ac_list_mounted_fs = found], [$1], [$2]) AS_IF([test $ac_list_mounted_fs = found], [$1], [$2])
]) ])