X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fls-mntd-fs.m4;h=1920622106c134f11d898545715232abd4954ce4;hb=415175fcb509494574e9eb416575047acfa90df9;hp=4962d6923ae4f1b4ab5aa1e9771c9ca56ea04fa5;hpb=e2380d6ab32e12d9b32d2b6289085e30d45308ba;p=gnulib.git

diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4
index 4962d6923..192062210 100644
--- a/m4/ls-mntd-fs.m4
+++ b/m4/ls-mntd-fs.m4
@@ -1,21 +1,17 @@
-#serial 5
+#serial 8
 
 dnl From Jim Meyering.
 dnl
 dnl This is not pretty.  I've just taken the autoconf code and wrapped
 dnl it in an AC_DEFUN.
 dnl
-dnl CAUTION: This is very fragile.  It relies on several checks that
-dnl are still in fileutils' configure.in:
-dnl FIXME: add AC_REQUIRE uses to pull in all definitions required
-dnl for all uses of $ac_cv_func_* and $ac_cv_header_* variables below.
-dnl
-
-AC_PREREQ(2.14a)
 
 # jm_LIST_MOUNTED_FILESYSTEMS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
 AC_DEFUN(jm_LIST_MOUNTED_FILESYSTEMS,
   [
+AC_CHECK_FUNCS(listmntent getmntent getmntinfo)
+AC_CHECK_HEADERS(mntent.h)
+
 # Determine how to get the list of mounted filesystems.
 ac_list_mounted_fs=
 
@@ -241,6 +237,11 @@ if test -z "$ac_list_mounted_fs"; then
   # Can't build mountlist.c or anything that needs its functions
 fi
 
-AC_SHELL_IFELSE([test $ac_list_mounted_fs = found], [$1], [$2])dnl
+dnl FIXME: this should use AS_IF.
+if test $ac_list_mounted_fs = found; then
+$1
+else
+$2
+fi
 
   ])