# HG changeset patch # User Jim Meyering # Date 948644421 0 # Node ID 9bc7c7e2ae09c5bab3037f73d7569a7a7595607a # Parent 1758480aaa516179c1578fa775907e2607fe842a s/list_mounted_fs/ac_list_mounted_fs/ (jm_LIST_MOUNTED_FILESYSTEMS): Take two parameters. diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4 --- a/m4/ls-mntd-fs.m4 +++ b/m4/ls-mntd-fs.m4 @@ -13,10 +13,11 @@ AC_PREREQ(2.14a) +# jm_LIST_MOUNTED_FILESYSTEMS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) AC_DEFUN(jm_LIST_MOUNTED_FILESYSTEMS, [ # Determine how to get the list of mounted filesystems. -list_mounted_fs= +ac_list_mounted_fs= # If the getmntent function is available but not in the standard library, # make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX). @@ -31,7 +32,7 @@ # I think there is too great a chance that some non-Cray system has a # function named listmntent to risk the false positive. -if test -z "$list_mounted_fs"; then +if test -z "$ac_list_mounted_fs"; then # Cray UNICOS 9 AC_MSG_CHECKING([for listmntent of Cray/Unicos-9]) AC_CACHE_VAL(fu_cv_sys_mounted_cray_listmntent, @@ -47,7 +48,7 @@ ) AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent) if test $fu_cv_sys_mounted_cray_listmntent = yes; then - list_mounted_fs=found + ac_list_mounted_fs=found AC_DEFINE(MOUNTED_LISTMNTENT, 1, [Define if there is a function named listmntent that can be used to list all mounted filesystems. (UNICOS)]) @@ -59,7 +60,7 @@ # This system has the getmntent function. # Determine whether it's the one-argument variant or the two-argument one. - if test -z "$list_mounted_fs"; then + if test -z "$ac_list_mounted_fs"; then # 4.3BSD, SunOS, HP-UX, Dynix, Irix AC_MSG_CHECKING([for one-argument getmntent function]) AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1, @@ -68,7 +69,7 @@ || fu_cv_sys_mounted_getmntent1=no]) AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1) if test $fu_cv_sys_mounted_getmntent1 = yes; then - list_mounted_fs=found + ac_list_mounted_fs=found AC_DEFINE(MOUNTED_GETMNTENT1, 1, [Define if there is a function named getmntent for reading the list of mounted filesystems, and that function takes a single argument. @@ -76,7 +77,7 @@ fi fi - if test -z "$list_mounted_fs"; then + if test -z "$ac_list_mounted_fs"; then # SVR4 AC_MSG_CHECKING([for two-argument getmntent function]) AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2, @@ -85,20 +86,20 @@ fu_cv_sys_mounted_getmntent2=no)]) AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2) if test $fu_cv_sys_mounted_getmntent2 = yes; then - list_mounted_fs=found + ac_list_mounted_fs=found AC_DEFINE(MOUNTED_GETMNTENT2, 1, [Define if there is a function named getmntent for reading the list of mounted filesystems, and that function takes two arguments. (SVR4)]) fi fi - if test -z "$list_mounted_fs"; then + if test -z "$ac_list_mounted_fs"; then AC_MSG_ERROR([could not determine how to read list of mounted filesystems]) fi fi -if test -z "$list_mounted_fs"; then +if test -z "$ac_list_mounted_fs"; then # DEC Alpha running OSF/1. AC_MSG_CHECKING([for getfsstat function]) AC_CACHE_VAL(fu_cv_sys_mounted_getsstat, @@ -112,14 +113,14 @@ fu_cv_sys_mounted_getsstat=no)]) AC_MSG_RESULT($fu_cv_sys_mounted_getsstat) if test $fu_cv_sys_mounted_getsstat = yes; then - list_mounted_fs=found + ac_list_mounted_fs=found AC_DEFINE(MOUNTED_GETFSSTAT, 1, [Define if there is a function named getfsstat for reading the list of mounted filesystems. (DEC Alpha running OSF/1)]) fi fi -if test -z "$list_mounted_fs"; then +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, @@ -128,7 +129,7 @@ fu_cv_sys_mounted_vmount=no)]) AC_MSG_RESULT($fu_cv_sys_mounted_vmount) if test $fu_cv_sys_mounted_vmount = yes; then - list_mounted_fs=found + 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 @@ -136,7 +137,7 @@ fi fi -if test -z "$list_mounted_fs"; then +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, @@ -148,7 +149,7 @@ 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 - list_mounted_fs=found + ac_list_mounted_fs=found AC_DEFINE(MOUNTED_FREAD_FSTYP, 1, [Define if (like SVR2) there is no specific function for reading the list of mounted filesystems, and your system has these header files: @@ -156,7 +157,7 @@ fi fi -if test -z "$list_mounted_fs"; then +if test -z "$ac_list_mounted_fs"; then # 4.4BSD and DEC OSF/1. AC_MSG_CHECKING([for getmntinfo function]) AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo, @@ -172,7 +173,7 @@ ]) AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo) if test $fu_cv_sys_mounted_getmntinfo = yes; then - list_mounted_fs=found + ac_list_mounted_fs=found AC_DEFINE(MOUNTED_GETMNTINFO, 1, [Define if there is a function named getmntinfo for reading the list of mounted filesystems. (4.4BSD)]) @@ -181,7 +182,7 @@ # FIXME: add a test for netbsd-1.1 here -if test -z "$list_mounted_fs"; then +if test -z "$ac_list_mounted_fs"; then # Ultrix AC_MSG_CHECKING([for getmnt function]) AC_CACHE_VAL(fu_cv_sys_mounted_getmnt, @@ -192,14 +193,14 @@ fu_cv_sys_mounted_getmnt=no)]) AC_MSG_RESULT($fu_cv_sys_mounted_getmnt) if test $fu_cv_sys_mounted_getmnt = yes; then - list_mounted_fs=found + ac_list_mounted_fs=found AC_DEFINE(MOUNTED_GETMNT, 1, [Define if there is a function named getmnt for reading the list of mounted filesystems. (Ultrix)]) fi fi -if test -z "$list_mounted_fs"; then +if test -z "$ac_list_mounted_fs"; then # SVR2 AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab]) AC_CACHE_VAL(fu_cv_sys_mounted_fread, @@ -208,17 +209,19 @@ fu_cv_sys_mounted_fread=no)]) AC_MSG_RESULT($fu_cv_sys_mounted_fread) if test $fu_cv_sys_mounted_fread = yes; then - list_mounted_fs=found + ac_list_mounted_fs=found AC_DEFINE(MOUNTED_FREAD, 1, [Define if there is no specific function for reading the list of mounted filesystems. fread will be used to read /etc/mnttab. (SVR2) ]) fi fi -if test -z "$list_mounted_fs"; then +if test -z "$ac_list_mounted_fs"; then AC_MSG_ERROR([could not determine how to read list of mounted filesystems]) # FIXME -- no need to abort building the whole package # Can't build mountlist.c or anything that needs its functions fi +AC_SHELL_IFELSE([test $ac_list_mounted_fs = found], [$1], [$2])dnl + ])