diff options
| author | Jim Meyering <jim@meyering.net> | 2003-03-18 17:14:31 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2003-03-18 17:14:31 +0000 |
| commit | 4e3aebb74afe81e29b844fa7be81a2cad0a77eff (patch) | |
| tree | a64c2c91d3dad8a4c4b9b12c5f41dd570c5e02af /m4/ls-mntd-fs.m4 | |
| parent | b9c866ac1a00bb77a8411f70755490506605ed71 (diff) | |
| download | coreutils-4e3aebb74afe81e29b844fa7be81a2cad0a77eff.tar.xz | |
(jm_LIST_MOUNTED_FILESYSTEMS): Move the MOUNTED_VMOUNT
test to precede the MOUNTED_GETMNTENT1 tests, since otherwise, AIX 5.1
systems would end up using the latter. MOUNTED_GETMNTENT1 support
is inadequate on such systems: 1) detecting whether a file system
is remote doesn't work 2) the MOUNTED_VMOUNT code reports the
HOSTNAME:/MOUNT_POINT, while the MOUNTED_GETMNTENT1 code reports
merely /MOUNT_POINT. Reported by Mike Jetzer.
Diffstat (limited to 'm4/ls-mntd-fs.m4')
| -rw-r--r-- | m4/ls-mntd-fs.m4 | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4 index 54ae7d983..3ba42a315 100644 --- a/m4/ls-mntd-fs.m4 +++ b/m4/ls-mntd-fs.m4 @@ -1,4 +1,4 @@ -#serial 11 +#serial 12 dnl From Jim Meyering. dnl @@ -67,6 +67,23 @@ yes fi fi +if test -z "$ac_list_mounted_fs"; then + # AIX. + AC_MSG_CHECKING([for mntctl function and struct vmount]) + AC_CACHE_VAL(fu_cv_sys_mounted_vmount, + [AC_TRY_CPP([#include <fshelp.h>], + fu_cv_sys_mounted_vmount=yes, + fu_cv_sys_mounted_vmount=no)]) + AC_MSG_RESULT($fu_cv_sys_mounted_vmount) + if test $fu_cv_sys_mounted_vmount = yes; then + ac_list_mounted_fs=found + AC_DEFINE(MOUNTED_VMOUNT, 1, + [Define if there is a function named mntctl that can be used to read + the list of mounted filesystems, and there is a system header file + that declares `struct vmount.' (AIX)]) + fi +fi + if test $ac_cv_func_getmntent = yes; then # This system has the getmntent function. @@ -154,23 +171,6 @@ if test -z "$ac_list_mounted_fs"; then fi if test -z "$ac_list_mounted_fs"; then - # AIX. - AC_MSG_CHECKING([for mntctl function and struct vmount]) - AC_CACHE_VAL(fu_cv_sys_mounted_vmount, - [AC_TRY_CPP([#include <fshelp.h>], - fu_cv_sys_mounted_vmount=yes, - fu_cv_sys_mounted_vmount=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_vmount) - if test $fu_cv_sys_mounted_vmount = yes; then - ac_list_mounted_fs=found - AC_DEFINE(MOUNTED_VMOUNT, 1, - [Define if there is a function named mntctl that can be used to read - the list of mounted filesystems, and there is a system header file - that declares `struct vmount.' (AIX)]) - fi -fi - -if test -z "$ac_list_mounted_fs"; then # SVR3 AC_MSG_CHECKING([for FIXME existence of three headers]) AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp, |