Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'

[gnulib.git] / m4 / mountlist.m4

diff --git a/m4/mountlist.m4 b/m4/mountlist.m4
index c25f44e..f5c60bc 100644 (file)
--- a/m4/mountlist.m4
+++ b/m4/mountlist.m4
@@ -1,5 +1,5 @@
-#serial 9
-dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# serial 11
+dnl Copyright (C) 2002-2006, 2009-2014 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,17 +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(sys/mntent.h)
+  AC_CHECK_HEADERS([sys/mntent.h])
   gl_FSTYPENAME
 ])