X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffstypename.m4;h=34044d09f53e4ea828dc9ad0d95a1af1c598ea64;hb=f9788546de646fbc4f77bba502a8f815d4999bac;hp=7ff33e20a2b10a20733101c63d024f03c96cf66c;hpb=44d7c1c1f004fa9bfb8ec3948de2671a7958cf5b;p=gnulib.git

diff --git a/m4/fstypename.m4 b/m4/fstypename.m4
index 7ff33e20a..34044d09f 100644
--- a/m4/fstypename.m4
+++ b/m4/fstypename.m4
@@ -1,37 +1,23 @@
-#serial 5
+#serial 6
 
 dnl From Jim Meyering.
 dnl
 dnl See if struct statfs has the f_fstypename member.
-dnl If so, define HAVE_F_FSTYPENAME_IN_STATFS.
+dnl If so, define HAVE_STRUCT_STATFS_F_FSTYPENAME.
 dnl
 
-# Copyright (C) 1998, 1999, 2001, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1998-1999, 2001, 2004, 2006, 2009-2012 Free Software
+# Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FSTYPENAME],
-  [
-    AC_CACHE_CHECK([for f_fstypename in struct statfs],
-		   fu_cv_sys_f_fstypename_in_statfs,
-      [
-	AC_TRY_COMPILE(
-	  [
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-	  ],
-	  [struct statfs s; int i = sizeof s.f_fstypename;],
-	  fu_cv_sys_f_fstypename_in_statfs=yes,
-	  fu_cv_sys_f_fstypename_in_statfs=no
-	)
-      ]
-    )
-
-    if test $fu_cv_sys_f_fstypename_in_statfs = yes; then
-      AC_DEFINE(HAVE_F_FSTYPENAME_IN_STATFS, 1,
-		[Define if struct statfs has the f_fstypename member.])
-    fi
-  ]
-)
+[
+  AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,
+    [
+      #include <sys/types.h>
+      #include <sys/param.h>
+      #include <sys/mount.h>
+    ])
+])