diff --git a/acinclude.m4 b/acinclude.m4 index 0e58731..5862b37 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -222,6 +222,31 @@ AC_DEFUN(AC_CURSES_ACS_ARRAY, [ fi ]) +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 + ]) + ]) + ]) + if test "$mtab"; then + AC_DEFINE_UNQUOTED(MTAB_FILE, ["$mtab"], [Where is your mounted filesystem table located?]) + fi +]) + + dnl dnl Filesystem information detection dnl diff --git a/clients/lcdproc/disk.c b/clients/lcdproc/disk.c index b8ff96e..46109e6 100644 --- a/clients/lcdproc/disk.c +++ b/clients/lcdproc/disk.c @@ -51,10 +51,10 @@ get_fs (mounts fs[]) char line[256]; int x = 0, y; -#ifdef SOLARIS - mtab_fd = fopen ("/etc/mnttab", "r"); +#ifdef MTAB_FILE + mtab_fd = fopen(MTAB_FILE, "r"); #else - mtab_fd = fopen ("/etc/mtab", "r"); +#error "Can't find your mounted filesystem table file." #endif // Get rid of old, unmounted filesystems... diff --git a/configure.in b/configure.in index ab5b3d2..f19f28e 100644 --- a/configure.in +++ b/configure.in @@ -87,6 +87,7 @@ AC_CHECK_FUNCS(select socket strdup strerror strtol uname cfmakeraw ioperm) dnl Check for various defines and features +AC_FIND_MFS AC_GET_FS_INFO AC_ARG_ENABLE(stat-nfs,