X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fls-mntd-fs.m4;h=6b848177de74fa7ff60daff9e1b42ff320ea93e1;hb=264a64244c721c14c74448bb003efda5059e37a9;hp=4a28de3b02cf812f4f943b51867a62942237ec94;hpb=8e7071c4523c4269fe93436ba291adc007dabc22;p=gnulib.git

diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4
index 4a28de3b0..6b848177d 100644
--- a/m4/ls-mntd-fs.m4
+++ b/m4/ls-mntd-fs.m4
@@ -1,21 +1,17 @@
-#serial 4
+#serial 10
 
 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 getmntinfo)
+AC_CHECK_HEADERS(mntent.h)
+
 # Determine how to get the list of mounted filesystems.
 ac_list_mounted_fs=
 
@@ -203,8 +199,8 @@ if test -z "$ac_list_mounted_fs"; then
   AC_CHECK_FUNCS(next_dev fs_stat_dev)
   AC_CHECK_HEADERS(fs_info.h)
   AC_MSG_CHECKING([for BEOS mounted file system support functions])
-  if test $ac_cv_header_fs_info_h = yes
-      && test $ac_cv_func_next_dev = yes
+  if test $ac_cv_header_fs_info_h = yes \
+      && test $ac_cv_func_next_dev = yes \
 	&& test $ac_cv_func_fs_stat_dev = yes; then
     fu_result=yes
   else
@@ -213,7 +209,7 @@ if test -z "$ac_list_mounted_fs"; then
   AC_MSG_RESULT($fu_result)
   if test $fu_result = yes; then
     ac_list_mounted_fs=found
-    AC_DEFINE(MOUNTED_NEXT_DEV, 1,
+    AC_DEFINE(MOUNTED_FS_STAT_DEV, 1,
       [Define if there are functions named next_dev and fs_stat_dev for
    reading the list of mounted filesystems.  (BeOS)])
   fi
@@ -241,6 +237,6 @@ 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
+AS_IF([test $ac_list_mounted_fs = found], [$1], [$2])
 
   ])