X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmountlist.m4;h=7104bb94ffc2b3d881480b6ec6ac9bf4e0108078;hb=639607db00b96f33b0e18afa27188456c6ccad0a;hp=c2af19a919b690b679e73f35424628c0f64c6a82;hpb=53b8fa05726a7fb30010e42ce02e44a35f0d7489;p=gnulib.git

diff --git a/m4/mountlist.m4 b/m4/mountlist.m4
index c2af19a91..7104bb94f 100644
--- a/m4/mountlist.m4
+++ b/m4/mountlist.m4
@@ -1,27 +1,19 @@
-# mountlist.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# serial 11
+dnl Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_MOUNTLIST],
 [
-  jm_LIST_MOUNTED_FILESYSTEMS([gl_cv_list_mounted_fs=yes],
-                              [gl_cv_list_mounted_fs=no])
-  if test $gl_cv_list_mounted_fs = yes; then
-    AC_LIBOBJ(mountlist)
-    gl_PREREQ_MOUNTLIST_EXTRA
-  fi
+  gl_LIST_MOUNTED_FILE_SYSTEMS([gl_cv_list_mounted_fs=yes],
+                               [gl_cv_list_mounted_fs=no])
 ])
 
-# Prerequisites of lib/mountlist.c not done by jm_LIST_MOUNTED_FILESYSTEMS.
+# Prerequisites of lib/mountlist.c not done by gl_LIST_MOUNTED_FILE_SYSTEMS.
 AC_DEFUN([gl_PREREQ_MOUNTLIST_EXTRA],
 [
-  AC_REQUIRE([AC_HEADER_STDC])
-  dnl Note jm_LIST_MOUNTED_FILESYSTEMS checks for mntent.h, not sys/mntent.h.
-  AC_CHECK_HEADERS_ONCE(fcntl.h string.h unistd.h)
-  AC_CHECK_HEADERS(sys/mntent.h)
-  jm_FSTYPENAME
+  dnl Note gl_LIST_MOUNTED_FILE_SYSTEMS checks for mntent.h, not sys/mntent.h.
+  AC_CHECK_HEADERS([sys/mntent.h])
+  gl_FSTYPENAME
 ])