X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmountlist.m4;h=a00082d0cae8def53f9086a534ab5b8adb2b342d;hb=251c566a3b21bb5700c7625c71d170b4b405172a;hp=d0cee86ffcfa7fee46072b2ba61e1cf94f917bac;hpb=44d7c1c1f004fa9bfb8ec3948de2671a7958cf5b;p=gnulib.git

diff --git a/m4/mountlist.m4 b/m4/mountlist.m4
index d0cee86ff..a00082d0c 100644
--- a/m4/mountlist.m4
+++ b/m4/mountlist.m4
@@ -1,5 +1,5 @@
-# mountlist.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# serial 11
+dnl Copyright (C) 2002-2006, 2009-2011 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.
@@ -7,18 +7,13 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_MOUNTLIST],
 [
   gl_LIST_MOUNTED_FILE_SYSTEMS([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_cv_list_mounted_fs=no])
 ])
 
 # Prerequisites of lib/mountlist.c not done by gl_LIST_MOUNTED_FILE_SYSTEMS.
 AC_DEFUN([gl_PREREQ_MOUNTLIST_EXTRA],
 [
   dnl Note gl_LIST_MOUNTED_FILE_SYSTEMS checks for mntent.h, not sys/mntent.h.
-  AC_CHECK_HEADERS_ONCE(fcntl.h unistd.h)
-  AC_CHECK_HEADERS(sys/mntent.h)
+  AC_CHECK_HEADERS([sys/mntent.h])
   gl_FSTYPENAME
 ])