Merge commit 'stable/20110609'

[gnulib.git] / m4 / mountlist.m4

diff --git a/m4/mountlist.m4 b/m4/mountlist.m4
index b2a2e12..12c9d0e 100644 (file)
--- a/m4/mountlist.m4
+++ b/m4/mountlist.m4
@@ -1,17 +1,15 @@
-#serial 8
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# serial 10
+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.
 
 AC_DEFUN([gl_MOUNTLIST],
 [
-  AC_LIBSOURCES([mountlist.c, mountlist.h])
-
   gl_LIST_MOUNTED_FILE_SYSTEMS([gl_cv_list_mounted_fs=yes],
-                              [gl_cv_list_mounted_fs=no])
+                               [gl_cv_list_mounted_fs=no])
   if test $gl_cv_list_mounted_fs = yes; then
-    AC_LIBOBJ(mountlist)
+    AC_LIBOBJ([mountlist])
     gl_PREREQ_MOUNTLIST_EXTRA
   fi
 ])
@@ -20,6 +18,6 @@ AC_DEFUN([gl_MOUNTLIST],
 AC_DEFUN([gl_PREREQ_MOUNTLIST_EXTRA],
 [
   dnl Note gl_LIST_MOUNTED_FILE_SYSTEMS checks for mntent.h, not sys/mntent.h.
-  AC_CHECK_HEADERS(sys/mntent.h)
+  AC_CHECK_HEADERS([sys/mntent.h])
   gl_FSTYPENAME
 ])