X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffstypename.m4;h=aa676f3aecda279429d7586fb5762a7f207a2ec6;hb=febae7ee2b8b61030ed32d2b5b53316b240434f2;hp=b0166c161d8d609f73fae890670b2e960bc0da0e;hpb=27739d8615df56dcc22fe232760783aeb6d0e6e5;p=gnulib.git

diff --git a/m4/fstypename.m4 b/m4/fstypename.m4
index b0166c161..aa676f3ae 100644
--- a/m4/fstypename.m4
+++ b/m4/fstypename.m4
@@ -1,41 +1,22 @@
-#serial 1
+#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
 
-AC_DEFUN(jm_FSTYPENAME,
-  [
-    AC_CACHE_CHECK([for f_fstypename in struct statfs],
-		   fu_cv_sys_f_fstypename_in_statfs,
-      [
-	AC_TRY_COMPILE(
-	  [
-#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
-	)
-      ]
-    )
+# Copyright (C) 1998, 1999, 2001, 2004, 2006 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.
 
-    if test $fu_cv_sys_f_fstypename_in_statfs = yes; then
-      if test x = y; then
-	# This code is deliberately never run via ./configure.
-	# FIXME: this is a hack to make autoheader put the corresponding
-	# HAVE_* undef for this symbol in config.h.in.  This saves me the
-	# trouble of having to maintain the #undef in acconfig.h manually.
-	AC_CHECK_FUNCS(F_FSTYPENAME_IN_STATFS)
-      fi
-      # Defining it this way (rather than via AC_DEFINE) short-circuits the
-      # autoheader check -- autoheader doesn't know it's already been taken
-      # care of by the hack above.
-      ac_kludge=HAVE_F_FSTYPENAME_IN_STATFS
-      AC_DEFINE_UNQUOTED($ac_kludge)
-    fi
-  ]
-)
+AC_DEFUN([gl_FSTYPENAME],
+[
+  AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,
+    [
+      #include <sys/types.h>
+      #include <sys/param.h>
+      #include <sys/mount.h>
+    ])
+])