diff --git a/acinclude.m4 b/acinclude.m4 index 5862b37..2d830dd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -226,23 +226,25 @@ dnl dnl Find out where is the mounted filesystem table dnl -AC_DEFUN([AC_FIND_MFS], [ - dnl Linux - AC_CHECK_FILE([/etc/mtab], [ - mtab=/etc/mtab - ],[ - dnl Solaris - AC_CHECK_FILE([/etc/mnttab], [ - mtab=/etc/mnttab - ], [ - dnl BSD - AC_CHECK_FILE([/etc/fstab], [ - mtab=/etc/fstab - ]) - ]) +AC_DEFUN([AC_FIND_MTAB_FILE], [ + AC_CACHE_CHECK([for your mounted filesystem table], ac_cv_mtab_file, [ + dnl Linux + if test -e "/etc/mtab"; then + ac_cv_mtab_file=/etc/mtab + else + dnl Solaris + if test -e "/etc/mnttab"; then + ac_cv_mtab_file=/etc/mnttab + else + dnl BSD + if test -e "/etc/fstab"; then + ac_cv_mtab_file=/etc/fstab + fi + fi + fi ]) - if test "$mtab"; then - AC_DEFINE_UNQUOTED(MTAB_FILE, ["$mtab"], [Where is your mounted filesystem table located?]) + if test "$ac_cv_mtab_file"; then + AC_DEFINE_UNQUOTED([MTAB_FILE], ["$ac_cv_mtab_file"], [Location of your mounted filesystem table file]) fi ]) diff --git a/configure.in b/configure.in index f19f28e..255d083 100644 --- a/configure.in +++ b/configure.in @@ -87,7 +87,7 @@ AC_CHECK_FUNCS(select socket strdup strerror strtol uname cfmakeraw ioperm) dnl Check for various defines and features -AC_FIND_MFS +AC_FIND_MTAB_FILE AC_GET_FS_INFO AC_ARG_ENABLE(stat-nfs,